chore: upgraded to Gradle 9.0 and some dependencies (#800)

kikoso · web-flow · commit df2873326ff9 · 2025-11-20T15:56:57.000+01:00
* chore: upgraded to Gradle 9.0 and some dependencies

* chore: upgraded Compose BoM

* chore: increase timeout

* chore: extracted timeout
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    val kotlinVersion by extra(libs.versions.kotlin.get())
-    val androidxTestVersion by extra(libs.versions.androidxtest.get())
     repositories {
         google()
         mavenCentral()
@@ -18,7 +16,7 @@ buildscript {
 plugins {
     alias(libs.plugins.dokka) apply true
     alias(libs.plugins.compose.compiler) apply false
-    id("com.autonomousapps.dependency-analysis") version "2.0.0"
+    id("com.autonomousapps.dependency-analysis") version "3.4.1"
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.android) apply false
 
@@ -35,9 +33,4 @@ val projectArtifactId by extra { project: Project ->
 allprojects {
     group = "com.google.maps.android"
     version = "6.12.2"
-    val projectArtifactId by extra { project.name }
-}
-
-tasks.register("clean", Delete::class) {
-    delete(rootProject.layout.buildDirectory)
-}
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,26 +1,26 @@
 [versions]
 activitycompose = "1.11.0"
-agp = "8.13.0"
+agp = "8.13.1"
 androidCore = "1.7.0"
 androidx-core = "1.17.0"
 androidxtest = "1.7.0"
-compose-bom = "2025.09.01"
-dokka = "2.0.0"
+compose-bom = "2025.11.01"
+dokka = "2.1.0"
 espresso = "3.7.0"
-gradleMavenPublishPlugin = "0.34.0"
+gradleMavenPublishPlugin = "0.35.0"
 jacoco-plugin = "0.2.1"
 junit = "4.13.2"
 junitktx = "1.3.0"
-kotlin = "2.2.20"
+kotlin = "2.2.21"
 kotlinxCoroutines = "1.10.2"
 leakcanaryAndroid = "2.14"
 mapsecrets = "2.0.1"
-mapsktx = "5.2.0"
+mapsktx = "5.2.1"
 material3 = "1.4.0"
 materialIconsExtendedAndroid = "1.7.8"
-mockk = "1.14.5"
-mockkAndroid = "1.14.5"
-org-jacoco-core = "0.8.13"
+mockk = "1.14.6"
+mockkAndroid = "1.14.6"
+org-jacoco-core = "0.8.14"
 screenshot = "0.0.1-alpha11"
 constraintlayout = "2.2.1"
 material = "1.13.0"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%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" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/maps-app/build.gradle.kts b/maps-app/build.gradle.kts
@@ -56,12 +56,11 @@ android {
 
     experimentalProperties["android.experimental.enableScreenshotTest"] = true
 
-    testOptions {
-        screenshotTests {
-            imageDifferenceThreshold = 0.035f // 3.5%
-        }
+    screenshotTests {
+        imageDifferenceThreshold = 0.035f // 3.5%
     }
 
+
     packaging {
         resources {
             pickFirsts += listOf(
@@ -100,7 +99,6 @@ dependencies {
     androidTestImplementation(libs.kotlinx.coroutines.test)
     androidTestImplementation(libs.truth)
     androidTestImplementation(libs.mockk.android)
-    //androidTestImplementation(kotlin("test"))
 
     testImplementation(libs.test.junit)
     testImplementation(libs.robolectric)
diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewTests.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewTests.kt
@@ -74,7 +74,7 @@ class GoogleMapViewTests {
                 content.invoke()
             }
         }
-        val mapLoaded = countDownLatch.await(30, TimeUnit.SECONDS)
+        val mapLoaded = countDownLatch.await(MAP_LOAD_TIMEOUT_SECONDS, TimeUnit.SECONDS)
         assertThat(mapLoaded).isTrue()
     }
 
diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/MapInColumnTests.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/MapInColumnTests.kt
@@ -68,7 +68,7 @@ class MapInColumnTests {
                 }
             )
         }
-        val mapLoaded = countDownLatch.await(30, TimeUnit.SECONDS)
+        val mapLoaded = countDownLatch.await(MAP_LOAD_TIMEOUT_SECONDS, TimeUnit.SECONDS)
         assertTrue("Map loaded", mapLoaded)
     }
 
diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/MapsInLazyColumnTest.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/MapsInLazyColumnTest.kt
@@ -69,7 +69,7 @@ class MapsInLazyColumnTests {
             )
 
             LaunchedEffect(Unit) {
-                val mapsLoaded = countDownLatch.await(30, TimeUnit.SECONDS)
+                val mapsLoaded = countDownLatch.await(MAP_LOAD_TIMEOUT_SECONDS, TimeUnit.SECONDS)
                 assertTrue("Visible maps loaded", mapsLoaded)
             }
         }
diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/ScaleBarTests.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/ScaleBarTests.kt
@@ -65,7 +65,7 @@ class ScaleBarTests {
                 ScaleBar(cameraPositionState = cameraPositionState)
             }
         }
-        val mapLoaded = countDownLatch.await(5, TimeUnit.SECONDS)
+        val mapLoaded = countDownLatch.await(MAP_LOAD_TIMEOUT_SECONDS, TimeUnit.SECONDS)
         assertTrue(mapLoaded)
     }
 
diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/TestUtils.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/TestUtils.kt
@@ -5,6 +5,7 @@ import org.junit.Assert.assertEquals
 const val timeout2 = 2_000L
 const val timeout3 = 3_000L
 const val timeout5 = 5_000L
+const val MAP_LOAD_TIMEOUT_SECONDS = 30L
 
 val hasValidApiKey: Boolean =
     BuildConfig.MAPS_API_KEY.isNotBlank() && BuildConfig.MAPS_API_KEY != "YOUR_API_KEY"
diff --git a/maps-compose/build.gradle.kts b/maps-compose/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.gradle.kotlin.dsl.sourceSets
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ class GoogleMapViewTests {`
`74`	`74`	`content.invoke()`
`75`	`75`	`}`
`76`	`76`	`}`
`77`		`- val mapLoaded = countDownLatch.await(30, TimeUnit.SECONDS)`
	`77`	`+ val mapLoaded = countDownLatch.await(MAP_LOAD_TIMEOUT_SECONDS, TimeUnit.SECONDS)`
`78`	`78`	`assertThat(mapLoaded).isTrue()`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class MapInColumnTests {`
`68`	`68`	`}`
`69`	`69`	`)`
`70`	`70`	`}`
`71`		`- val mapLoaded = countDownLatch.await(30, TimeUnit.SECONDS)`
	`71`	`+ val mapLoaded = countDownLatch.await(MAP_LOAD_TIMEOUT_SECONDS, TimeUnit.SECONDS)`
`72`	`72`	`assertTrue("Map loaded", mapLoaded)`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class MapsInLazyColumnTests {`
`69`	`69`	`)`
`70`	`70`
`71`	`71`	`LaunchedEffect(Unit) {`
`72`		`- val mapsLoaded = countDownLatch.await(30, TimeUnit.SECONDS)`
	`72`	`+ val mapsLoaded = countDownLatch.await(MAP_LOAD_TIMEOUT_SECONDS, TimeUnit.SECONDS)`
`73`	`73`	`assertTrue("Visible maps loaded", mapsLoaded)`
`74`	`74`	`}`
`75`	`75`	`}`