From 6e9d9ea57c1174c8da33e7143e552a5b55caeb5e Mon Sep 17 00:00:00 2001 From: Dale Hawkins <107309+dkhawk@users.noreply.github.com> Date: Mon, 13 Jul 2026 13:28:46 -0600 Subject: [PATCH 1/3] build(deps): update dependencies across android-maps-compose Updated dependencies: - kotlin / kotlin-stdlib: 2.3.21 -> 2.4.0 - kotlinx-coroutines-*: 1.10.2 -> 1.11.0 - androidx.compose:compose-bom: 2026.03.00 -> 2026.06.01 - androidx.core:core-ktx: 1.18.0 -> 1.19.0 - com.google.maps.android:maps-*ktx: 6.0.1 -> 6.1.0 - io.mockk:mockk*: 1.14.9 -> 1.14.11 - org.jacoco:org.jacoco.core: 0.8.14 -> 0.8.15 Note: Upgraded JVM target across all modules from 1.8 to 11 to align with modern Compose BOM 2026.06.01 and maps-ktx 6.1.0 bytecode compatibility. --- gradle/libs.versions.toml | 14 +++++++------- maps-app/build.gradle.kts | 6 +++--- maps-compose-utils/build.gradle.kts | 6 +++--- maps-compose-widgets/build.gradle.kts | 6 +++--- maps-compose/build.gradle.kts | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 56953cfe..478ada09 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,14 +10,14 @@ androidTargetSdk = "37" agp = "9.2.1" dokka = "2.2.0" gradleMavenPublishPlugin = "0.36.0" -kotlin = "2.3.21" -kotlinxCoroutines = "1.10.2" +kotlin = "2.4.0" +kotlinxCoroutines = "1.11.0" # Android activitycompose = "1.13.0" -androidx-core = "1.18.0" +androidx-core = "1.19.0" androidx-startup = "1.2.0" -compose-bom = "2026.03.00" +compose-bom = "2026.06.01" constraintlayout = "2.2.1" # Material @@ -27,7 +27,7 @@ materialIconsExtendedAndroid = "1.7.8" # Google Maps Platform mapsecrets = "2.0.1" -mapsktx = "6.0.1" +mapsktx = "6.1.0" # Testing androidCore = "1.7.0" @@ -36,8 +36,8 @@ espresso = "3.7.0" junit = "4.13.2" junitktx = "1.3.0" leakcanaryAndroid = "2.14" -mockk = "1.14.9" -org-jacoco-core = "0.8.14" +mockk = "1.14.11" +org-jacoco-core = "0.8.15" jacoco-plugin = "0.2.1" robolectric = "4.16.1" screenshot = "0.0.1-alpha14" diff --git a/maps-app/build.gradle.kts b/maps-app/build.gradle.kts index f76710f4..da2a48e7 100644 --- a/maps-app/build.gradle.kts +++ b/maps-app/build.gradle.kts @@ -53,8 +53,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } buildFeatures { @@ -77,7 +77,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) freeCompilerArgs.addAll( "-opt-in=kotlin.RequiresOptIn" ) diff --git a/maps-compose-utils/build.gradle.kts b/maps-compose-utils/build.gradle.kts index 456f97eb..0e3f83df 100644 --- a/maps-compose-utils/build.gradle.kts +++ b/maps-compose-utils/build.gradle.kts @@ -35,8 +35,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } buildFeatures { @@ -54,7 +54,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) freeCompilerArgs.addAll( "-Xexplicit-api=strict", "-opt-in=kotlin.RequiresOptIn" diff --git a/maps-compose-widgets/build.gradle.kts b/maps-compose-widgets/build.gradle.kts index d4dc147c..c3812eb1 100644 --- a/maps-compose-widgets/build.gradle.kts +++ b/maps-compose-widgets/build.gradle.kts @@ -43,8 +43,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } buildFeatures { @@ -62,7 +62,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) freeCompilerArgs.addAll( "-Xexplicit-api=strict", "-opt-in=kotlin.RequiresOptIn" diff --git a/maps-compose/build.gradle.kts b/maps-compose/build.gradle.kts index 754722fd..329f934b 100644 --- a/maps-compose/build.gradle.kts +++ b/maps-compose/build.gradle.kts @@ -35,8 +35,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } buildFeatures { @@ -61,7 +61,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) freeCompilerArgs.addAll( "-Xexplicit-api=strict", "-opt-in=kotlin.RequiresOptIn" From cae55b26b93e5e8160eae6466bf57288ef897af4 Mon Sep 17 00:00:00 2001 From: Dale Hawkins <107309+dkhawk@users.noreply.github.com> Date: Wed, 15 Jul 2026 16:34:17 -0600 Subject: [PATCH 2/3] fix(deps): update maps-ktx to 6.2.0 and library dependencies --- gradle/libs.versions.toml | 2 +- .../MarkerClusteringActivity.kt | 22 +++++-------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 478ada09..6dfcea03 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,7 +27,7 @@ materialIconsExtendedAndroid = "1.7.8" # Google Maps Platform mapsecrets = "2.0.1" -mapsktx = "6.1.0" +mapsktx = "6.2.0" # Testing androidCore = "1.7.0" diff --git a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringActivity.kt index 039aae58..98f722cf 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringActivity.kt @@ -383,20 +383,8 @@ private enum class ClusteringType { } data class MyItem( - val itemPosition: LatLng, - val itemTitle: String, - val itemSnippet: String, - val itemZIndex: Float, -) : ClusterItem { - override fun getPosition(): LatLng = - itemPosition - - override fun getTitle(): String = - itemTitle - - override fun getSnippet(): String = - itemSnippet - - override fun getZIndex(): Float = - itemZIndex -} + override val position: LatLng, + override val title: String, + override val snippet: String, + override val zIndex: Float, +) : ClusterItem From 6c24352f994fa6bdfb9c2ede1fb94a6c8849a712 Mon Sep 17 00:00:00 2001 From: Dale Hawkins <107309+dkhawk@users.noreply.github.com> Date: Wed, 15 Jul 2026 19:31:13 -0600 Subject: [PATCH 3/3] fix(deps): bump kotlin to 2.4.10 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6dfcea03..46127a44 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ androidTargetSdk = "37" agp = "9.2.1" dokka = "2.2.0" gradleMavenPublishPlugin = "0.36.0" -kotlin = "2.4.0" +kotlin = "2.4.10" kotlinxCoroutines = "1.11.0" # Android