Update to Gradle 8.8 (#5977)

* Update to Gradle 8.8

* update wrapepr

Author: martinbonnin

build-logic/src/main/kotlin/CompilerOptions.kt

@@ -22,7 +22,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 /**
  * @param target the JVM version we want to be compatible with (bytecode + bootstrap classpath)
  */
-fun KotlinCommonCompilerOptions.configure(target: Int, kotlinCompilerOptions: KotlinCompilerOptions) {
+fun KotlinCommonCompilerOptions.configure(target: Int, kotlinCompilerOptions: KotlinCompilerOptions, isAndroid: Boolean) {
+  val actualTarget = when {
+    isAndroid -> {
+      // https://blog.blundellapps.co.uk/setting-jdk-level-in-android-gradle-builds/
+      // D8 can dex Java17 bytecode
+      17
+    }
+    else -> target
+  }
+
   freeCompilerArgs.add("-Xexpect-actual-classes")
 
   /**
@@ -39,8 +48,11 @@ fun KotlinCommonCompilerOptions.configure(target: Int, kotlinCompilerOptions: Ko
   when (this) {
     is KotlinJvmCompilerOptions -> {
       freeCompilerArgs.add("-Xjvm-default=all")
-      freeCompilerArgs.add("-Xjdk-release=${target.toJvmTarget().target}")
-      jvmTarget.set(target.toJvmTarget())
+      if (!isAndroid) {
+        // See https://cs.android.com/android-studio/platform/tools/base/+/mirror-goog-studio-main:build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/JavaCompileUtils.kt;l=410?q=Using%20%27--release%27%20option%20for%20JavaCompile%20is%20not%20supported%20because%20it%20prevents%20the%20Android%20Gradle%20plugin
+        freeCompilerArgs.add("-Xjdk-release=${actualTarget.toJvmTarget().target}")
+      }
+      jvmTarget.set(actualTarget.toJvmTarget())
     }
 
     is KotlinNativeCompilerOptions -> {
@@ -98,16 +110,7 @@ fun Project.configureJavaAndKotlinCompilers(jvmTarget: Int?, kotlinCompilerOptio
   val jvmTarget = jvmTarget?: 8
 
   kotlinExtensionOrNull?.forEachCompilerOptions { isAndroid ->
-    val target = when {
-      isAndroid -> {
-        // https://blog.blundellapps.co.uk/setting-jdk-level-in-android-gradle-builds/
-        // D8 can dex Java17 bytecode
-        17
-      }
-      else -> jvmTarget
-    }
-
-    configure(target, kotlinCompilerOptions)
+    configure(jvmTarget, kotlinCompilerOptions, isAndroid)
   }
   project.tasks.withType(JavaCompile::class.java).configureEach {
     // For JVM only modules, this dictates the "org.gradle.jvm.version" Gradle attribute

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.