Gradle 9.1.0-rc-1 (#1653)

* https://docs.gradle.org/9.1.0-rc-1/release-notes.html

* Update `doNotErrorOnRelocatingJava9Classes`

* Disable `--warning-mode=fail` for KMP

https://youtrack.jetbrains.com/issue/KT-78620

* Remove AGP and `AndroidPluginTest`

Author: Goooler

.github/renovate.json5

@@ -15,12 +15,5 @@
         "org.ow2.asm:asm-commons"
       ],
     },
-    {
-      // AGP version should match the min Gradle version used in tests.
-      "enabled": false,
-      "matchPackageNames": [
-        'com.android.tools.build:gradle',
-      ],
-    },
   ]
 }

build.gradle.kts

@@ -115,7 +115,6 @@ dependencies {
   implementation(libs.plexus.utils)
   implementation(libs.plexus.xml)
 
-  testPluginClasspath(libs.agp)
   testPluginClasspath(libs.foojayResolver)
   testPluginClasspath(libs.develocity)
   testPluginClasspath(libs.kotlin.kmp)

gradle/libs.versions.toml

@@ -22,9 +22,6 @@ foojayResolver = "org.gradle.toolchains.foojay-resolver-convention:org.gradle.to
 develocity = "com.gradle:develocity-gradle-plugin:4.1"
 kotlin-kmp = { module = "org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin", version.ref = "kotlin" }
 pluginPublish = { module = "com.gradle.publish:plugin-publish-plugin", version.ref = "pluginPublish" }
-# AGP version should match the min Gradle version used in tests.
-# https://developer.android.com/build/releases/gradle-plugin#updating-gradle
-agp = "com.android.tools.build:gradle:8.8.0"
 
 androidx-gradlePluginLints = "androidx.lint:lint-gradle:1.0.0-alpha05"
 # Dummy to get renovate updates, the version is used in rootProject build.gradle with spotless.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-rc-1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/documentTest/kotlin/com/github/jengelman/gradle/plugins/shadow/snippet/SnippetExecutable.kt

@@ -82,13 +82,22 @@ sealed class SnippetExecutable : Executable {
       JarOutputStream(it.outputStream()).use {}
     }
 
+    val warningMode = if (mainScript.contains("org.jetbrains.kotlin.multiplatform")) {
+      "none" // TODO: https://youtrack.jetbrains.com/issue/KT-78620
+    } else {
+      "fail"
+    }
+
     try {
       GradleRunner.create()
         .withGradleVersion(testGradleVersion)
         .withProjectDir(projectRoot.toFile())
         .withPluginClasspath()
         .forwardOutput()
-        .withArguments("--warning-mode=fail", "build")
+        .withArguments(
+          "--warning-mode=$warningMode",
+          "build",
+        )
         .build()
     } catch (t: Throwable) {
       throw RuntimeException("Failed to execute snippet:\n\n$mainScript", t)

src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/AndroidPluginTest.kt

@@ -400,7 +400,21 @@ abstract class BasePluginTest {
     .forwardOutput()
     .withPluginClasspath()
     .withTestKitDir(testKitDir.toFile())
-    .withArguments(commonArguments + arguments)
+    .withArguments(
+      buildList {
+        val warningsAsErrors = try {
+          // TODO: https://youtrack.jetbrains.com/issue/KT-78620
+          !projectScript.readText().contains("org.jetbrains.kotlin.multiplatform")
+        } catch (_: UninitializedPropertyAccessException) {
+          true // Default warning mode if projectScript is not initialized yet.
+        }
+        if (warningsAsErrors) {
+          add("--warning-mode=fail")
+        }
+        addAll(commonArguments)
+        addAll(arguments)
+      },
+    )
     .apply {
       if (projectDir != null) {
         withProjectDir(projectDir.toFile())
@@ -448,7 +462,6 @@ abstract class BasePluginTest {
     const val jarTask = "tasks.named('jar', Jar)"
 
     val commonArguments = listOf(
-      "--warning-mode=fail",
       "--configuration-cache",
       "--build-cache",
       "--parallel",

src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/BasePluginTest.kt

@@ -323,9 +323,9 @@ class RelocationTest : BasePluginTest() {
       """
         dependencies {
           implementation 'org.slf4j:slf4j-api:1.7.21'
-          implementation group: 'io.netty', name: 'netty-all', version: '4.0.23.Final'
-          implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '2.5.0'
-          implementation group: 'org.apache.zookeeper', name: 'zookeeper', version: '3.4.6'
+          implementation 'io.netty:netty-all:4.0.23.Final'
+          implementation 'com.google.protobuf:protobuf-java:2.5.0'
+          implementation 'org.apache.zookeeper:zookeeper:3.4.6'
         }
         $shadowJarTask {
           zip64 = true