Merge pull request #9 from zhyhang/feature/dev-2.4.0

Feature/dev 2.4.0

Author: zhyhang

CHANGELOG.md

@@ -5,8 +5,9 @@
 
 ## [Unreleased]
 
-## [2.4.0]
-- Build framework change to gradle
+## [2.3.1]
+- Compatible with coming version 2022
+- Build tool change to gradle
 
 ## [2.3.0]
 - Fix throw exception when select empty files  

Handy Export Jar-2.3.1.zip

@@ -22,7 +22,8 @@ version = properties("pluginVersion")
 // Configure project's dependencies
 repositories {
     //TODO 每次根据开发环境改变
-    maven { url=uri("https://www.jetbrains.com/intellij-repository/snapshots") }
+    maven { url=uri("https://www.jetbrains.com/intellij-repository/releases") }
+    //maven { url=uri("https://www.jetbrains.com/intellij-repository/snapshots") }
     maven { url=uri("https://cache-redirector.jetbrains.com/intellij-dependencies") }
     mavenCentral()
 }
@@ -70,7 +71,7 @@ tasks {
     patchPluginXml {
         version.set(properties("pluginVersion"))
         sinceBuild.set(properties("pluginSinceBuild"))
-//        untilBuild.set(properties("pluginUntilBuild"))
+        untilBuild.set(properties("pluginUntilBuild"))
 
         // Extract the <!-- Plugin description --> section from README.md and provide for the plugin's manifest
         pluginDescription.set(

build.gradle.kts

@@ -4,18 +4,18 @@
 pluginGroup = org.yanhuang.plugins.intellij.exportjar
 pluginName = Handy Export Jar
 # SemVer format -> https://semver.org
-pluginVersion = 2.4.0
+pluginVersion = 2.3.1
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 pluginSinceBuild = 202
-#pluginUntilBuild = 233.*
+pluginUntilBuild = 253.*
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType = IC
-#platformVersion = 2020.2.1
 # TODO change according IDE version
-platformVersion = LATEST-EAP-SNAPSHOT
+platformVersion = 2021.3.2
+# platformVersion = LATEST-EAP-SNAPSHOT
 
 platformDownloadSources = true
 

gradle.properties

@@ -1,12 +1,10 @@
 package org.yanhuang.plugins.intellij.exportjar.changes;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vcs.actions.VcsContext;
 import com.intellij.openapi.vcs.changes.CommitExecutor;
 import com.intellij.openapi.vcs.changes.actions.AbstractCommitChangesAction;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.yanhuang.plugins.intellij.exportjar.utils.Constants;
 
 /**
  * perform export jar from local changes (i.e. vcs commits)
@@ -19,9 +17,4 @@ protected CommitExecutor getExecutor(@NotNull Project project) {
         return ExportCommitExecutor.getInstance(project);
     }
 
-    @Nullable
-    @Override
-    protected String getActionName(@NotNull VcsContext dataContext) {
-        return Constants.exportCommitActionName; // compatible with version before 191.0
-    }
 }

handy-export-jar.jar

@@ -1,5 +1,7 @@
 package org.yanhuang.plugins.intellij.exportjar.ui;
 
+import com.intellij.openapi.application.Application;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.compiler.CompileStatusNotification;
 import com.intellij.openapi.compiler.CompilerManager;
 import com.intellij.openapi.fileChooser.FileChooser;
@@ -14,7 +16,6 @@
 import com.intellij.ui.TitledSeparator;
 import com.intellij.ui.content.MessageView;
 import com.intellij.util.Consumer;
-import com.intellij.util.WaitForProgressToShow;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.components.BorderLayoutPanel;
 import org.jetbrains.annotations.NotNull;
@@ -226,10 +227,11 @@ public void doExport(VirtualFile[] exportFiles) {
         if (isEmpty(exportFiles)) {
             return;
         }
+        final Application app = ApplicationManager.getApplication();
         final Module[] modules = CommonUtils.findModule(project, exportFiles);
         String selectedOutputJarFullPath = (String) this.outPutJarFileComboBox.getModel().getSelectedItem();
         if (selectedOutputJarFullPath == null || selectedOutputJarFullPath.trim().length() == 0) {
-            WaitForProgressToShow.runOrInvokeAndWaitAboveProgress(() -> showErrorDialog(project, "The selected output path should not empty", Constants.actionName));
+            app.invokeAndWait(() -> showErrorDialog(project, "The selected output path should not empty", Constants.actionName));
             return;
         }
         Path exportJarFullPath = Paths.get(selectedOutputJarFullPath.trim());
@@ -241,7 +243,7 @@ public void doExport(VirtualFile[] exportFiles) {
                 exportJarFullPath = exportJarParentPath.resolve(exportJarFullPath);
             }
             if (!Files.exists(exportJarParentPath)) {
-                WaitForProgressToShow.runOrInvokeAndWaitAboveProgress(() -> showErrorDialog(project, "The selected output path is not exists", Constants.actionName));
+                app.invokeAndWait(() -> showErrorDialog(project, "The selected output path is not exists", Constants.actionName));
             } else {
                 String exportJarName = exportJarFullPath.getFileName().toString();
                 if (!exportJarName.endsWith(".jar")) {
@@ -250,9 +252,8 @@ public void doExport(VirtualFile[] exportFiles) {
                 if (Files.exists(exportJarFullPath)) {
                     final int[] result = new int[1];
                     final Path finalJarPath = exportJarFullPath;
-                    WaitForProgressToShow.runOrInvokeAndWaitAboveProgress(
-                            () -> result[0] = Messages.showYesNoDialog(project, finalJarPath + " already exists, replace it? ",
-                                    Constants.actionName, getWarningIcon()));
+                    app.invokeAndWait(() -> result[0] = Messages.showYesNoDialog(project, finalJarPath + " already exists, replace it? ",
+                            Constants.actionName, getWarningIcon()));
                     if (result[0] == Messages.NO) {
                         return;
                     }
@@ -262,17 +263,16 @@ public void doExport(VirtualFile[] exportFiles) {
                 final CompileStatusNotification packager = new ExportPacker(project, exportFiles, exportJarFullPath,
                         exportJavaFileCheckBox.isSelected(), exportClassFileCheckBox.isSelected(),
                         exportTestFileCheckBox.isSelected());
-                WaitForProgressToShow.runOrInvokeAndWaitAboveProgress(() ->
-                        CompilerManager.getInstance(project).make(project, null == modules ? new Module[0] : modules, packager));
+                app.invokeAndWait(() -> CompilerManager.getInstance(project).make(project, null == modules ? new Module[0] : modules, packager));
             }
         } else {
-            WaitForProgressToShow.runOrInvokeAndWaitAboveProgress(() -> showErrorDialog(project, "Please specify export jar file name", Constants.actionName));
+            app.invokeAndWait(() -> showErrorDialog(project, "Please specify export jar file name", Constants.actionName));
         }
     }
 
     private boolean isEmpty(VirtualFile[] exportFiles) {
         if (exportFiles == null || exportFiles.length == 0) {
-            WaitForProgressToShow.runOrInvokeAndWaitAboveProgress(() -> showErrorDialog(project, "Export files is empty, please select them first", Constants.actionName));
+            ApplicationManager.getApplication().invokeAndWait(() -> showErrorDialog(project, "Export files is empty, please select them first", Constants.actionName));
             return true;
         }
         return false;

src/main/java/org/yanhuang/plugins/intellij/exportjar/changes/ExportCommitAction.java

@@ -1,6 +1,5 @@
 package org.yanhuang.plugins.intellij.exportjar.ui;
 
-import com.intellij.history.integration.ui.views.RevisionsList;
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.DataContext;

src/main/java/org/yanhuang/plugins/intellij/exportjar/ui/SettingDialog.java

@@ -10,7 +10,6 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
-import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.JavaDirectoryService;
 import com.intellij.psi.PsiClass;

src/main/java/org/yanhuang/plugins/intellij/exportjar/ui/UIFactory.java

@@ -1,7 +1,6 @@
 package org.yanhuang.plugins.intellij.exportjar.utils;
 
 import com.intellij.compiler.impl.ProblemsViewPanel;
-import com.intellij.ide.actions.RevealFileAction;
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationType;
 import com.intellij.notification.Notifications;