Merge pull request #1478 from square/zachklipp/upgrade-gradle

Upgrade Gradle from 8.13 to 9.3.1

Author: zach-klippenstein

build-logic/src/main/java/com/squareup/workflow1/buildsrc/KotlinCommonSettings.kt

@@ -9,6 +9,7 @@ import com.squareup.workflow1.buildsrc.internal.javaLanguageVersion
 import com.squareup.workflow1.buildsrc.internal.javaTarget
 import com.squareup.workflow1.buildsrc.internal.kotlin
 import org.gradle.api.Project
+import org.gradle.api.tasks.testing.AbstractTestTask
 import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode.Strict
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
@@ -31,6 +32,12 @@ fun Project.kotlinCommonSettings(bomConfigurationName: String) {
     }
   }
 
+  // Gradle 9 defaults failOnNoDiscoveredTests to true, but some modules have test source
+  // directories without actual test classes.
+  tasks.withType(AbstractTestTask::class.java).configureEach { testTask ->
+    testTask.failOnNoDiscoveredTests.set(false)
+  }
+
   tasks.withType(KotlinCompile::class.java).configureEach { kotlinCompile ->
     kotlinCompile.apply {
       if (!(path.startsWith(":samples") || path.startsWith(":benchmarks") ||

dependencies/classpath.txt

@@ -161,11 +161,12 @@ org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10
 org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.3.10
 org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.3.10
 org.jetbrains.kotlin:kotlin-native-utils:2.3.10
-org.jetbrains.kotlin:kotlin-reflect:2.0.21
+org.jetbrains.kotlin:kotlin-reflect:2.2.21
 org.jetbrains.kotlin:kotlin-serialization:2.3.10
+org.jetbrains.kotlin:kotlin-stdlib-common:2.3.10
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.10
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.10
-org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.21
 org.jetbrains.kotlin:kotlin-tooling-core:2.3.10
 org.jetbrains.kotlin:kotlin-util-io:2.3.10
 org.jetbrains.kotlin:kotlin-util-klib-metadata:2.3.10

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists