chore: fix Latest IJ workflow (#979)

* chore: update to intellij gradle plugin 2.2.0

Signed-off-by: Stephane Bouchet <[email protected]>

* chore: fix latest IJ workflow

Signed-off-by: Stephane Bouchet <[email protected]>

* chore: fix latest IJ workflow

Signed-off-by: Stephane Bouchet <[email protected]>

* chore: fix latest IJ workflow

Signed-off-by: Stephane Bouchet <[email protected]>

* chore: fix latest IJ workflow

Signed-off-by: Stephane Bouchet <[email protected]>

* chore: fix latest IJ workflow

Signed-off-by: Stephane Bouchet <[email protected]>

---------

Signed-off-by: Stephane Bouchet <[email protected]>

Author: sbouchet

.github/workflows/IJ-latest.yml

@@ -25,6 +25,7 @@ jobs:
       - name: Build with Gradle
         run: |
           LATEST_EAP_SNAPSHOT=$(./gradlew printProductsReleases | grep 'IC-' | head -n 1 | cut -d'-' -f2)
+          echo "building using latest EAP version $LATEST_EAP_SNAPSHOT"
           ./gradlew build --continue -PplatformVersion=$LATEST_EAP_SNAPSHOT
       - uses: actions/upload-artifact@v4
         if: always()

.github/workflows/validate_IJ_versions.yml

@@ -7,11 +7,14 @@ on:
 jobs:
   validate:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        IJ: [ 2023.1, 2023.2, 2023.3, 2024.1, 2024.2, 2024.3 ]
 
     steps:
+      # Free GitHub Actions Environment Disk Space
+    - name: Maximize Build Space
+      uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # main
+      with:
+        tool-cache: false
+        large-packages: false
     - name: Checkout Code
       uses: actions/checkout@v4
     - name: Set up JDK 17
@@ -22,14 +25,12 @@ jobs:
         cache: 'gradle'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
-    - name: Build with Gradle
-      run: ./gradlew build -PplatformVersion=${{ matrix.IJ }}
     - name: Verify with Gradle
-      run: ./gradlew verifyPlugin -PplatformVersion=${{ matrix.IJ }}
+      run: ./gradlew verifyPlugin
     - name: Upload report
       uses: actions/upload-artifact@v4
       if: always()
       with:
-        name: ${{ matrix.IJ }}-verifier-report
+        name: verifier-report
         path: build/reports/pluginVerifier
         if-no-files-found: ignore

build.gradle.kts

@@ -3,6 +3,9 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 import org.jetbrains.intellij.platform.gradle.models.ProductRelease
+import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLevel.*
+import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.VerificationReportsFormats.MARKDOWN
+import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.VerificationReportsFormats.PLAIN
 
 plugins {
     id("idea")
@@ -34,7 +37,7 @@ repositories {
 
 dependencies {
     intellijPlatform {
-        create(IntelliJPlatformType.IntellijIdeaCommunity, ideaVersion)
+        intellijIdeaCommunity(ideaVersion)
 
         // Bundled Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
         bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })
@@ -47,8 +50,6 @@ dependencies {
 
         pluginVerifier()
 
-        instrumentationTools()
-
         testFramework(TestFrameworkType.Platform)
     }
 
@@ -68,7 +69,6 @@ dependencies {
     implementation(libs.jjwt.impl)
     implementation(libs.jjwt.jackson)
     implementation(libs.converter.jackson)
-    implementation(libs.annotations) // to build against platform <= 2023.2
 
     // for unit tests
     testImplementation(libs.junit)
@@ -106,8 +106,10 @@ intellijPlatform {
     }
 
     pluginVerification {
+        failureLevel = listOf(INVALID_PLUGIN, COMPATIBILITY_PROBLEMS, MISSING_DEPENDENCIES)
+        verificationReportsFormats = listOf(MARKDOWN, PLAIN)
         ides {
-            ide(IntelliJPlatformType.IntellijIdeaCommunity, ideaVersion)
+            recommended()
         }
         freeArgs = listOf(
             "-mute",
@@ -121,16 +123,8 @@ tasks {
         gradleVersion = providers.gradleProperty("gradleVersion").get()
     }
 
-    fun supportsEnhancedClassRedefinition(): Boolean {
-        val platformVersion = findProperty("platformVersion").toString().toFloatOrNull()
-        return platformVersion != null
-                && platformVersion >= 2024.1
-    }
-
     runIde {
-        if (supportsEnhancedClassRedefinition()) {
-            jvmArgs("-XX:+AllowEnhancedClassRedefinition", "-XX:HotswapAgent=fatjar")
-        }
+        jvmArgs("-XX:+AllowEnhancedClassRedefinition", "-XX:HotswapAgent=fatjar")
         systemProperty("com.redhat.devtools.intellij.telemetry.mode", "debug")
         findProperty("tools.dl.path")?.let { systemProperty("tools.dl.path", it) }
         //systemProperty("jboss.sandbox.api.endpoint", "http://localhost:3000") // enable when running sandbox locally, see below
@@ -194,19 +188,20 @@ tasks {
 sourceSets {
     create("it") {
         description = "integrationTest"
+        java.srcDir("src/it/java")
+        resources.srcDir("src/it/resources")
         compileClasspath += sourceSets.main.get().compileClasspath + sourceSets.test.get().compileClasspath
-        runtimeClasspath += output + compileClasspath
+        runtimeClasspath += output + compileClasspath + sourceSets.test.get().runtimeClasspath
     }
 }
 
-configurations.all {
-    exclude(group = "org.slf4j", module = "slf4j-api")
-    exclude(group = "bundledPlugin", module = "Docker") // suppress multiple SLF4J providers
+configurations {
+    runtimeClasspath {
+        exclude(group = "org.slf4j", module = "slf4j-api")
+        exclude(group = "bundledPlugin", module = "Docker") // suppress multiple SLF4J providers
+    }
 }
 
-configurations["itRuntimeOnly"].extendsFrom(configurations.testRuntimeOnly.get())
-configurations["itImplementation"].extendsFrom(configurations.testImplementation.get())
-
 val integrationTest by intellijPlatformTesting.testIde.registering {
     task {
         systemProperty("com.redhat.devtools.intellij.telemetry.mode", "disabled")
@@ -222,24 +217,14 @@ val integrationTest by intellijPlatformTesting.testIde.registering {
             showStandardStreams = false
         }
         jvmArgs("-Djava.awt.headless=true")
-        useJUnitPlatform {
-            includeEngines("junit-vintage")
-            excludeEngines("junit-jupiter")
-        }
         shouldRunAfter(tasks["test"])
     }
 
     dependencies {
-        testRuntimeOnly(libs.junit.vintage.engine)
-        testImplementation(libs.junit.platform.launcher)
-        testImplementation(libs.junit.platform.suite)
-        testImplementation(libs.junit.jupiter)
-        testImplementation(libs.junit.jupiter.api)
-        testImplementation(libs.junit.jupiter.engine)
         testImplementation(devtoolsCommonForTests)
-        testImplementation(libs.devtools.common.ui.test)
         testImplementation(libs.awaitility)
     }
+
 }
 
 val integrationUITest by intellijPlatformTesting.testIde.registering {
@@ -267,10 +252,14 @@ val integrationUITest by intellijPlatformTesting.testIde.registering {
         shouldRunAfter(tasks["test"])
     }
 
-    plugins {
-        robotServerPlugin()
+    dependencies {
+        testRuntimeOnly(libs.junit.jupiter.engine)
+        testImplementation(libs.junit.platform.suite)
+        testImplementation(libs.junit.platform.launcher)
+        testImplementation(libs.junit.jupiter.api)
+        testImplementation(libs.devtools.common.ui.test)
     }
-
+/*
     dependencies {
         testImplementation(libs.junit.platform.launcher)
         testImplementation(libs.junit.platform.suite)
@@ -281,6 +270,8 @@ val integrationUITest by intellijPlatformTesting.testIde.registering {
         testImplementation(libs.devtools.common.ui.test)
         testImplementation(libs.awaitility)
     }
+    */
+
 }
 
 // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-tasks.html#runIdeForUiTests
@@ -293,7 +284,11 @@ val runIdeForUiTests by intellijPlatformTesting.runIde.registering {
                 "-Djb.consents.confirmation.enabled=false",
             )
         }
+
+        systemProperty("robot-server.port", System.getProperty("robot-server.port"))
+        systemProperty("com.redhat.devtools.intellij.telemetry.mode", "disabled")
     }
+
     plugins {
         robotServerPlugin()
     }

gradle.properties

@@ -3,8 +3,7 @@ jetBrainsToken=invalid
 jetBrainsChannel=stable
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
-# platformType = IC (not needed as hard-coded in gradle build directly)
-platformVersion=2024.3
+platformVersion=2024.1
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
 gradleVersion=8.5

gradle/libs.versions.toml

@@ -9,14 +9,14 @@ retrofit2 = "2.11.0"
 mockito = "5.12.0"
 easytesting = "1.4"
 mockserver = "5.15.0"
-junit-platform = "1.10.3"
-junit-jupiter = "5.10.3"
-devtools-common-ui-test = "0.4.3"
+junit-platform = "1.11.3"
+junit-jupiter = "5.11.3"
+devtools-common-ui-test = "0.4.4-SNAPSHOT"
 awaitility = "4.2.2"
 annotations = "24.0.0"
 
 # plugins
-gradleIntelliJPlugin = "2.0.1"
+gradleIntelliJPlugin = "2.2.0"
 sonarqube = "5.1.0.4882"
 
 [libraries]