From 3f9e515ef0d33dae1f0dfbc81a23a618cec0b310 Mon Sep 17 00:00:00 2001 From: gtoison Date: Sun, 30 Oct 2022 15:51:34 +0000 Subject: [PATCH 1/4] fix: PluginManager.getPluginByClass() only exists since 2022.1.4 - revert to using deprecated PluginManager.getPluginByClassName() - PluginDescriptor.getPluginPath() does not exist in 2019.3.5, drop compatibility --- .../org/infinitest/intellij/idea/IdeaModuleSettings.java | 6 ++++-- infinitest-intellij/src/main/resources/META-INF/plugin.xml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/infinitest-intellij/src/main/java/org/infinitest/intellij/idea/IdeaModuleSettings.java b/infinitest-intellij/src/main/java/org/infinitest/intellij/idea/IdeaModuleSettings.java index f776ca19..fb886ee5 100644 --- a/infinitest-intellij/src/main/java/org/infinitest/intellij/idea/IdeaModuleSettings.java +++ b/infinitest-intellij/src/main/java/org/infinitest/intellij/idea/IdeaModuleSettings.java @@ -44,10 +44,11 @@ import com.intellij.execution.CommonProgramRunConfigurationParameters; import com.intellij.execution.util.ProgramParametersConfigurator; +import com.intellij.ide.plugins.IdeaPluginDescriptor; import com.intellij.ide.plugins.PluginManager; import com.intellij.openapi.compiler.CompilerPaths; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.extensions.PluginDescriptor; +import com.intellij.openapi.extensions.PluginId; import com.intellij.openapi.module.Module; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.CompilerModuleExtension; @@ -238,7 +239,8 @@ CompilerModuleExtension compilerModuleExtension() { } private String infinitestJarPath(String jarName) { - PluginDescriptor descriptor = PluginManager.getPluginByClass(getClass()); + PluginId pluginId = PluginManager.getPluginByClassName(getClass().getName()); + IdeaPluginDescriptor descriptor = PluginManager.getPlugin(pluginId); Path pluginPath = descriptor.getPluginPath(); Path jar = pluginPath.resolve("lib/" + jarName); diff --git a/infinitest-intellij/src/main/resources/META-INF/plugin.xml b/infinitest-intellij/src/main/resources/META-INF/plugin.xml index 43998340..51162976 100644 --- a/infinitest-intellij/src/main/resources/META-INF/plugin.xml +++ b/infinitest-intellij/src/main/resources/META-INF/plugin.xml @@ -18,7 +18,7 @@ ]]> - + com.intellij.modules.platform com.intellij.modules.java From 567b0feeffa4bcf61b951efd202b54de9c8defa1 Mon Sep 17 00:00:00 2001 From: gtoison Date: Sun, 30 Oct 2022 15:59:04 +0000 Subject: [PATCH 2/4] releast infinitest-intellij patch as 5.4.0.3 --- functional-tests/infinitest-runner-spock-test/pom.xml | 2 +- infinitest-classloader/pom.xml | 2 +- infinitest-eclipse-feature/pom.xml | 2 +- infinitest-eclipse/pom.xml | 2 +- infinitest-intellij/pom.xml | 2 +- infinitest-lib/pom.xml | 2 +- infinitest-runner-test/pom.xml | 2 +- infinitest-runner/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/functional-tests/infinitest-runner-spock-test/pom.xml b/functional-tests/infinitest-runner-spock-test/pom.xml index 8fd94514..88a9c315 100644 --- a/functional-tests/infinitest-runner-spock-test/pom.xml +++ b/functional-tests/infinitest-runner-spock-test/pom.xml @@ -4,7 +4,7 @@ org.infinitest infinitest-parent - 5.4.0.2 + 5.4.0.3 ../../ infinitest-runner-spock-test diff --git a/infinitest-classloader/pom.xml b/infinitest-classloader/pom.xml index 0b8789a4..e4ecf7d1 100644 --- a/infinitest-classloader/pom.xml +++ b/infinitest-classloader/pom.xml @@ -5,7 +5,7 @@ org.infinitest infinitest-parent - 5.4.0.2 + 5.4.0.3 Infinitest ClassLoader diff --git a/infinitest-eclipse-feature/pom.xml b/infinitest-eclipse-feature/pom.xml index 2b18ed96..c08c161f 100644 --- a/infinitest-eclipse-feature/pom.xml +++ b/infinitest-eclipse-feature/pom.xml @@ -3,7 +3,7 @@ org.infinitest infinitest-parent - 5.4.0.2 + 5.4.0.3 infinitest-eclipse-feature Infinitest Feature for Eclipse diff --git a/infinitest-eclipse/pom.xml b/infinitest-eclipse/pom.xml index c1bacf56..d8e53946 100644 --- a/infinitest-eclipse/pom.xml +++ b/infinitest-eclipse/pom.xml @@ -5,7 +5,7 @@ org.infinitest infinitest-parent - 5.4.0.2 + 5.4.0.3 Infinitest Plugin for Eclipse diff --git a/infinitest-intellij/pom.xml b/infinitest-intellij/pom.xml index 7ae37f17..5d29fb9a 100644 --- a/infinitest-intellij/pom.xml +++ b/infinitest-intellij/pom.xml @@ -4,7 +4,7 @@ org.infinitest infinitest-parent - 5.4.0.2 + 5.4.0.3 Infinitest for IntelliJ diff --git a/infinitest-lib/pom.xml b/infinitest-lib/pom.xml index 94a7dba9..f7be6abe 100644 --- a/infinitest-lib/pom.xml +++ b/infinitest-lib/pom.xml @@ -5,7 +5,7 @@ org.infinitest infinitest-parent - 5.4.0.2 + 5.4.0.3 Infinitest Lib diff --git a/infinitest-runner-test/pom.xml b/infinitest-runner-test/pom.xml index 847d790a..ac4d19db 100644 --- a/infinitest-runner-test/pom.xml +++ b/infinitest-runner-test/pom.xml @@ -3,7 +3,7 @@ org.infinitest infinitest-parent - 5.4.0.2 + 5.4.0.3 infinitest-runner-test infinitest-runner-test diff --git a/infinitest-runner/pom.xml b/infinitest-runner/pom.xml index b91b9805..86589537 100644 --- a/infinitest-runner/pom.xml +++ b/infinitest-runner/pom.xml @@ -5,7 +5,7 @@ org.infinitest infinitest-parent - 5.4.0.2 + 5.4.0.3 Infinitest Runner diff --git a/pom.xml b/pom.xml index d4fc248b..c891b6d4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ infinitest-parent pom Infinitest Parent POM - 5.4.0.2 + 5.4.0.3 http://infinitest.github.com/ From 8739f8c82e01188352c41a32400bad48baeaa8a6 Mon Sep 17 00:00:00 2001 From: gtoison Date: Sun, 30 Oct 2022 18:56:23 +0000 Subject: [PATCH 3/4] build: disable filtering so we don't get corrupted jar files --- infinitest-eclipse/src/main/assembly/assembly-site-zip.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infinitest-eclipse/src/main/assembly/assembly-site-zip.xml b/infinitest-eclipse/src/main/assembly/assembly-site-zip.xml index ac86883c..d2d92054 100644 --- a/infinitest-eclipse/src/main/assembly/assembly-site-zip.xml +++ b/infinitest-eclipse/src/main/assembly/assembly-site-zip.xml @@ -7,7 +7,7 @@ - true + false target/update_site From 82cfa5016f3075f069b4d03b593ab976b6c2a7e6 Mon Sep 17 00:00:00 2001 From: gtoison Date: Sun, 30 Oct 2022 18:56:44 +0000 Subject: [PATCH 4/4] build: copy the feature jar before packaging --- infinitest-eclipse/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infinitest-eclipse/pom.xml b/infinitest-eclipse/pom.xml index d8e53946..36807bf1 100644 --- a/infinitest-eclipse/pom.xml +++ b/infinitest-eclipse/pom.xml @@ -119,7 +119,7 @@ copy-feature - package + prepare-package copy