From 78e046a3c97cd356e6e8fb0372f7c54aa37e8e8b Mon Sep 17 00:00:00 2001 From: Dale Hawkins <107309+dkhawk@users.noreply.github.com> Date: Wed, 15 Jul 2026 09:49:37 -0600 Subject: [PATCH 1/3] chore: update maps dependencies to maps-ktx 6.1.0, maps-compose 8.3.1, and android-maps-utils 5.0.0-rc03 --- FireMarkers/app/build.gradle.kts | 1 + gradle/libs.versions.toml | 10 +++++----- snippets/app-utils-ktx/build.gradle.kts | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/FireMarkers/app/build.gradle.kts b/FireMarkers/app/build.gradle.kts index eb56c8aff..2ed127a77 100644 --- a/FireMarkers/app/build.gradle.kts +++ b/FireMarkers/app/build.gradle.kts @@ -120,6 +120,7 @@ dependencies { // providing dependencies to different parts of the application. // --------------------------------------------------------------------------------------------- implementation(libs.dagger) + ksp("org.jetbrains.kotlin:kotlin-metadata-jvm:2.4.0") ksp(libs.hilt.android.compiler) implementation(libs.hilt.android) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c0f0ae9dd..4296e0a79 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,14 +2,14 @@ # Project Configuration androidGradlePlugin = "8.13.2" minSdk = "24" -compileSdk = "36" -targetSdk = "36" +compileSdk = "37" +targetSdk = "37" versionCode = "1" versionName = "2.0.2" # {x-release-please-version} javaVersion = "17" # Kotlin & Coroutines -kotlin = "2.2.0" +kotlin = "2.3.21" kotlinxCoroutinesTest = "1.10.2" kotlinxDatetime = "0.7.1" ksp = "2.2.20-2.0.4" @@ -36,8 +36,8 @@ material3 = "1.4.0" materialIconsExtended = "1.7.8" # Google Maps & Places -mapsCompose = "7.0.0" -mapsKtx = "6.0.0" +mapsCompose = "8.3.1" +mapsKtx = "6.1.0" places = "5.1.1" playServicesMaps = "20.0.0" secretsGradlePlugin = "2.0.1" diff --git a/snippets/app-utils-ktx/build.gradle.kts b/snippets/app-utils-ktx/build.gradle.kts index dc93bcaf8..1f21481bf 100644 --- a/snippets/app-utils-ktx/build.gradle.kts +++ b/snippets/app-utils-ktx/build.gradle.kts @@ -22,12 +22,12 @@ plugins { android { namespace = "com.example.app_utils_ktx" - compileSdk = 36 + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { applicationId = "com.example.app_utils_ktx" - minSdk = 23 - targetSdk = 36 + minSdk = libs.versions.minSdk.get().toInt() + targetSdk = libs.versions.targetSdk.get().toInt() versionCode = 1 versionName = libs.versions.versionName.get() From c2d1e4c371bfca37e66090738c24398b3e2d3935 Mon Sep 17 00:00:00 2001 From: Dale Hawkins <107309+dkhawk@users.noreply.github.com> Date: Wed, 15 Jul 2026 12:52:42 -0600 Subject: [PATCH 2/3] chore: make mavenLocal repository opt-in via USE_MAVEN_LOCAL / useMavenLocal --- ApiDemos/project/build.gradle.kts | 5 ++++- settings.gradle.kts | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ApiDemos/project/build.gradle.kts b/ApiDemos/project/build.gradle.kts index f543f464e..9f1a6d9bc 100644 --- a/ApiDemos/project/build.gradle.kts +++ b/ApiDemos/project/build.gradle.kts @@ -33,7 +33,10 @@ buildscript { allprojects { repositories { - mavenLocal() + if (providers.gradleProperty("useMavenLocal").orNull == "true" || + providers.environmentVariable("USE_MAVEN_LOCAL").orNull == "true") { + mavenLocal() + } google() mavenCentral() } diff --git a/settings.gradle.kts b/settings.gradle.kts index af2968cd4..34aa3895d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -28,6 +28,10 @@ pluginManagement { dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS) repositories { + if (providers.gradleProperty("useMavenLocal").orNull == "true" || + providers.environmentVariable("USE_MAVEN_LOCAL").orNull == "true") { + mavenLocal() + } google() mavenCentral() } From 3a164b17c1f3e3a42d735ea7947cc61032fc22f7 Mon Sep 17 00:00:00 2001 From: Dale Hawkins <107309+dkhawk@users.noreply.github.com> Date: Wed, 15 Jul 2026 13:01:17 -0600 Subject: [PATCH 3/3] chore: update android-maps-utils dependency to published 5.0.0 --- gradle/libs.versions.toml | 1 + snippets/app-utils/build.gradle.kts | 2 +- .../app-utils/src/main/java/com/example/app_utils/GeoJSON.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4296e0a79..31ea31447 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,6 +36,7 @@ material3 = "1.4.0" materialIconsExtended = "1.7.8" # Google Maps & Places +androidMapsUtils = "5.0.0" mapsCompose = "8.3.1" mapsKtx = "6.1.0" places = "5.1.1" diff --git a/snippets/app-utils/build.gradle.kts b/snippets/app-utils/build.gradle.kts index 967da3892..494b26285 100644 --- a/snippets/app-utils/build.gradle.kts +++ b/snippets/app-utils/build.gradle.kts @@ -83,7 +83,7 @@ dependencies { // Utility Library for Maps SDK for Android // You do not need to add a separate dependency for the Maps SDK for Android // since this library builds in the compatible version of the Maps SDK. - implementation("com.google.maps.android:android-maps-utils:3.19.0") + implementation("com.google.maps.android:android-maps-utils:5.0.0") } // [END maps_android_utils_install_snippet] diff --git a/snippets/app-utils/src/main/java/com/example/app_utils/GeoJSON.java b/snippets/app-utils/src/main/java/com/example/app_utils/GeoJSON.java index b949da695..7c9117f3c 100644 --- a/snippets/app-utils/src/main/java/com/example/app_utils/GeoJSON.java +++ b/snippets/app-utils/src/main/java/com/example/app_utils/GeoJSON.java @@ -41,7 +41,7 @@ class GeoJSON { private GoogleMap map; - private void addGeoJsonLayerJsonObject() { + private void addGeoJsonLayerJsonObject() throws JSONException { // [START maps_android_util_geojson_add_jsonobject] JSONObject geoJsonData = // JSONObject containing the GeoJSON data // [START_EXCLUDE silent]