Update to Gradle 9 (#6548)

martinbonnin · web-flow · commit e56fdb4c3fbb · 2025-06-03T19:39:15.000+02:00
* Update to Gradle 9

* Adapt to Gradle 9
diff --git a/gradle.properties b/gradle.properties
@@ -27,8 +27,6 @@ org.jetbrains.dokka.gradle.enableLogHtmlPublicationLink=false
 
 org.jetbrains.dokka.experimental.tryK2=true
 org.jetbrains.dokka.experimental.tryK2.nowarn=true
-# https://youtrack.jetbrains.com/issue/KT-75605/Dependency-resolution-fails-in-commonTest-nativeTest-source-sets-for-KMP-module-when-depending-on-another-project-due-to-missing#focus=Comments-27-11699378.0-0
-kotlin.kmp.isolated-projects.support=auto
 
 # https://kotlinlang.slack.com/archives/C0B8L3U69/p1740063113894839
 kotlin.js.yarn=false
diff --git a/gradle/libraries.toml b/gradle/libraries.toml
@@ -28,12 +28,12 @@ javaPoet = "1.13.0"
 jetbrains-annotations = "24.0.1"
 junit = "4.13.2"
 kotlin-plugin-min = "1.9.0"
-kotlin-plugin = "2.1.20"
-kotlin-plugin-max = "2.1.20"
+kotlin-plugin = "2.1.21"
+kotlin-plugin-max = "2.1.21"
 kotlinx-coroutines = "1.9.0"
 kotlinx-datetime = "0.5.0"
 kotlinx-serialization-runtime = "1.6.2"
-ksp = "2.1.20-2.0.0"
+ksp = "2.1.21-2.0.1"
 ktor = "3.1.2"
 moshix = "0.14.1"
 node-fetch = "2.7.0"
@@ -111,7 +111,7 @@ guava-jre = { group = "com.google.guava", name = "guava", version.ref = "guava"
 http4k-bom = "org.http4k:http4k-bom:5.8.0.0"
 http4k-core = { module = "org.http4k:http4k-core" }
 http4k-server-jetty = { module = "org.http4k:http4k-server-jetty" }
-intellij-platform-plugin = "org.jetbrains.intellij.platform:intellij-platform-gradle-plugin:2.1.0"
+intellij-platform-plugin = "org.jetbrains.intellij.platform:intellij-platform-gradle-plugin:2.6.0"
 intellij-changelog = "org.jetbrains.intellij.plugins:gradle-changelog-plugin:2.0.0"
 jetbrains-annotations = { group = "org.jetbrains", name = "annotations", version.ref = "jetbrains-annotations" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-milestone-9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/libraries/apollo-gradle-plugin/build.gradle.kts b/libraries/apollo-gradle-plugin/build.gradle.kts
@@ -155,6 +155,7 @@ tasks.withType<Test> {
 
   maxHeapSize = "1g"
 
+//  debug = true
   maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).takeIf { it > 0 } ?: 1
 }
 
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/AndroidProjectTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/AndroidProjectTests.kt
@@ -1,5 +1,6 @@
 package test
 
+import com.apollographql.apollo.gradle.internal.DefaultApolloExtension.Companion.MIN_GRADLE_VERSION
 import com.google.common.truth.Truth
 import util.TestUtils
 import util.TestUtils.executeTaskAndAssertSuccess
@@ -95,7 +96,15 @@ class AndroidProjectTests {
   fun `kotlin Android min version succeeds`() {
     withTestProject("kotlin-android-plugin-version") { dir ->
       dir.disableIsolatedProjects()
-      val result = TestUtils.executeTask("build", dir)
+      /**
+       * Use "8.10" because older KGP are not compatible with Gradle 9:
+       *
+       * ```
+       * java.lang.NoClassDefFoundError: org/gradle/api/internal/HasConvention
+       * 	at org.jetbrains.kotlin.gradle.plugin.internal.CompatibilityConventionRegistrarG81.addConvention(CompatibilityConventionRegistrarG81.kt:14)
+       * ```
+       */
+      val result = TestUtils.executeGradleWithVersion(dir, "8.10", "build")
 
       Truth.assertThat(result.task(":build")!!.outcome).isEqualTo(TaskOutcome.SUCCESS)
     }
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/ConfigurationCacheTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/ConfigurationCacheTests.kt
@@ -1,4 +1,4 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/ConvertSchemaTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/ConvertSchemaTests.kt
@@ -1,4 +1,4 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 import com.apollographql.apollo.ast.introspection.normalize
 import com.apollographql.apollo.ast.introspection.toIntrospectionSchema
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/DeprecationTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/DeprecationTests.kt
@@ -1,4 +1,4 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 import util.TestUtils
 import util.replaceInText
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/GradleBuildCacheTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/GradleBuildCacheTests.kt
@@ -1,4 +1,4 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 import org.gradle.testkit.runner.TaskOutcome
 import org.junit.Assert
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/GradleToolingTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/GradleToolingTests.kt
@@ -1,4 +1,4 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 import com.apollographql.apollo.gradle.api.ApolloGradleToolingModel
 import org.gradle.tooling.GradleConnector
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/GroovyTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/GroovyTests.kt
@@ -1,4 +1,4 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 import util.TestUtils
 import org.junit.Test
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/JavaOnly.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/JavaOnly.kt
@@ -1,4 +1,4 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 import util.TestUtils
 import org.junit.Test
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/KotlinDSLTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/KotlinDSLTests.kt
@@ -1,4 +1,4 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 import util.TestUtils
 import util.generatedChild
@@ -24,7 +24,7 @@ class KotlinDSLTests {
         TestUtils.executeGradle(dir)
       } catch (e: UnexpectedBuildFailure) {
         exception = e
-        Truth.assertThat(e.message).contains("Unresolved reference: services")
+        Truth.assertThat(e.message).contains("Unresolved reference 'services'.")
       }
       Assert.assertNotNull(exception)
     }
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/KotlinJVMProjectTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/KotlinJVMProjectTests.kt
@@ -1,4 +1,4 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 import util.TestUtils
 import util.TestUtils.withSimpleProject
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/KotlinMultiplatformProjectTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/KotlinMultiplatformProjectTests.kt
@@ -1,4 +1,4 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 import util.TestUtils
 import org.junit.Test
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/KotlinPluginVersionTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/KotlinPluginVersionTests.kt
@@ -1,11 +1,10 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 import util.TestUtils
 import com.google.common.truth.Truth
 import org.gradle.testkit.runner.TaskOutcome
 import org.junit.Test
 import util.disableIsolatedProjects
-import java.io.File
 
 class KotlinPluginVersionTests {
 
@@ -17,7 +16,7 @@ class KotlinPluginVersionTests {
     TestUtils.withTestProject("kotlin-plugin-version-min") { dir ->
       dir.disableIsolatedProjects() // old KGP versions do not support isolated projects
 
-      val result = TestUtils.executeTask("build", dir)
+      val result = TestUtils.executeGradleWithVersion(dir, "8.10", "build")
 
       Truth.assertThat(result.task(":build")!!.outcome).isEqualTo(TaskOutcome.SUCCESS)
     }
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/LanguageVersionTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/LanguageVersionTests.kt
@@ -1,27 +1,31 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 import com.google.common.truth.Truth
+import org.gradle.testkit.runner.TaskOutcome
 import org.gradle.testkit.runner.UnexpectedBuildFailure
 import org.junit.Assert
 import org.junit.Test
 import util.TestUtils
 import util.disableIsolatedProjects
 import java.io.File
+import kotlin.test.assertEquals
 
 class LanguageVersionTests {
   @Test
   fun `compiling with 1_5 features with Kotlin 1_5 is working`() {
     withProject(kotlinLanguageVersion = "1.5", apolloLanguageVersion = "1.5") { dir ->
       dir.disableIsolatedProjects() // old KGP versions do not support isolated projects
-      TestUtils.executeTaskAndAssertSuccess(":assemble", dir)
+      TestUtils.executeGradleWithVersion(dir, "8.10", ":assemble").apply {
+        assertEquals(TaskOutcome.SUCCESS, task(":assemble")!!.outcome)
+      }
     }
   }
 
   @Test
   fun `compiling with 1_5 features with Kotlin 1_4 is not working`() {
     withProject(kotlinLanguageVersion = "1.4", apolloLanguageVersion = "1.5") { dir ->
       try {
-        TestUtils.executeTask(":assemble", dir)
+        TestUtils.executeGradleWithVersion(dir, "8.10", ":assemble")
         Assert.fail("Compiling with incompatible languageVersion should fail")
       } catch (e: UnexpectedBuildFailure) {
         Truth.assertThat(e.message).contains("The feature \"sealed interfaces\" is only available since language version 1.5")
@@ -33,7 +37,7 @@ class LanguageVersionTests {
   fun `using bogus languageVersion fails`() {
     withProject(kotlinLanguageVersion = "1.5", apolloLanguageVersion = "3.14") { dir ->
       try {
-        TestUtils.executeTask(":assemble", dir)
+        TestUtils.executeGradleWithVersion(dir, "8.10", ":assemble")
         Assert.fail("Compiling with incompatible languageVersion should fail")
       } catch (e: UnexpectedBuildFailure) {
         Truth.assertThat(e.message).contains("languageVersion '3.14' is not supported")
@@ -44,15 +48,19 @@ class LanguageVersionTests {
   @Test
   fun `compiling with 1_9 features generates entries in enums`() {
     withProject(apolloLanguageVersion = "1.9", graphqlPath = "githunt") { dir ->
-      TestUtils.executeTaskAndAssertSuccess(":generateApolloSources", dir)
+      TestUtils.executeGradleWithVersion(dir, "8.10", ":generateApolloSources").apply {
+        assertEquals(TaskOutcome.SUCCESS, task(":generateApolloSources")!!.outcome)
+      }
       Assert.assertTrue(File(dir, "build/generated/source/apollo/service/com/example/type/FeedType.kt").readText().contains("entries.find"))
     }
   }
 
   @Test
   fun `compiling with 1_5 features generates values in enums`() {
     withProject(apolloLanguageVersion = "1.5", graphqlPath = "githunt") { dir ->
-      TestUtils.executeTaskAndAssertSuccess(":generateApolloSources", dir)
+      TestUtils.executeGradleWithVersion(dir, "8.10", ":generateApolloSources").apply {
+        assertEquals(TaskOutcome.SUCCESS, task(":generateApolloSources")!!.outcome)
+      }
       Assert.assertTrue(File(dir, "build/generated/source/apollo/service/com/example/type/FeedType.kt").readText().contains("values().find"))
     }
   }
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/LazyTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/LazyTests.kt
@@ -1,4 +1,4 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 import org.gradle.testkit.runner.TaskOutcome
 import org.junit.Assert
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/MultiModulesTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/MultiModulesTests.kt
@@ -1,4 +1,4 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 import com.google.common.truth.Truth
 import org.gradle.testkit.runner.TaskOutcome
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/MultiServicesTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/MultiServicesTests.kt
@@ -1,11 +1,9 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 
 import util.TestUtils
 import util.TestUtils.withProject
 import util.generatedChild
-import com.google.common.truth.Truth
-import org.gradle.testkit.runner.TaskOutcome
 import org.gradle.testkit.runner.UnexpectedBuildFailure
 import org.hamcrest.CoreMatchers.containsString
 import org.hamcrest.MatcherAssert
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/OperationIdGeneratorTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/OperationIdGeneratorTests.kt
@@ -1,4 +1,4 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 import com.google.common.truth.Truth
 import org.gradle.testkit.runner.TaskOutcome
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/RegisterOperationsTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/RegisterOperationsTests.kt
@@ -1,4 +1,4 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 import util.TestUtils
 import com.google.common.truth.Truth
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/SchemaResolutionTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/SchemaResolutionTests.kt
@@ -1,4 +1,4 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 
 import util.TestUtils
@@ -7,8 +7,6 @@ import util.TestUtils.withProject
 import util.generatedChild
 import com.google.common.truth.Truth.assertThat
 import org.gradle.testkit.runner.UnexpectedBuildFailure
-import org.hamcrest.CoreMatchers
-import org.hamcrest.MatcherAssert
 import org.junit.Assert.assertTrue
 import org.junit.Assert.fail
 import org.junit.Test
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/ServiceTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/ServiceTests.kt
@@ -1,4 +1,4 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 import util.TestUtils
 import util.TestUtils.fixturesDirectory
diff --git a/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/UpToDateTests.kt b/libraries/apollo-gradle-plugin/src/test-java17/kotlin/test/UpToDateTests.kt
@@ -1,4 +1,4 @@
-package com.apollographql.apollo.gradle.test
+package test
 
 
 import util.TestUtils
diff --git a/libraries/apollo-gradle-plugin/testProjects/androidTestVariants/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/androidTestVariants/build.gradle.kts
@@ -45,3 +45,7 @@ apollo {
     }
   }
 }
+
+tasks.withType(Test::class.java) {
+  failOnNoDiscoveredTests = false
+}
diff --git a/libraries/apollo-gradle-plugin/testProjects/testSourceSet/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/testSourceSet/build.gradle.kts
@@ -16,3 +16,7 @@ apollo {
     }
   }
 }
+
+tasks.withType(Test::class.java) {
+  failOnNoDiscoveredTests = false
+}
diff --git a/tests/escaping/build.gradle.kts b/tests/escaping/build.gradle.kts
@@ -16,3 +16,7 @@ apollo {
     packageName.set("reserved")
   }
 }
+
+tasks.withType(Test::class.java).configureEach {
+  failOnNoDiscoveredTests.set(false)
+}
diff --git a/tests/multi-module-2/root/build.gradle.kts b/tests/multi-module-2/root/build.gradle.kts
@@ -22,4 +22,8 @@ apollo {
 
 dependencies {
   add("apolloMultimodule2UsedCoordinates", project(":multi-module-2-child"))
+}
+
+tasks.withType(Test::class.java).configureEach {
+  failOnNoDiscoveredTests.set(false)
 }
diff --git a/tests/schema-transform/app/build.gradle.kts b/tests/schema-transform/app/build.gradle.kts
@@ -22,3 +22,7 @@ apollo {
     plugin(project(":schema-transform-plugin")) {}
   }
 }
+
+tasks.withType(Test::class.java).configureEach {
+  failOnNoDiscoveredTests.set(false)
+}

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,7 @@ tasks.withType<Test> {`
`155`	`155`
`156`	`156`	`maxHeapSize = "1g"`
`157`	`157`
	`158`	`+// debug = true`
`158`	`159`	`maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).takeIf { it > 0 } ?: 1`
`159`	`160`	`}`
`160`	`161`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.apollographql.apollo.gradle.test`
	`1`	`+package test`
`2`	`2`
`3`	`3`	`import okhttp3.mockwebserver.MockResponse`
`4`	`4`	`import okhttp3.mockwebserver.MockWebServer`