Upgrade Gradle wrapper to 9.4.1

build.gradle

@@ -1,6 +1,3 @@
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
-
 /*
  *
  *  Copyright 2020 Netflix, Inc.
@@ -21,7 +18,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 plugins {
     id 'org.jetbrains.kotlin.jvm' version "2.0.21" apply false
-    id 'com.netflix.nebula.netflixoss' version '11.6.0'
+    id 'com.netflix.nebula.netflixoss' version '12.0.0'
     id "org.jmailen.kotlinter" version "5.0.1"
 }
 

gradle.properties

@@ -0,0 +1,2 @@
+# The Kotlin Multiplatform POM rewriter in Kotlin 2.0.21 uses a Gradle API removed in Gradle 9; this JVM-only build does not need that rewrite.
+kotlin.mpp.keepMppDependenciesIntactInPoms=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

graphql-dgs-codegen-gradle/build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
+
 /*
  *
  *  Copyright 2020 Netflix, Inc.
@@ -22,6 +24,13 @@ plugins {
 
 apply plugin: 'java-gradle-plugin'
 
+// Gradle 9.4.1 exposes newer Kotlin metadata; tolerate it here to keep consumers on Kotlin 2.0.21 and detangle from the Kotlin upgrade.
+tasks.withType(KotlinCompilationTask).configureEach {
+    compilerOptions {
+        freeCompilerArgs.add('-Xskip-metadata-version-check')
+    }
+}
+
 dependencies {
     api project(':graphql-dgs-codegen-core')
     compileOnly 'com.netflix.nebula:gradle-dependency-lock-plugin:15.2.0'

graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt

@@ -31,12 +31,14 @@ import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Provider
 import org.gradle.api.provider.ProviderFactory
 import org.gradle.api.tasks.*
+import org.gradle.work.DisableCachingByDefault
 import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper
 import java.io.File
 import java.nio.file.Paths
 import java.util.*
 import javax.inject.Inject
 
+@DisableCachingByDefault(because = "Generated sources may contain timestamps and are not always reproducible")
 open class GenerateJavaTask
     @Inject
     constructor(
@@ -50,6 +52,7 @@ open class GenerateJavaTask
                 .asFile.absolutePath
 
         @get:InputFiles
+        @get:PathSensitive(PathSensitivity.RELATIVE)
         var schemaPaths: MutableList<Any> = mutableListOf("${project.projectDir}/src/main/resources/schema")
 
         fun setSchemaPaths(paths: FileCollection) {

graphql-dgs-codegen-gradle/src/test/kotlin/com/netflix/graphql/dgs/CodegenGradlePluginTest.kt

@@ -37,8 +37,6 @@ class CodegenGradlePluginTest {
                 .withProjectDir(File("src/test/resources/test-project/"))
                 .withPluginClasspath()
                 .withArguments(
-                    "-c",
-                    "smoke_test_settings.gradle",
                     "tasks",
                     "--all",
                 ).forwardOutput()
@@ -56,8 +54,6 @@ class CodegenGradlePluginTest {
                 .withProjectDir(File("src/test/resources/test-project/"))
                 .withPluginClasspath()
                 .withArguments(
-                    "-c",
-                    "smoke_test_settings.gradle",
                     "clean",
                     "copyMainSources",
                 ).forwardOutput()
@@ -78,8 +74,6 @@ class CodegenGradlePluginTest {
                 .withPluginClasspath()
                 .withArguments(
                     "--stacktrace",
-                    "-c",
-                    "smoke_test_settings.gradle",
                     "clean",
                     "build",
                 ).forwardOutput()
@@ -102,10 +96,7 @@ class CodegenGradlePluginTest {
                 .withPluginClasspath()
                 .withArguments(
                     "--stacktrace",
-                    "-c",
-                    "smoke_test_settings_with_default_dir.gradle",
-                    "-b",
-                    "build_with_default_dir.gradle",
+                    "-PtestBuildFile=build_with_default_dir.gradle",
                     "clean",
                     "build",
                 ).forwardOutput()
@@ -128,10 +119,7 @@ class CodegenGradlePluginTest {
                 .withPluginClasspath()
                 .withArguments(
                     "--stacktrace",
-                    "-c",
-                    "smoke_test_settings_with_default_dir.gradle",
-                    "-b",
-                    "build_with_default_dir.gradle",
+                    "-PtestBuildFile=build_with_default_dir.gradle",
                     "clean",
                     "build",
                 ).forwardOutput()
@@ -155,10 +143,7 @@ class CodegenGradlePluginTest {
                 .withPluginClasspath()
                 .withArguments(
                     "--stacktrace",
-                    "-c",
-                    "smoke_test_settings_with_default_dir.gradle",
-                    "-b",
-                    "build_with_default_dir.gradle",
+                    "-PtestBuildFile=build_with_default_dir.gradle",
                     "clean",
                     "build",
                 ).forwardOutput()
@@ -184,10 +169,7 @@ class CodegenGradlePluginTest {
                 .withPluginClasspath()
                 .withArguments(
                     "--stacktrace",
-                    "-c",
-                    "smoke_test_settings_jackson_override.gradle",
-                    "-b",
-                    "build_with_jackson_override.gradle",
+                    "-PtestBuildFile=build_with_jackson_override.gradle",
                     "clean",
                     "generateJava",
                 ).forwardOutput()
@@ -206,10 +188,7 @@ class CodegenGradlePluginTest {
                 .withPluginClasspath()
                 .withArguments(
                     "--stacktrace",
-                    "-c",
-                    "smoke_test_settings_invalid_jackson.gradle",
-                    "-b",
-                    "build_with_invalid_jackson_version.gradle",
+                    "-PtestBuildFile=build_with_invalid_jackson_version.gradle",
                     "clean",
                     "generateJava",
                 ).forwardOutput()
@@ -231,10 +210,7 @@ class CodegenGradlePluginTest {
                 .withPluginClasspath()
                 .withArguments(
                     "--stacktrace",
-                    "-c",
-                    "smoke_test_settings_jackson3.gradle",
-                    "-b",
-                    "build_with_jackson3.gradle",
+                    "-PtestBuildFile=build_with_jackson3.gradle",
                     "clean",
                     "generateJava",
                 ).forwardOutput()
@@ -257,7 +233,6 @@ class CodegenGradlePluginTest {
         // generateKotlinNullableClasses is enabled so Jackson version detection (the lazy
         // rootComponent classpath walk) actually runs under the configuration cache.
         assertConfigurationCacheRoundTrip(
-            settingsFile = "smoke_test_settings_nullable.gradle",
             buildFile = "build_with_nullable_classes.gradle",
         )
     }
@@ -272,8 +247,7 @@ class CodegenGradlePluginTest {
                 .withPluginClasspath()
                 .withArguments(
                     "--stacktrace",
-                    "-c",
-                    "smoke_test_settings_schema_paths_provider.gradle",
+                    "-PtestBuildFile=build_with_schema_paths_provider.gradle",
                     "clean",
                     "generateJava",
                 ).forwardOutput()
@@ -293,8 +267,7 @@ class CodegenGradlePluginTest {
                 .withPluginClasspath()
                 .withArguments(
                     "--stacktrace",
-                    "-c",
-                    "smoke_test_settings_schema_paths_filecollection.gradle",
+                    "-PtestBuildFile=build_with_schema_paths_filecollection.gradle",
                     "clean",
                     "generateJava",
                 ).forwardOutput()
@@ -311,7 +284,7 @@ class CodegenGradlePluginTest {
                 .create()
                 .withProjectDir(File("src/test/resources/test-project/"))
                 .withPluginClasspath()
-                .withArguments("-c", "smoke_test_settings_nested_schema_paths.gradle", "clean", "generateJava")
+                .withArguments("-PtestBuildFile=build_with_nested_schema_paths.gradle", "clean", "generateJava")
                 .build()
 
         assertThat(result.task(":generateJava")?.outcome).isEqualTo(SUCCESS)
@@ -330,8 +303,7 @@ class CodegenGradlePluginTest {
                 .withPluginClasspath()
                 .withArguments(
                     "--stacktrace",
-                    "-c",
-                    "smoke_test_settings_schema_paths_addall.gradle",
+                    "-PtestBuildFile=build_with_schema_paths_addall.gradle",
                     "clean",
                     "generateJava",
                 ).forwardOutput()
@@ -344,18 +316,15 @@ class CodegenGradlePluginTest {
 
     @Test
     fun schemaPathsFileCollectionIsConfigurationCacheCompatible() {
-        assertConfigurationCacheRoundTrip("smoke_test_settings_schema_paths_filecollection.gradle")
+        assertConfigurationCacheRoundTrip("build_with_schema_paths_filecollection.gradle")
     }
 
     @Test
     fun schemaPathsProviderIsConfigurationCacheCompatible() {
-        assertConfigurationCacheRoundTrip("smoke_test_settings_schema_paths_provider.gradle")
+        assertConfigurationCacheRoundTrip("build_with_schema_paths_provider.gradle")
     }
 
-    private fun assertConfigurationCacheRoundTrip(
-        settingsFile: String,
-        buildFile: String? = null,
-    ) {
+    private fun assertConfigurationCacheRoundTrip(buildFile: String) {
         val projectDir = File("src/test/resources/test-project/")
 
         fun run() =
@@ -364,19 +333,12 @@ class CodegenGradlePluginTest {
                 .withProjectDir(projectDir)
                 .withPluginClasspath()
                 .withArguments(
-                    buildList {
-                        add("--stacktrace")
-                        add("--configuration-cache")
-                        add("--configuration-cache-problems=fail")
-                        add("-c")
-                        add(settingsFile)
-                        if (buildFile != null) {
-                            add("-b")
-                            add(buildFile)
-                        }
-                        add("clean")
-                        add("generateJava")
-                    },
+                    "--stacktrace",
+                    "--configuration-cache",
+                    "--configuration-cache-problems=fail",
+                    "-PtestBuildFile=$buildFile",
+                    "clean",
+                    "generateJava",
                 ).forwardOutput()
                 .build()
 
@@ -401,15 +363,15 @@ class CodegenGradlePluginTest {
         // @InputFiles after changing how schemaPaths accepts and resolves inputs.
         val sourceDir = File("src/test/resources/test-project")
         File(sourceDir, "build.gradle").copyTo(File(tempDir, "build.gradle"))
-        File(sourceDir, "smoke_test_settings.gradle").copyTo(File(tempDir, "smoke_test_settings.gradle"))
+        File(sourceDir, "settings.gradle").copyTo(File(tempDir, "settings.gradle"))
         File(sourceDir, "src").copyRecursively(File(tempDir, "src"))
 
         fun run(vararg tasks: String) =
             GradleRunner
                 .create()
                 .withProjectDir(tempDir)
                 .withPluginClasspath()
-                .withArguments("--stacktrace", "-c", "smoke_test_settings.gradle", *tasks)
+                .withArguments("--stacktrace", *tasks)
                 .forwardOutput()
                 .build()
 
@@ -456,8 +418,7 @@ class CodegenGradlePluginTest {
                 .withPluginClasspath()
                 .withArguments(
                     "--stacktrace",
-                    "-c",
-                    "settings_relative_file.gradle",
+                    "-PtestServerBuildFile=build_with_relative_file.gradle",
                     "clean",
                     ":server:generateJava",
                 ).forwardOutput()

graphql-dgs-codegen-gradle/src/test/resources/test-project-multimodule/settings.gradle

@@ -18,3 +18,7 @@
 
 rootProject.name = 'multimodule-root'
 include 'server'
+
+if (gradle.startParameter.projectProperties.containsKey('testServerBuildFile')) {
+    project(':server').buildFileName = gradle.startParameter.projectProperties['testServerBuildFile']
+}

graphql-dgs-codegen-gradle/src/test/resources/test-project/smoke_test_settings_jackson_override.gradle → graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/settings.gradle

@@ -16,5 +16,8 @@
  *
  */
 
-include 'smoke_test_settings.gradle'
-rootProject.buildFileName = 'build_with_jackson_override.gradle'
+rootProject.name = 'test-project'
+
+if (gradle.startParameter.projectProperties.containsKey('testBuildFile')) {
+    rootProject.buildFileName = gradle.startParameter.projectProperties['testBuildFile']
+}