From f799f1b3cb181d5f1c8595c4a3a4e87ff995cf31 Mon Sep 17 00:00:00 2001 From: Dale Hawkins <107309+dkhawk@users.noreply.github.com> Date: Tue, 14 Jul 2026 10:06:10 -0600 Subject: [PATCH 1/4] chore: update android-maps-ktx to 6.1.0 --- 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 56953cfe..4d0fcd11 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.0.1" +mapsktx = "6.1.0" # Testing androidCore = "1.7.0" From 01a098e07ce7609bfb00020b49764fd550433d5a Mon Sep 17 00:00:00 2001 From: Dale Hawkins <107309+dkhawk@users.noreply.github.com> Date: Tue, 14 Jul 2026 14:47:54 -0600 Subject: [PATCH 2/4] chore: update maps-ktx dependency to 6.1.0-rc03 and SDK to 37 --- .../convention/src/main/kotlin/PublishingConventionPlugin.kt | 4 +++- build.gradle.kts | 2 +- gradle/libs.versions.toml | 2 +- settings.gradle.kts | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt b/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt index 3544bc8c..58e57599 100644 --- a/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt @@ -85,7 +85,9 @@ class PublishingConventionPlugin : Plugin { ) publishToMavenCentral() - signAllPublications() + if (project.hasProperty("signing.keyId") && project.property("signing.keyId").toString().isNotEmpty()) { + signAllPublications() + } pom { name.set(project.name) diff --git a/build.gradle.kts b/build.gradle.kts index 3e306372..fbb5080d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -49,7 +49,7 @@ val projectArtifactId by extra { project: Project -> allprojects { group = "com.google.maps.android" // {x-release-please-start-version} - version = "8.3.1" + version = "8.3.1-rc03" // {x-release-please-end} } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4d0fcd11..ff25086e 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.1.0-rc03" # Testing androidCore = "1.7.0" diff --git a/settings.gradle.kts b/settings.gradle.kts index 41cc0b7e..3d9c605e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,6 +17,7 @@ dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { + mavenLocal() google() mavenCentral() } From a6e30ed6643cae7c20f57f6df406381485e50884 Mon Sep 17 00:00:00 2001 From: Dale Hawkins <107309+dkhawk@users.noreply.github.com> Date: Wed, 15 Jul 2026 09:49:34 -0600 Subject: [PATCH 3/4] chore: set release version to 8.3.1 and depend on maps-ktx 6.1.0 --- build.gradle.kts | 2 +- gradle/libs.versions.toml | 2 +- .../MarkerClusteringActivity.kt | 22 +++++-------------- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index fbb5080d..3e306372 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -49,7 +49,7 @@ val projectArtifactId by extra { project: Project -> allprojects { group = "com.google.maps.android" // {x-release-please-start-version} - version = "8.3.1-rc03" + version = "8.3.1" // {x-release-please-end} } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ff25086e..4d0fcd11 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-rc03" +mapsktx = "6.1.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 a751d3951725e8e9e437c804423fae7e5f45ecbb Mon Sep 17 00:00:00 2001 From: Dale Hawkins <107309+dkhawk@users.noreply.github.com> Date: Wed, 15 Jul 2026 12:52:39 -0600 Subject: [PATCH 4/4] chore: make mavenLocal repository opt-in via USE_MAVEN_LOCAL / useMavenLocal --- settings.gradle.kts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 3d9c605e..e0b1768c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,7 +17,10 @@ dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { - mavenLocal() + if (providers.gradleProperty("useMavenLocal").orNull == "true" || + providers.environmentVariable("USE_MAVEN_LOCAL").orNull == "true") { + mavenLocal() + } google() mavenCentral() }