fix!: upgrade to Maps SDK v20 and resolve build issues

- Upgrade Google Maps SDK to v20.0.0 (BREAKING CHANGE: requires new renderer).
- Fix WearOS build by replacing deprecated kotlinOptions with jvmToolchain.
- Resolve WearOS dependency conflicts by using Kotlin BOM.
- Migrate WearOS dependencies and SDK versions to Version Catalog.
- Refactor Version Catalog: extract versions and organize groups.
- Fix FireMarkers sample: correct Google Services plugin application logic.
- FireMarkers: Add explicit error handling for 'Permission Denied'.

BREAKING CHANGE: This release upgrades the Maps SDK to v20.0.0, which may require code changes for the new renderer and other API adjustments.

Author: dkhawk

FireMarkers/app/build.gradle.kts

@@ -45,13 +45,11 @@ plugins {
     alias(libs.plugins.kotlin.serialization)  // Provides Kotlin serialization capabilities.
 }
 
-gradle.projectsEvaluated {
-    if (rootProject.file("app/google-services.json").exists()) {
-        project(":app").pluginManager.apply("com.google.gms.google-services")
-        println("Applied Google Services plugin.")
-    } else {
-        println("google-services.json not found — skipping plugin application")
-    }
+if (file("google-services.json").exists()) {
+    apply(plugin = "com.google.gms.google-services")
+    println("Applied Google Services plugin.")
+} else {
+    println("google-services.json not found — skipping Google Services plugin")
 }
 
 android {

FireMarkers/app/src/main/java/com/example/firemarkers/FireMarkersApplication.kt

@@ -59,7 +59,7 @@ class FireMarkersApplication : Application() {
             val mapsApiKey =
                 bundle.getString("com.google.android.geo.API_KEY") // Key name is important!
 
-            if (mapsApiKey == null || mapsApiKey.isBlank() || mapsApiKey == "DEFAULT_API_KEY") {
+            if (mapsApiKey.isNullOrBlank() || mapsApiKey == "DEFAULT_API_KEY") {
                 Toast.makeText(
                     this,
                     "Maps API Key was not set in secrets.properties",

FireMarkers/app/src/main/java/com/example/firemarkers/viewmodel/MarkersViewModel.kt

@@ -154,10 +154,7 @@ class MarkersViewModel @Inject constructor(
                 }
 
                 override fun onCancelled(error: DatabaseError) {
-                    Log.e(TAG, "[$viewModelId] Database error on markers: ${error.message}")
-                    viewModelScope.launch {
-                        _errorEvents.emit("Database error on markers: ${error.message}")
-                    }
+                    handleDatabaseError(error, "markers")
                 }
             })
     }
@@ -187,14 +184,23 @@ class MarkersViewModel @Inject constructor(
                 }
 
                 override fun onCancelled(error: DatabaseError) {
-                    Log.e(TAG, "[$viewModelId] DB error on animation: ${error.message}")
-                    viewModelScope.launch {
-                        _errorEvents.emit("DB error on animation: ${error.message}")
-                    }
+                    handleDatabaseError(error, "animation")
                 }
             })
     }
 
+    private fun handleDatabaseError(error: DatabaseError, context: String) {
+        val msg = if (error.code == DatabaseError.PERMISSION_DENIED) {
+            "Permission Denied ($context): Check your Firebase Database Rules."
+        } else {
+            "Database error ($context): ${error.message}"
+        }
+        Log.e(TAG, "[$viewModelId] $msg")
+        viewModelScope.launch {
+            _errorEvents.emit(msg)
+        }
+    }
+
     /**
      * Toggles the animation state (running/paused) in Firebase.
      *

WearOS/Wearable/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,20 +21,20 @@ plugins {
 }
 
 android {
-    compileSdk = 35
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
         applicationId = "com.example.wearos"
-        minSdk = 23
-        targetSdk = 31
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
         versionName = libs.versions.versionName.get()
     }
 
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
 
@@ -45,10 +45,6 @@ android {
         sarifOutput = layout.buildDirectory.file("reports/lint-results-debug.sarif").get().asFile
     }
 
-    kotlinOptions {
-        jvmTarget = "21"
-    }
-
     kotlin {
         jvmToolchain(21)
     }
@@ -57,15 +53,16 @@ android {
 // [START maps_wear_os_dependencies]
 dependencies {
     // [START_EXCLUDE]
-    implementation("androidx.core:core-ktx:1.15.0")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21")
+    implementation(libs.core.ktx)
+    implementation(platform(libs.kotlin.bom))
+    implementation(libs.kotlin.stdlib)
     // [END_EXCLUDE]
-    compileOnly("com.google.android.wearable:wearable:2.9.0")
-    implementation("com.google.android.support:wearable:2.9.0")
-    implementation("com.google.android.gms:play-services-maps:19.0.0")
+    compileOnly(libs.wearable.compile)
+    implementation(libs.wearable.support)
+    implementation(libs.play.services.maps)
 
     // This dependency is necessary for ambient mode
-    implementation("androidx.wear:wear:1.3.0")
+    implementation(libs.wear)
 }
 // [END maps_wear_os_dependencies]
 

gradle/libs.versions.toml

@@ -1,114 +1,157 @@
 [versions]
+# Project Configuration
+androidGradlePlugin = "8.13.2"
 minSdk = "24"
 compileSdk = "36"
 targetSdk = "36"
+versionCode = "1"
+versionName = "1.20.1" # {x-release-please-version}
+javaVersion = "17"
+
+# Kotlin & Coroutines
+kotlin = "2.2.0"
+kotlinxCoroutinesTest = "1.10.2"
+kotlinxDatetime = "0.7.1"
+ksp = "2.2.20-2.0.4"
 
-activity = "1.12.1"
-activityKtx = "1.11.0"
-androidxJunit = "1.3.0"
+# AndroidX Core & Jetpack
+activity = "1.12.2"
+activityKtx = "1.12.2"
+androidxJunit = "1.3.0" # Test ext
 appcompat = "1.7.1"
 cardview = "1.0.0"
+constraintlayout = "2.2.1"
 coreKtx = "1.17.0"
-easypermissions = "3.0.0"
-espresso = "3.7.0"
-gradle = "8.13.2"
-hilt = "2.57.2"
-junit = "4.13.2"
-kotlin = "2.2.21"
 lifecycle = "2.10.0"
-mapsKtx = "5.2.1"
-mapsCompose = "6.12.1"
-material = "1.13.0"
 multidex = "2.0.1"
 navigation = "2.9.6"
-playServicesMaps = "19.2.0"
-places = "5.1.1"
 recyclerview = "1.4.0"
+
+# Jetpack Compose
+compose = "1.10.1"
+composeBom = "2026.01.00"
+hiltNavigationCompose = "1.3.0"
+material = "1.13.0" # View-based Material
+material3 = "1.4.0"
+materialIconsExtended = "1.7.8"
+
+# Google Maps & Places
+mapsCompose = "7.0.0"
+mapsKtx = "5.2.2"
+mapsRx = "1.0.1"
+places = "5.1.1"
+placesRx = "1.0.1"
+playServicesMaps = "20.0.0"
 secretsGradlePlugin = "2.0.1"
-volley = "1.2.1"
-truth = "1.4.5"
-uiautomator = "2.3.0"
-compose = "1.7.6"
-composeBom = "2024.12.01"
-hiltNavigationCompose = "1.2.0"
+
+# Wear OS
+wear = "1.3.0"
+wearable = "2.9.0"
+
+# Dependency Injection
 dagger = "2.57.2"
-firebaseBom = "33.10.0"
-kotlinxDatetime = "0.7.1"
-kotlinxCoroutinesTest = "1.10.2"
-robolectric = "4.16"
+hilt = "2.57.2"
+
+# Testing
+espresso = "3.7.0"
+junit = "4.13.2"
+mockito = "6.2.2"
+robolectric = "4.16.1"
+truth = "1.4.5"
 turbine = "1.2.1"
-mockito = "6.1.0"
-versionCode = "1"
-# {x-release-please-start-version}
-versionName = "1.20.1"
-# {x-release-please-end}
-javaVersion = "17"
+uiautomator = "2.3.0"
+
+# Firebase
+firebaseBom = "34.8.0"
+firebaseDatabase = "22.0.1"
+
+# Third Party
+easypermissions = "3.0.0"
+rxlifecycle = "4.0.2"
+volley = "1.2.1"
 
 [libraries]
+# Kotlin
+kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
+kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
+kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
+kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
+
+# AndroidX
 activity = { module = "androidx.activity:activity", version.ref = "activity" }
 activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityKtx" }
-androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidxJunit" }
-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidxJunit" }
 appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 cardview = { group = "androidx.cardview", name = "cardview", version.ref = "cardview" }
-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
+constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
 core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
-espresso-idling-resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "espresso" }
-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
-hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }
-junit = { group = "junit", name = "junit", version.ref = "junit" }
-kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
 lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" }
-maps-ktx = { group = "com.google.maps.android", name = "maps-ktx", version.ref = "mapsKtx" }
-maps-utils-ktx = { group = "com.google.maps.android", name = "maps-utils-ktx", version.ref = "mapsKtx" }
-maps-compose = { module = "com.google.maps.android:maps-compose", version.ref = "mapsCompose" }
-material = { group = "com.google.android.material", name = "material", version.ref = "material" }
-material3 = { module = "androidx.compose.material3:material3", version = "1.3.1" }
 multidex = { group = "androidx.multidex", name = "multidex", version.ref = "multidex" }
 navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigation" }
 navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigation" }
-play-services-maps = { group = "com.google.android.gms", name = "play-services-maps", version.ref = "playServicesMaps" }
-places = { group = "com.google.android.libraries.places", name = "places", version.ref = "places" }
 recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" }
-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version = "2.2.0" }
+
+# Compose
+compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
 compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
 compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
-volley = { group = "com.android.volley", name = "volley", version.ref = "volley" }
-truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }
-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "uiautomator" }
-easypermissions = { group = "pub.devrel", name = "easypermissions", version.ref = "easypermissions" }
-
-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "hiltNavigationCompose" }
-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "materialIconsExtended" }
+material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }
 ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
 ui-graphics = { module = "androidx.compose.ui:ui-graphics", version.ref = "compose" }
 ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
 ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose" }
-kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
-maps-rx = { module = "com.google.maps.android:maps-rx", version = "1.0.0" }
-places-rx = { module = "com.google.maps.android:places-rx", version = "1.0.0" }
-rxlifecycle-android-lifecycle-kotlin = { module = "com.trello.rxlifecycle4:rxlifecycle-android-lifecycle-kotlin", version = "4.0.2" }
 
+# Maps & Places
+maps-compose = { module = "com.google.maps.android:maps-compose", version.ref = "mapsCompose" }
+maps-ktx = { group = "com.google.maps.android", name = "maps-ktx", version.ref = "mapsKtx" }
+maps-rx = { module = "com.google.maps.android:maps-rx", version.ref = "mapsRx" }
+maps-utils-ktx = { group = "com.google.maps.android", name = "maps-utils-ktx", version.ref = "mapsKtx" }
+places = { group = "com.google.android.libraries.places", name = "places", version.ref = "places" }
+places-rx = { module = "com.google.maps.android:places-rx", version.ref = "placesRx" }
+play-services-maps = { group = "com.google.android.gms", name = "play-services-maps", version.ref = "playServicesMaps" }
+
+# Wear OS
+wear = { group = "androidx.wear", name = "wear", version.ref = "wear" }
+wearable-compile = { group = "com.google.android.wearable", name = "wearable", version.ref = "wearable" }
+wearable-support = { group = "com.google.android.support", name = "wearable", version.ref = "wearable" }
+
+# Dependency Injection
 dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }
-firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }
-firebase-database = { module = "com.google.firebase:firebase-database", version = "21.0.0" }
-kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
+hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
+hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }
+hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "hiltNavigationCompose" }
+
+# Testing
+espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
+espresso-idling-resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "espresso" }
+ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidxJunit" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesTest" }
+mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockito" }
 robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
+truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }
 turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
-mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockito" }
+ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
+ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose" }
+uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "uiautomator" }
+
+# Firebase
+firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }
+firebase-database = { module = "com.google.firebase:firebase-database", version.ref = "firebaseDatabase" }
+
+# Third Party
+easypermissions = { group = "pub.devrel", name = "easypermissions", version.ref = "easypermissions" }
+rxlifecycle-android-lifecycle-kotlin = { module = "com.trello.rxlifecycle4:rxlifecycle-android-lifecycle-kotlin", version.ref = "rxlifecycle" }
+volley = { group = "com.android.volley", name = "volley", version.ref = "volley" }
 
 [plugins]
-android-application = { id = "com.android.application", version.ref = "gradle" }
-android-library = { id = "com.android.library", version.ref = "gradle" }
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
+hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
-hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 secrets-gradle-plugin = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secretsGradlePlugin" }
-ksp = { id = "com.google.devtools.ksp", version = "2.2.20-2.0.4" }

settings.gradle.kts

@@ -28,6 +28,7 @@ pluginManagement {
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
+        mavenLocal()
         google()
         mavenCentral()
     }

snippets/app-compose/build.gradle.kts

@@ -16,7 +16,7 @@
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.secrets.gradle.plugin)
 }

snippets/app-ktx/build.gradle.kts

@@ -16,7 +16,7 @@
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.secrets.gradle.plugin)
 }
 

snippets/app-places-ktx/build.gradle.kts

@@ -16,7 +16,7 @@
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.secrets.gradle.plugin)
 }