chore: Update Dependencies and Refactor Gradle Plugins

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")
-    }
+// Conditionally apply the Google Services plugin if the google-services.json file exists.
+// This is necessary because this file is not checked into source control and may not be
+// present in all environments.
+if (rootProject.file("app/google-services.json").exists()) {
+    apply(plugin = "com.google.gms.google-services")
 }
 
 android {

FireMarkers/build.gradle.kts

@@ -25,5 +25,5 @@ plugins {
 
     alias(libs.plugins.ksp)
 
-    id("com.google.gms.google-services") version "4.4.4" apply false
+    alias(libs.plugins.google.services) apply false
 }

FireMarkers/gradle/libs.versions.toml

@@ -59,7 +59,7 @@ kotlinx-datetime = "0.7.1"
 # and testing.
 # -------------------------------------------------------------------------------------------------
 androidx-activity-compose = "1.11.0"
-androidx-compose-bom = "2025.10.01"
+androidx-compose-bom = "2025.11.00"
 androidx-core-ktx = "1.17.0"
 androidx-espresso-core = "3.7.0"
 androidx-hilt-navigation-compose = "1.3.0"
@@ -103,7 +103,8 @@ turbine = "1.2.1"
 # Android Gradle Plugin (AGP), Kotlin plugins, and utility plugins like the Secrets Gradle Plugin
 # for managing API keys.
 # -------------------------------------------------------------------------------------------------
-android-gradle-plugin = "8.13.0"
+android-gradle-plugin = "8.13.1"
+google-services = "4.4.4"
 ksp = "2.2.20-2.0.4"
 secrets-gradle-plugin = "2.0.1"
 
@@ -181,6 +182,7 @@ turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
 # and handling dependency injection with Hilt and KSP.
 # -------------------------------------------------------------------------------------------------
 android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
+google-services = { id = "com.google.gms.google-services", version.ref = "google-services" }
 hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt-android" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

WearOS/Wearable/build.gradle.kts

@@ -58,7 +58,7 @@ android {
 dependencies {
     // [START_EXCLUDE]
     implementation("androidx.core:core-ktx:1.15.0")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21")
     // [END_EXCLUDE]
     compileOnly("com.google.android.wearable:wearable:2.9.0")
     implementation("com.google.android.support:wearable:2.9.0")

WearOS/build.gradle.kts

@@ -17,5 +17,5 @@
 plugins {
     id("com.android.application") version "8.8.0" apply false
     id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin") version "2.0.1" apply false
-    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" apply false
 }

snippets/app-utils-ktx/src/main/java/com/example/app_utils_ktx/Heatmaps.kt

@@ -37,11 +37,11 @@ internal class Heatmaps {
 
     // [START maps_android_utils_heatmap_simple]
     private fun addHeatMap() {
-        var latLngs: List<LatLng?>? = null
+        var latLngs: List<LatLng> = emptyList()
 
         // Get the data: latitude/longitude positions of police stations.
         try {
-            latLngs = readItems(R.raw.police_stations)
+            latLngs = readItems(R.raw.police_stations).filterNotNull()
         } catch (e: JSONException) {
             Toast.makeText(context, "Problem reading list of locations.", Toast.LENGTH_LONG)
                 .show()

snippets/gradle/libs.versions.toml

@@ -1,27 +1,23 @@
 [versions]
-androidMapsUtils = "3.19.0"
 compileSdk = "36"
-mapsCompose = "6.12.0"
-mapsRx = "1.0.0"
-minSdk = "24"
-placesKtx = "3.5.0"
-rxjava = "3.1.12"
 targetSdk = "36"
+minSdk = "24"
 
-agp = "8.13.0"
+mapsRx = "1.0.0"
+agp = "8.13.1"
 appCompat = "1.7.1"
-composeFoundation = "1.9.2"
-composeMaterial = "1.9.2"
+composeFoundation = "1.9.4"
+composeMaterial = "1.9.4"
 constraintLayout = "2.2.1"
 coreKtx = "1.17.0"
 espressoCore = "3.7.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"
-kotlin = "2.2.20"
+kotlin = "2.2.21"
 lifecycleRuntime = "2.9.4"
-mapsKtx = "5.2.0"
+mapsKtx = "5.2.1"
 material = "1.13.0"
-navigation = "2.9.5"
+navigation = "2.9.6"
 places = "5.0.0"
 play-services-maps = "19.2.0"
 rxlifecycleAndroidLifecycleKotlin = "4.0.2"

stdout

@@ -0,0 +1,28 @@
+github.com/AlDanial/cloc v 2.06  T=11.93 s (578.1 files/s, 266150.2 lines/s)
+--------------------------------------------------------------------------------
+Language                      files          blank        comment           code
+--------------------------------------------------------------------------------
+Text                            297           1968              0        1666054
+JSON                           4136              0              0         662602
+XML                            1810         117743           8706         629740
+HTML                             32           1467            228          31039
+Java                            247           4420           4934          19646
+Kotlin                          156           2287           5167          12410
+Gradle                           37            282            801           1295
+Properties                      113             23            254            936
+Markdown                         26            306              0            744
+YAML                              9             89            151            454
+TOML                             10             35             99            352
+CSS                               2             53              0            218
+JavaScript                        1             51              2            190
+DOS Batch                         2             42              4            140
+Bourne Shell                      2             40            143            129
+CSV                               1              0              0             74
+Jinja Template                    1              0              0             34
+ProGuard                          7             15             92             31
+Nix                               1              8              6             23
+SQL                               7              0              0             14
+Bourne Again Shell                1              4              3              8
+--------------------------------------------------------------------------------
+SUM:                           6898         128833          20590        3026133
+--------------------------------------------------------------------------------

tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml

@@ -19,6 +19,7 @@
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application
         android:allowBackup="true"

tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/java/com/example/currentplacedetailsonmap/MapsActivityCurrentPlace.java

@@ -316,8 +316,8 @@ private void showCurrentPlace() {
 
         if (locationPermissionGranted) {
             // Use fields to define the data types to return.
-            List<Place.Field> placeFields = Arrays.asList(Place.Field.NAME, Place.Field.ADDRESS,
-                    Place.Field.LAT_LNG);
+            List<Place.Field> placeFields = Arrays.asList(Place.Field.DISPLAY_NAME, Place.Field.FORMATTED_ADDRESS,
+                    Place.Field.LOCATION);
 
             // Use the builder to create a FindCurrentPlaceRequest.
             FindCurrentPlaceRequest request =
@@ -350,11 +350,11 @@ public void onComplete(@NonNull Task<FindCurrentPlaceResponse> task) {
 
                         for (PlaceLikelihood placeLikelihood : likelyPlaces.getPlaceLikelihoods()) {
                             // Build a list of likely places to show the user.
-                            likelyPlaceNames[i] = placeLikelihood.getPlace().getName();
-                            likelyPlaceAddresses[i] = placeLikelihood.getPlace().getAddress();
+                            likelyPlaceNames[i] = placeLikelihood.getPlace().getDisplayName();
+                            likelyPlaceAddresses[i] = placeLikelihood.getPlace().getFormattedAddress();
                             likelyPlaceAttributions[i] = placeLikelihood.getPlace()
                                     .getAttributions();
-                            likelyPlaceLatLngs[i] = placeLikelihood.getPlace().getLatLng();
+                            likelyPlaceLatLngs[i] = placeLikelihood.getPlace().getLocation();
 
                             i++;
                             if (i > (count - 1)) {

tutorials/java/CurrentPlaceDetailsOnMap/gradle/libs.versions.toml

@@ -1,17 +1,17 @@
 [versions]
 compileSdk = "36"
-gradle = "8.10.1"
+gradle = "8.13.0"
 material = "1.12.0"
-minSdk = "23"
+minSdk = "24"
 secretsGradlePlugin = "2.0.1"
 targetSdk = "36"
 versionCode = "1"
 versionName = "1.0"
 appcompat = "1.7.1"
 playServicesMaps = "19.2.0"
-places = "4.3.1"
+places = "5.0.0"
 volley = "1.2.1"
-kotlinBom = "2.0.0"
+kotlinBom = "2.2.21"
 junit = "4.13.2"
 
 [libraries]

tutorials/java/MapWithMarker/gradle/libs.versions.toml

@@ -5,12 +5,12 @@ targetSdk = "36"
 versionCode = "1"
 versionName = "1.0"
 playServicesMaps = "19.2.0"
-kotlinBom = "2.0.0"
+kotlinBom = "2.2.21"
 appcompat = "1.7.1"
 junit = "4.13.2"
 androidxTestExtJunit = "1.2.1"
 espressoCore = "3.6.1"
-agp = "8.10.1"
+agp = "8.13.0"
 
 [libraries]
 playServicesMaps = { group = "com.google.android.gms", name = "play-services-maps", version.ref = "playServicesMaps" }

tutorials/java/Polygons/gradle/libs.versions.toml

@@ -6,11 +6,11 @@ versionCode = "1"
 versionName = "1.0"
 appcompat = "1.7.1"
 playServicesMaps = "19.2.0"
-kotlinBom = "2.2.0"
+kotlinBom = "2.2.21"
 junit = "4.13.2"
 androidxTestExtJunit = "1.2.1"
 espressoCore = "3.6.1"
-agp = "8.10.1"
+agp = "8.13.0"
 
 [libraries]
 appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }

tutorials/java/StyledMap/gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
 compileSdk = "36"
-gradle = "8.10.1"
+gradle = "8.13.0"
 minSdk = "21"
 secretsGradlePlugin = "2.0.1"
 targetSdk = "36"
 versionCode = "1"
 versionName = "1.0"
 appcompat = "1.7.1"
 playServicesMaps = "19.2.0"
-kotlinBom = "2.2.0"
+kotlinBom = "2.2.21"
 junit = "4.13.2"
 androidxTestExtJunit = "1.2.1"
 espressoCore = "3.6.1"

tutorials/kotlin/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml

@@ -19,6 +19,7 @@
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application
         android:allowBackup="true"

tutorials/kotlin/CurrentPlaceDetailsOnMap/app/src/main/java/com/example/currentplacedetailsonmap/MapsActivityCurrentPlace.kt

@@ -279,7 +279,7 @@ class MapsActivityCurrentPlace : AppCompatActivity(), OnMapReadyCallback {
         }
         if (locationPermissionGranted) {
             // Use fields to define the data types to return.
-            val placeFields = listOf(Place.Field.NAME, Place.Field.ADDRESS, Place.Field.LAT_LNG)
+            val placeFields = listOf(Place.Field.DISPLAY_NAME, Place.Field.FORMATTED_ADDRESS, Place.Field.LOCATION)
 
             // Use the builder to create a FindCurrentPlaceRequest.
             val request = FindCurrentPlaceRequest.newInstance(placeFields)
@@ -304,10 +304,10 @@ class MapsActivityCurrentPlace : AppCompatActivity(), OnMapReadyCallback {
                     likelyPlaceLatLngs = arrayOfNulls(count)
                     for (placeLikelihood in likelyPlaces?.placeLikelihoods ?: emptyList()) {
                         // Build a list of likely places to show the user.
-                        likelyPlaceNames[i] = placeLikelihood.place.name
-                        likelyPlaceAddresses[i] = placeLikelihood.place.address
+                        likelyPlaceNames[i] = placeLikelihood.place.displayName
+                        likelyPlaceAddresses[i] = placeLikelihood.place.formattedAddress
                         likelyPlaceAttributions[i] = placeLikelihood.place.attributions
-                        likelyPlaceLatLngs[i] = placeLikelihood.place.latLng
+                        likelyPlaceLatLngs[i] = placeLikelihood.place.location
                         i++
                         if (i > count - 1) {
                             break

tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/libs.versions.toml

@@ -1,21 +1,21 @@
 [versions]
 compileSdk = "36"
-gradle = "8.10.1"
-kotlinGradlePlugin = "2.0.0"
+gradle = "8.13.1"
+kotlinGradlePlugin = "2.2.21"
 material = "1.12.0"
-minSdk = "23"
+minSdk = "24"
 secretsGradlePlugin = "2.0.1"
 targetSdk = "36"
 versionCode = "1"
 versionName = "1.0"
 kotlin = "2.0.0"
 appcompat = "1.7.1"
 playServicesMaps = "19.2.0"
-places = "4.3.1"
+places = "5.0.0"
 volley = "1.2.1"
 junit = "4.13.2"
 coreKtx = "1.16.0"
-lifecycleViewModelKtx = "2.9.1"
+lifecycleViewModelKtx = "2.9.4"
 espressoCore = "3.0.2"
 javaVersion = "17"
 

tutorials/kotlin/MapWithMarker/gradle/libs.versions.toml

@@ -1,13 +1,13 @@
 [versions]
 compileSdk = "36"
-gradle = "8.10.1"
-kotlinGradlePlugin = "2.2.0"
+gradle = "8.13.0"
+kotlinGradlePlugin = "2.2.21"
 minSdk = "21"
 secretsGradlePlugin = "2.0.1"
 targetSdk = "36"
 versionCode = "1"
 versionName = "1.0"
-kotlin = "2.2.0"
+kotlin = "2.2.21"
 coreKtx = "1.16.0"
 appcompat = "1.7.1"
 playServicesMaps = "19.2.0"

tutorials/kotlin/Polygons/gradle/libs.versions.toml

@@ -4,16 +4,16 @@ minSdk = "21"
 targetSdk = "36"
 versionCode = "1"
 versionName = "1.0"
-kotlin = "2.2.0"
+kotlin = "2.2.21"
 appcompat = "1.7.1"
 playServicesMaps = "19.2.0"
 junit = "4.13.2"
 androidxTestExtJunit = "1.2.1"
 espressoCore = "3.6.1"
 coreKtx = "1.16.0"
 javaVersion = "17"
-gradle = "8.10.1"
-kotlinGradlePlugin = "2.2.0"
+gradle = "8.13.0"
+kotlinGradlePlugin = "2.2.21"
 secretsGradlePlugin = "2.0.1"
 
 [libraries]