gradle intellij platform 2.* build migration CI issues.

- upgrade spock to 2.* (to support groovy 3 as in IDEA dependencies) - upgrade junit runtime to 5 (to support spock 2)
wrdv · Sep 14, 2024 · ebff036 · ebff036
1 parent 1bb6b33
commit ebff036
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 42 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,8 +12,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        IDEA_VERSION: [ 2023.2, 2024.1, LATEST-EAP-SNAPSHOT ]
-        WITH_IDEA_PLUGINS: [ true, false ]
         include:
           - IDEA_VERSION: 2023.2
             SCALA_PLUGIN_VERSION: 2023.2.23
@@ -24,9 +22,9 @@ jobs:
           - IDEA_VERSION: 2024.1
             SCALA_PLUGIN_VERSION: 2024.1.1
             WITH_IDEA_PLUGINS: true
-          - IDEA_VERSION: 2024.1
-            SCALA_PLUGIN_VERSION: 2024.1.1
-            WITH_IDEA_PLUGINS: false
+          - IDEA_VERSION: 2024.2.1
+            SCALA_PLUGIN_VERSION: 2024.2.1
+            WITH_IDEA_PLUGINS: true
           - IDEA_VERSION: LATEST-EAP-SNAPSHOT
             SCALA_PLUGIN_VERSION: 2024.2.1
             WITH_IDEA_PLUGINS: true

diff --git a/build.gradle b/build.gradle
@@ -23,7 +23,7 @@ println "***********************************************************************
 println "              Running build for ideaVersion: $ideaVersion and scalaPluginVersion: $scalaPluginVersion with Groovy plugin ${groovyOn} and Scala plugin ${scalaOn}"
 println "*****************************************************************************************************************************************************************"
 def isRunInCI=Boolean.valueOf(System.getenv('CI'))
-def testedProjects = subprojects + rootProject
+
 repositories {
     mavenCentral()
     intellijPlatform {
@@ -85,6 +85,7 @@ allprojects {
             includeNoLocationClasses = true
             excludes = ["jdk.internal.*"]
         }
+        useJUnitPlatform()
     }
 }
 
@@ -130,37 +131,44 @@ dependencies {
 //                "TemplateWordInPluginId,ForbiddenPluginIdPrefix"
 //        )
 //    }
-        testFramework(TestFrameworkType.Platform.INSTANCE)
+//        testFramework(TestFrameworkType.Platform.INSTANCE)
+        testFramework(TestFrameworkType.JUnit5.INSTANCE)
         testFramework(TestFrameworkType.Plugin.Java.INSTANCE)
+        pluginModule(implementation(project(':testme-intellij-common')))
+        pluginModule(implementation(project(':testme-intellij-groovy')))
+        pluginModule(implementation(project(':testme-intellij-scala')))
     }
 
-    testImplementation 'junit:junit:4.13.2'
-    implementation(project(':testme-intellij-common')) {
-        exclude group: 'com.jetbrains', module: 'ideaIC'
-        exclude group: 'org.jetbrains.plugins', module: 'junit'
-        exclude group: 'org.jetbrains.plugins', module: 'properties'
-        exclude group: 'org.jetbrains.plugins', module: 'Groovy'
-    }
-    implementation(project(':testme-intellij-groovy')) {
-        exclude group: 'com.jetbrains', module: 'ideaIC'
-        exclude group: 'org.jetbrains.plugins', module: 'junit'
-        exclude group: 'org.jetbrains.plugins', module: 'properties'
-        exclude group: 'org.jetbrains.plugins', module: 'Groovy'
-    }
-    implementation(project(':testme-intellij-scala')) {
-        exclude group: 'com.jetbrains', module: 'ideaIC'
-        exclude group: 'org.jetbrains.plugins', module: 'junit'
-        exclude group: 'org.jetbrains.plugins', module: 'properties'
-        exclude group: 'org.jetbrains.plugins', module: 'Groovy'
-        exclude group: 'org.jetbrains.plugins', module: 'Scala'
-    }
-
+//    implementation(project(':testme-intellij-common')) {
+//        exclude group: 'com.jetbrains', module: 'ideaIC'
+//        exclude group: 'org.jetbrains.plugins', module: 'junit'
+//        exclude group: 'org.jetbrains.plugins', module: 'properties'
+//        exclude group: 'org.jetbrains.plugins', module: 'Groovy'
+//    }
+//    implementation(project(':testme-intellij-groovy')) {
+//        exclude group: 'com.jetbrains', module: 'ideaIC'
+//        exclude group: 'org.jetbrains.plugins', module: 'junit'
+//        exclude group: 'org.jetbrains.plugins', module: 'properties'
+//        exclude group: 'org.jetbrains.plugins', module: 'Groovy'
+//    }
+//    implementation(project(':testme-intellij-scala')) {
+//        exclude group: 'com.jetbrains', module: 'ideaIC'
+//        exclude group: 'org.jetbrains.plugins', module: 'junit'
+//        exclude group: 'org.jetbrains.plugins', module: 'properties'
+//        exclude group: 'org.jetbrains.plugins', module: 'Groovy'
+//        exclude group: 'org.jetbrains.plugins', module: 'Scala'
+//    }
+//
     compileOnly 'org.projectlombok:lombok:1.18.20'
     annotationProcessor 'org.projectlombok:lombok:1.18.20'
 
+    testCompileOnly group: 'org.scala-lang', name: 'scala-library', version: '2.11.12'
     testImplementation 'org.mockito:mockito-core:4.3.1'
     testImplementation("org.spockframework:spock-core:2.3-groovy-3.0")
-    testCompileOnly group: 'org.scala-lang', name: 'scala-library', version: '2.11.12'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
+    testImplementation 'junit:junit:4.13.2'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
 
 def javadocHeader = ""

diff --git a/settings.gradle b/settings.gradle
@@ -6,5 +6,5 @@ pluginManagement {
     }
 }
 rootProject.name = 'testme-intellij'
-include 'testme-intellij-common', 'testme-intellij-groovy', 'testme-intellij-scala'
+include ':testme-intellij-common', ':testme-intellij-groovy', ':testme-intellij-scala'
 
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -29,8 +29,8 @@
   <idea-version since-build="232" until-build="241.*"/>
   <depends>com.intellij.modules.java</depends>
   <depends>JUnit</depends>
-  <depends optional="true" config-file="META-INF/plugin-groovy.xml">org.intellij.groovy</depends>
-  <depends optional="true" config-file="META-INF/plugin-scala.xml">org.intellij.scala</depends>
+  <depends optional="true" config-file="plugin-groovy.xml">org.intellij.groovy</depends>
+  <depends optional="true" config-file="plugin-scala.xml">org.intellij.scala</depends>
   <extensions defaultExtensionNs="com.intellij">
     <applicationConfigurable parentId="root" displayName="TestMe" id="preferences.TestMe" instance="com.weirddev.testme.intellij.ui.settings.TestMeConfigurable"/>
     <projectConfigurable  id="preferences.TestMe.templates"  parentId="preferences.TestMe"  displayName="TestMe Templates" provider="com.weirddev.testme.intellij.ui.template.TestTemplatesConfigurable$Provider"/>

diff --git a/testme-intellij-groovy/build.gradle b/testme-intellij-groovy/build.gradle
@@ -9,11 +9,11 @@ repositories {
     }
 }
 
-intellijPlatform {
-    pluginConfiguration {
-        name = 'TestMe-groovy'
-    }
-}
+//intellijPlatform {
+//    pluginConfiguration {
+//        name = 'TestMe-groovy'
+//    }
+//}
 
 def enabledPlugins = ['com.intellij.java','org.intellij.groovy']
 dependencies {

diff --git a/testme-intellij-scala/build.gradle b/testme-intellij-scala/build.gradle
@@ -9,11 +9,11 @@ repositories {
     }
 }
 
-intellijPlatform {
-    pluginConfiguration {
-        name = 'TestMe-scala'
-    }
-}
+//intellijPlatform {
+//    pluginConfiguration {
+//        name = 'TestMe-scala'
+//    }
+//}
 
 dependencies {
     intellijPlatform {