This is an automated email from the ASF dual-hosted git repository.
style95 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-intellij-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new ca111d0 Support IDEA 2021.1 (#12)
ca111d0 is described below
commit ca111d03d4baea14a2b07753dc8635ba3893076a
Author: 김건희 <[email protected]>
AuthorDate: Thu May 27 16:21:55 2021 +0900
Support IDEA 2021.1 (#12)
---
.github/workflows/compatibility.yml | 10 +++-------
build.gradle | 8 ++++----
src/main/java/org/apache/openwhisk/intellij/common/Icons.java | 8 +++++++-
.../openwhisk/intellij/common/notification/SimpleNotifier.java | 7 +++++++
.../toolwindow/action/CreateManifestTemplateAction.java | 5 +++--
src/main/resources/META-INF/plugin.xml | 6 +++---
src/main/resources/icons/menu-paste.svg | 1 +
7 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/compatibility.yml
b/.github/workflows/compatibility.yml
index 98ded79..14985c8 100644
--- a/.github/workflows/compatibility.yml
+++ b/.github/workflows/compatibility.yml
@@ -25,7 +25,7 @@ on:
jobs:
compatibility:
- name: Ensure plugin compatibility against 2018.1 ~ 2020.3 for IDEA
Community, IDEA Ultimate
+ name: Ensure plugin compatibility against 2019.1 ~ 2021.1 for IDEA
Community, IDEA Ultimate
runs-on: ubuntu-latest
steps:
- name: Check out repository
@@ -44,22 +44,18 @@ jobs:
uses: ChrisCarini/intellij-platform-plugin-verifier-action@latest
with:
ide-versions: |
- ideaIC:2018.1
- ideaIC:2018.2
- ideaIC:2018.3.6
ideaIC:2019.1.4
ideaIC:2019.3
ideaIC:2020.1
ideaIC:2020.2
ideaIC:2020.3
- ideaIU:2018.1
- ideaIU:2018.2
- ideaIU:2018.3.6
+ ideaIC:2021.1
ideaIU:2019.1.4
ideaIU:2019.3
ideaIU:2020.1
ideaIU:2020.2
ideaIU:2020.3
+ ideaIU:2021.1
- name: Get log file path and print contents
run: |
echo "The verifier log file
[${{steps.verify.outputs.verification-output-log-filename}}] contents : " ;
diff --git a/build.gradle b/build.gradle
index 344eec0..3487837 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ plugins {
}
group 'org.apache.openwhisk.intellij'
-version '1.1.4'
+version '1.0.0'
sourceCompatibility = 11
@@ -36,12 +36,12 @@ dependencies {
}
intellij {
- version '2020.1.2'
+ version '2021.1'
}
patchPluginXml {
- sinceBuild '181.*'
- untilBuild '203.*'
+ sinceBuild '191.*'
+ untilBuild '211.*'
}
publishPlugin {
diff --git a/src/main/java/org/apache/openwhisk/intellij/common/Icons.java
b/src/main/java/org/apache/openwhisk/intellij/common/Icons.java
index e641371..962cca0 100644
--- a/src/main/java/org/apache/openwhisk/intellij/common/Icons.java
+++ b/src/main/java/org/apache/openwhisk/intellij/common/Icons.java
@@ -41,6 +41,7 @@ public class Icons {
public static final Icon OPEN_DISK_HOVER =
load("/icons/openDiskHover.svg");
public static final Icon RUN_ANYTHING = load("/icons/run_anything.svg");
public static final Icon YAML = load("/icons/yaml.svg");
+ public static final Icon MENU_PASTE = load("/icons/menu-paste.svg");
public static final Icon KIND_JAVA = load("/icons/language/java/java.svg");
public static final Icon KIND_JS =
load("/icons/language/javascript/javascript.svg");
@@ -54,7 +55,12 @@ public class Icons {
private static Icon load(String path) {
try {
- return IconLoader.getIcon(path);
+ Icon icon = IconLoader.findIcon(path);
+ if (icon != null) {
+ return icon;
+ } else {
+ return AllIcons.General.Warning;
+ }
} catch (Throwable t) {
return AllIcons.General.Warning;
}
diff --git
a/src/main/java/org/apache/openwhisk/intellij/common/notification/SimpleNotifier.java
b/src/main/java/org/apache/openwhisk/intellij/common/notification/SimpleNotifier.java
index 2714212..40abe03 100644
---
a/src/main/java/org/apache/openwhisk/intellij/common/notification/SimpleNotifier.java
+++
b/src/main/java/org/apache/openwhisk/intellij/common/notification/SimpleNotifier.java
@@ -37,6 +37,13 @@ public class SimpleNotifier {
return LazyHolder.INSTANCE;
}
+ /**
+ * From 2020.3 version, 'NotificationGroupManager.getInstance()' is used.
+ * Deprecated method is maintained for backward compatibility support.
+ * If we find a way to support backwards compatibility in the future,
follow the guide below to replace the API.
+ *
+ *
https://jetbrains.org/intellij/sdk/docs/user_interface_components/notifications.html#top-level-notifications
+ */
private static final NotificationGroup NOTIFICATION_GROUP =
new NotificationGroup("Simple Notification Group",
NotificationDisplayType.STICKY_BALLOON, true);
diff --git
a/src/main/java/org/apache/openwhisk/intellij/wskdeploy/toolwindow/action/CreateManifestTemplateAction.java
b/src/main/java/org/apache/openwhisk/intellij/wskdeploy/toolwindow/action/CreateManifestTemplateAction.java
index 8e1bbdb..8c2c2eb 100644
---
a/src/main/java/org/apache/openwhisk/intellij/wskdeploy/toolwindow/action/CreateManifestTemplateAction.java
+++
b/src/main/java/org/apache/openwhisk/intellij/wskdeploy/toolwindow/action/CreateManifestTemplateAction.java
@@ -17,7 +17,6 @@
package org.apache.openwhisk.intellij.wskdeploy.toolwindow.action;
-import com.intellij.icons.AllIcons;
import com.intellij.notification.NotificationType;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
@@ -39,6 +38,8 @@ import org.jetbrains.annotations.NotNull;
import java.io.IOException;
import java.util.Arrays;
+import static org.apache.openwhisk.intellij.common.Icons.MENU_PASTE;
+
public class CreateManifestTemplateAction extends AnAction {
private static final Logger LOG =
Logger.getInstance(CreateManifestTemplateAction.class);
private static final SimpleNotifier NOTIFIER =
SimpleNotifier.getInstance();
@@ -47,7 +48,7 @@ public class CreateManifestTemplateAction extends AnAction {
private static final String[] SOURCE_FILES = new String[]{"index.js",
"index.test.js", "package.json"};
CreateManifestTemplateAction() {
- super(AllIcons.Actions.Menu_paste);
+ super(MENU_PASTE);
}
@Override
diff --git a/src/main/resources/META-INF/plugin.xml
b/src/main/resources/META-INF/plugin.xml
index 5601b16..c12522a 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -2,8 +2,8 @@
<id>org.apache.openwhisk.intellij</id>
<name>DevTools for Apache Openwhisk</name>
<vendor email="[email protected]"
url="https://github.com/apache";>Apache</vendor>
- <version>1.1.4</version>
- <idea-version since-build="181.*" until-build="203.*"/>
+ <version>1.0.0</version>
+ <idea-version since-build="191.*" until-build="211.*"/>
<description><![CDATA[
<p>
@@ -24,7 +24,7 @@
<li>Show the action code with syntax highlighting.</li>
<li>[Soon] Edit the action code on the remote server.</li>
<li>Invoke the action remotely and get the activation result.</li>
- <li>Show a list of actions related to the sequence action.</li>
+ <li>Show a list of actions related to the sequence action.</li>cc
<li>Show information about the trigger and related rules.</li>
<li>Show activations related to the action (Same as <code>wsk activation
list ${action}</code>).</li>
<li>Show detailed information of the activation (Same <code>as wsk
activation get ${activation_id}</code>).</li>
diff --git a/src/main/resources/icons/menu-paste.svg
b/src/main/resources/icons/menu-paste.svg
new file mode 100644
index 0000000..9181117
--- /dev/null
+++ b/src/main/resources/icons/menu-paste.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"; width="16" height="16" viewBox="0 0 16
16"><rect id="frame" width="16" height="16" fill="none"/><path fill="#737373"
fill-rule="evenodd" d="M6 2V1h4v1h3v12H3V2h3zm1 0v1h2V2H7zM5 5v7h6V5H5z"/></svg>
\ No newline at end of file
