chore: Support against IC-2024.2+

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

.github/workflows/IJ-latest.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew build --continue -PplatformVersion=LATEST-EAP-SNAPSHOT
+        run: ./gradlew build --continue -PideaVersion=LATEST-EAP-SNAPSHOT
       - uses: actions/upload-artifact@v4
         if: always()
         with:

.github/workflows/IJ.yml

@@ -27,5 +27,4 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew build -PplatformVersion=${{ matrix.IJ }}
-
+      run: ./gradlew build -PideaVersion=${{ matrix.IJ }}

.github/workflows/release.yml

@@ -11,9 +11,9 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-        java-version: 17
-        distribution: 'temurin'
-        cache: 'gradle'
+          java-version: 17
+          distribution: 'temurin'
+          cache: 'gradle'
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 
 group = "com.redhat.devtools.intellij"
 version = providers.gradleProperty("projectVersion").get() // Plugin version
-val ideaVersion = providers.gradleProperty("platformVersion").get()
+val platformVersion = providers.gradleProperty("ideaVersion").get()
 
 // Set the JVM language level used to build the project.
 java {
@@ -31,7 +31,7 @@ repositories {
 
 dependencies {
     intellijPlatform {
-        create(IntelliJPlatformType.IntellijIdeaCommunity, ideaVersion)
+        create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersion)
 
         // Bundled Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
         bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })
@@ -59,10 +59,14 @@ dependencies {
     testImplementation(libs.junit)
     testImplementation(libs.assertj.core)
     testImplementation(libs.mockito.inline)
-    testImplementation(libs.opentest4j) // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-faq.html#missing-opentest4j-dependency-in-test-framework
+    testImplementation(libs.opentest4j) // known issue: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-faq.html#missing-opentest4j-dependency-in-test-framework
 
 }
 
+intellijPlatform {
+    buildSearchableOptions = false
+}
+
 tasks {
     wrapper {
         gradleVersion = providers.gradleProperty("gradleVersion").get()
@@ -102,8 +106,8 @@ nexusPublishing {
 
 val testJarFile = file("${layout.buildDirectory}/libs/intellij-common-${version}-test.jar")
 val testArtifact = artifacts.add("archives", testJarFile) {
-    setType("test")
-    setClassifier("test")
+    type = "test"
+    classifier = "test"
     builtBy("packageTests")
 }
 

gradle.properties

@@ -3,24 +3,21 @@ nexusUser=invalid
 nexusPassword=invalid
 
 # 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.2
+ideaVersion=2024.2
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion=8.8
+gradleVersion=8.5
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 platformBundledPlugins=org.jetbrains.plugins.yaml
 platformPlugins=
 
-# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild=223
-
 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
 kotlin.stdlib.default.dependency=false
 
 # Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
-org.gradle.configuration-cache=true
+# disabled because of issue with publish plugin -> https://github.com/gradle-nexus/publish-plugin/issues/221
+org.gradle.configuration-cache=false
 
 # Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html
 org.gradle.caching=true

gradle/libs.versions.toml

@@ -12,7 +12,7 @@ opentest4j = "1.3.0"
 
 # plugins
 gradleIntelliJPlugin = "2.1.0"
-gradleNexusPublishPlugin = "1.1.0"
+gradleNexusPublishPlugin = "2.0.0"
 
 [libraries]
 junit = { group = "junit", name = "junit", version.ref = "junit" }