Bump Gradle to 9.1 (#1357)

novotnyr · web-flow · commit a36c73088033 · 2025-10-21T23:03:25.000+02:00
* Bump Gradle to 9.1 except in plugins-verifier-service

* Bump spring-dependencyManagement to 1.1.7

* Cross-compile to Java 11 from Java 17 required by Gradle 9.x

* Base GitHub builds on Java 17 required by Gradle 9.x
diff --git a/.github/workflows/ide-diff-builder.yml b/.github/workflows/ide-diff-builder.yml
@@ -31,12 +31,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      # Setup Java 11 environment for the next steps
+      # Setup Java 17 environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v5
         with:
           distribution: zulu
-          java-version: 11
+          java-version: 17
 
       # Check out current repository
       - name: Fetch Sources
diff --git a/.github/workflows/intellij-feature-extractor.yml b/.github/workflows/intellij-feature-extractor.yml
@@ -31,12 +31,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      # Setup Java 11 environment for the next steps
+      # Setup Java 17 environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v5
         with:
           distribution: zulu
-          java-version: 11
+          java-version: 17
 
       # Check out current repository
       - name: Fetch Sources
diff --git a/.github/workflows/intellij-plugin-structure.yml b/.github/workflows/intellij-plugin-structure.yml
@@ -31,12 +31,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      # Setup Java 11 environment for the next steps
+      # Setup Java 17 environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v5
         with:
           distribution: zulu
-          java-version: 11
+          java-version: 17
 
       # Check out current repository
       - name: Fetch Sources
diff --git a/.github/workflows/intellij-plugin-verifier.yml b/.github/workflows/intellij-plugin-verifier.yml
@@ -31,12 +31,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      # Setup Java 11 environment for the next steps
+      # Setup Java 17 environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v5
         with:
           distribution: zulu
-          java-version: 11
+          java-version: 17
 
       # Check out current repository
       - name: Fetch Sources
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,4 +4,36 @@ tasks.register("clean") {
     dependsOn(gradle.includedBuild("intellij-plugin-structure").task(":clean"))
     dependsOn(gradle.includedBuild("intellij-plugin-verifier").task(":clean"))
     dependsOn(gradle.includedBuild("plugins-verifier-service").task(":clean"))
+}
+
+tasks.register("test") {
+  dependsOn(gradle.includedBuild("ide-diff-builder").task(":test"))
+  dependsOn(gradle.includedBuild("intellij-feature-extractor").task(":test"))
+  dependsOn(gradle.includedBuild("intellij-plugin-structure").task(":test"))
+  dependsOn(gradle.includedBuild("intellij-plugin-verifier").task(":test"))
+  dependsOn(gradle.includedBuild("plugins-verifier-service").task(":test"))
+}
+
+tasks.register<JavaExec>("checkPlugin") {
+  group = "application"
+  description = "Runs IntelliJ Plugin Verifier from CLI options"
+  mainClass = "com.jetbrains.pluginverifier.PluginVerifierMain"
+  dependsOn(gradle.includedBuild("intellij-plugin-verifier").task(":verifier-cli:shadowJar"))
+
+  val classpathFiles = gradle.includedBuild("intellij-plugin-verifier")
+    .projectDir
+    .resolve("verifier-cli/build/libs")
+    .listFiles { _, name -> name.endsWith("-all.jar") }
+  classpath = files(classpathFiles)
+  systemProperties = System.getProperties().mapKeysTo(mutableMapOf()) { it.key.toString() }
+
+  val ideValue: String? by project
+  val ide = ideValue
+    ?: throw InvalidUserDataException("Target IDE must be set in a Gradle project property. Use 'ide' project property, such as -Pide=<value>")
+
+  val pluginValue: String? by project
+  val plugin = pluginValue
+    ?: throw InvalidUserDataException("The plugin to be verified must be set in a Gradle project property. Use 'plugin' project property, such as -Pplugin=<value>")
+
+  args("check-plugin", plugin, ide)
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/ide-diff-builder/build.gradle.kts b/ide-diff-builder/build.gradle.kts
@@ -22,9 +22,8 @@ allprojects {
     }
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+tasks.withType<JavaCompile>().configureEach {
+  options.release = 11
 }
 
 val manifestAttributes = mapOf("Main-Class" to "org.jetbrains.ide.diff.builder.MainKt")
diff --git a/ide-diff-builder/gradle/wrapper/gradle-wrapper.properties b/ide-diff-builder/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/intellij-feature-extractor/build.gradle.kts b/intellij-feature-extractor/build.gradle.kts
@@ -24,12 +24,10 @@ allprojects {
     mavenLocal()
   }
 
-  java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+  tasks.withType<JavaCompile>().configureEach {
+    options.release = 11
   }
 
-
   tasks.withType<KotlinCompile> {
     kotlinOptions {
       jvmTarget = "11"
diff --git a/intellij-feature-extractor/gradle/wrapper/gradle-wrapper.properties b/intellij-feature-extractor/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/intellij-plugin-structure/build.gradle.kts b/intellij-plugin-structure/build.gradle.kts
@@ -37,9 +37,8 @@ allprojects {
     plugin("com.github.ben-manes.versions")
   }
 
-  java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+  tasks.withType<JavaCompile>().configureEach {
+    options.release = 11
   }
 
   repositories {
diff --git a/intellij-plugin-structure/gradle/wrapper/gradle-wrapper.properties b/intellij-plugin-structure/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/intellij-plugin-verifier/build.gradle.kts b/intellij-plugin-verifier/build.gradle.kts
@@ -47,9 +47,8 @@ allprojects {
   group = "org.jetbrains.intellij.plugins"
   version = projectVersion
 
-  java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+  tasks.withType<JavaCompile>().configureEach {
+    options.release = 11
   }
 
   tasks.withType<KotlinCompile> {
diff --git a/intellij-plugin-verifier/gradle/wrapper/gradle-wrapper.properties b/intellij-plugin-verifier/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/plugins-verifier-service/gradle/libs.versions.toml b/plugins-verifier-service/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ logback-classic = "1.2.13"
 log4j-toSlf4j = "2.22.0"
 mapdb = "3.0.10"
 spring-boot = "2.7.18"
-spring-dependencyManagement = "1.1.4"
+spring-dependencyManagement = "1.1.7"
 teamcity-restClient = "1.14.0"
 
 [libraries]

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,8 @@ allprojects {`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`		`-java {`
`26`		`- sourceCompatibility = JavaVersion.VERSION_11`
`27`		`- targetCompatibility = JavaVersion.VERSION_11`
	`25`	`+tasks.withType<JavaCompile>().configureEach {`
	`26`	`+ options.release = 11`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`val manifestAttributes = mapOf("Main-Class" to "org.jetbrains.ide.diff.builder.MainKt")`
Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,10 @@ allprojects {`
`24`	`24`	`mavenLocal()`
`25`	`25`	`}`
`26`	`26`
`27`		`- java {`
`28`		`- sourceCompatibility = JavaVersion.VERSION_11`
`29`		`- targetCompatibility = JavaVersion.VERSION_11`
	`27`	`+ tasks.withType<JavaCompile>().configureEach {`
	`28`	`+ options.release = 11`
`30`	`29`	`}`
`31`	`30`
`32`		`-`
`33`	`31`	`tasks.withType<KotlinCompile> {`
`34`	`32`	`kotlinOptions {`
`35`	`33`	`jvmTarget = "11"`