From f267ce12265cd1f90b8f68d39c54e222555cc4bb Mon Sep 17 00:00:00 2001
From: Dale Hawkins <107309+dkhawk@users.noreply.github.com>
Date: Thu, 3 Sep 2026 14:22:50 -0600
Subject: [PATCH] chore: update maps dependencies to stable releases and make
 mavenLocal opt-in

- Update maps-compose to 8.5.0, maps-ktx to 6.4.1, and maps-utils to 5.2.0 (all stable releases, no RCs).
- Make mavenLocal repository opt-in via useMavenLocal property or USE_MAVEN_LOCAL env var in ApiDemos and settings.gradle.kts.
- Use version catalog minSdk in snippets/app-utils-ktx.
---
 ApiDemos/project/build.gradle.kts       | 5 ++++-
 gradle/libs.versions.toml               | 6 +++---
 settings.gradle.kts                     | 4 ++++
 snippets/app-utils-ktx/build.gradle.kts | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

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/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0f2eeee37..ba702c992 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -36,9 +36,9 @@ material3 = "1.4.0"
 materialIconsExtended = "1.7.8"
 
 # Google Maps & Places
-mapsCompose = "8.4.0"
-mapsKtx = "6.3.0"
-mapsUtils = "5.1.1"
+mapsCompose = "8.5.0"
+mapsKtx = "6.4.1"
+mapsUtils = "5.2.0"
 places = "5.3.0"
 playServicesLocation = "21.4.0"
 playServicesMaps = "20.0.0"
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()
     }
diff --git a/snippets/app-utils-ktx/build.gradle.kts b/snippets/app-utils-ktx/build.gradle.kts
index 3ef852ef1..0d038c0c0 100644
--- a/snippets/app-utils-ktx/build.gradle.kts
+++ b/snippets/app-utils-ktx/build.gradle.kts
@@ -25,7 +25,7 @@ android {
 
     defaultConfig {
         applicationId = "com.example.app_utils_ktx"
-        minSdk = 23
+        minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
         versionName = libs.versions.versionName.get()