From b41a6b65399b0d543dd769c529cf74a0a09195e7 Mon Sep 17 00:00:00 2001 From: dkhawk <107309+dkhawk@users.noreply.github.com> Date: Thu, 13 Nov 2025 14:04:17 -0700 Subject: [PATCH 1/3] chore(deps): bump dependencies --- WearOS/Wearable/build.gradle.kts | 2 +- WearOS/build.gradle.kts | 2 +- .../com/example/app_utils_ktx/Heatmaps.kt | 4 +-- snippets/gradle/libs.versions.toml | 8 +++--- stdout | 28 +++++++++++++++++++ .../app/src/main/AndroidManifest.xml | 1 + .../MapsActivityCurrentPlace.java | 10 +++---- .../gradle/libs.versions.toml | 8 +++--- .../MapWithMarker/gradle/libs.versions.toml | 4 +-- .../java/Polygons/gradle/libs.versions.toml | 4 +-- .../java/StyledMap/gradle/libs.versions.toml | 4 +-- .../app/src/main/AndroidManifest.xml | 1 + .../MapsActivityCurrentPlace.kt | 8 +++--- .../gradle/libs.versions.toml | 8 +++--- .../MapWithMarker/gradle/libs.versions.toml | 6 ++-- .../kotlin/Polygons/gradle/libs.versions.toml | 6 ++-- 16 files changed, 67 insertions(+), 37 deletions(-) create mode 100644 stdout diff --git a/WearOS/Wearable/build.gradle.kts b/WearOS/Wearable/build.gradle.kts index 30f94cf47..4eee2054b 100644 --- a/WearOS/Wearable/build.gradle.kts +++ b/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") diff --git a/WearOS/build.gradle.kts b/WearOS/build.gradle.kts index 79df6cfc4..519766517 100644 --- a/WearOS/build.gradle.kts +++ b/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 } diff --git a/snippets/app-utils-ktx/src/main/java/com/example/app_utils_ktx/Heatmaps.kt b/snippets/app-utils-ktx/src/main/java/com/example/app_utils_ktx/Heatmaps.kt index 89404aa6c..ae33f819c 100644 --- a/snippets/app-utils-ktx/src/main/java/com/example/app_utils_ktx/Heatmaps.kt +++ b/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? = null + var latLngs: List = 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() diff --git a/snippets/gradle/libs.versions.toml b/snippets/gradle/libs.versions.toml index d54c44024..e94df7254 100644 --- a/snippets/gradle/libs.versions.toml +++ b/snippets/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] androidMapsUtils = "3.19.0" compileSdk = "36" -mapsCompose = "6.12.0" +mapsCompose = "6.12.1" mapsRx = "1.0.0" minSdk = "24" placesKtx = "3.5.0" @@ -10,8 +10,8 @@ targetSdk = "36" agp = "8.13.0" 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" @@ -19,7 +19,7 @@ junit = "4.13.2" junitVersion = "1.3.0" kotlin = "2.2.20" lifecycleRuntime = "2.9.4" -mapsKtx = "5.2.0" +mapsKtx = "5.2.1" material = "1.13.0" navigation = "2.9.5" places = "5.0.0" diff --git a/stdout b/stdout new file mode 100644 index 000000000..882da272c --- /dev/null +++ b/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 +-------------------------------------------------------------------------------- diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml index b454593af..728605bd8 100644 --- a/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml +++ b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml @@ -19,6 +19,7 @@ + placeFields = Arrays.asList(Place.Field.NAME, Place.Field.ADDRESS, - Place.Field.LAT_LNG); + List 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 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)) { diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/gradle/libs.versions.toml b/tutorials/java/CurrentPlaceDetailsOnMap/gradle/libs.versions.toml index 1d59ab45d..2dbfc42ed 100644 --- a/tutorials/java/CurrentPlaceDetailsOnMap/gradle/libs.versions.toml +++ b/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] diff --git a/tutorials/java/MapWithMarker/gradle/libs.versions.toml b/tutorials/java/MapWithMarker/gradle/libs.versions.toml index 50763b7c8..c444cf56e 100644 --- a/tutorials/java/MapWithMarker/gradle/libs.versions.toml +++ b/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" } diff --git a/tutorials/java/Polygons/gradle/libs.versions.toml b/tutorials/java/Polygons/gradle/libs.versions.toml index 36c6ff979..880c352c6 100644 --- a/tutorials/java/Polygons/gradle/libs.versions.toml +++ b/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" } diff --git a/tutorials/java/StyledMap/gradle/libs.versions.toml b/tutorials/java/StyledMap/gradle/libs.versions.toml index da74cb56e..adaafc56d 100644 --- a/tutorials/java/StyledMap/gradle/libs.versions.toml +++ b/tutorials/java/StyledMap/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] compileSdk = "36" -gradle = "8.10.1" +gradle = "8.13.0" minSdk = "21" secretsGradlePlugin = "2.0.1" targetSdk = "36" @@ -8,7 +8,7 @@ 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" diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml b/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml index b454593af..728605bd8 100644 --- a/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml +++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml @@ -19,6 +19,7 @@ + count - 1) { break diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/libs.versions.toml b/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/libs.versions.toml index 47b3617d6..bf74e9e02 100644 --- a/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/libs.versions.toml +++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] compileSdk = "36" gradle = "8.10.1" -kotlinGradlePlugin = "2.0.0" +kotlinGradlePlugin = "2.2.21" material = "1.12.0" -minSdk = "23" +minSdk = "24" secretsGradlePlugin = "2.0.1" targetSdk = "36" versionCode = "1" @@ -11,11 +11,11 @@ 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" diff --git a/tutorials/kotlin/MapWithMarker/gradle/libs.versions.toml b/tutorials/kotlin/MapWithMarker/gradle/libs.versions.toml index acee8d9a4..a4334e495 100644 --- a/tutorials/kotlin/MapWithMarker/gradle/libs.versions.toml +++ b/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" diff --git a/tutorials/kotlin/Polygons/gradle/libs.versions.toml b/tutorials/kotlin/Polygons/gradle/libs.versions.toml index 2aa2e5b11..1023ec092 100644 --- a/tutorials/kotlin/Polygons/gradle/libs.versions.toml +++ b/tutorials/kotlin/Polygons/gradle/libs.versions.toml @@ -4,7 +4,7 @@ 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" @@ -12,8 +12,8 @@ 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] From 76ba44070982aa682a86523bb0221c1e216f8eac Mon Sep 17 00:00:00 2001 From: dkhawk <107309+dkhawk@users.noreply.github.com> Date: Thu, 13 Nov 2025 15:49:02 -0700 Subject: [PATCH 2/3] chore(deps): bump dependencies and refactor Gradle plugins This commit updates various dependencies and refactors the application of the Google Services Gradle plugin in the FireMarkers sample. - Bumps the Android Gradle Plugin, Kotlin, and Navigation component versions in the `snippets` and `CurrentPlaceDetailsOnMap` projects. - Refactors the `FireMarkers` sample to define the `google-services` plugin in the version catalog (`libs.versions.toml`) and reference it using a type-safe alias. - Simplifies the conditional application of the `google-services` plugin in the app-level `build.gradle.kts` file, making the logic more direct. --- FireMarkers/app/build.gradle.kts | 12 +++++------- FireMarkers/build.gradle.kts | 2 +- FireMarkers/gradle/libs.versions.toml | 2 ++ snippets/gradle/libs.versions.toml | 14 +++++--------- .../gradle/libs.versions.toml | 2 +- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/FireMarkers/app/build.gradle.kts b/FireMarkers/app/build.gradle.kts index f520772b1..6bdab644f 100644 --- a/FireMarkers/app/build.gradle.kts +++ b/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 { diff --git a/FireMarkers/build.gradle.kts b/FireMarkers/build.gradle.kts index 6f9778da7..7b6a1b8a8 100644 --- a/FireMarkers/build.gradle.kts +++ b/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 } \ No newline at end of file diff --git a/FireMarkers/gradle/libs.versions.toml b/FireMarkers/gradle/libs.versions.toml index c251ed7fd..6ec767d5f 100644 --- a/FireMarkers/gradle/libs.versions.toml +++ b/FireMarkers/gradle/libs.versions.toml @@ -104,6 +104,7 @@ turbine = "1.2.1" # for managing API keys. # ------------------------------------------------------------------------------------------------- android-gradle-plugin = "8.13.0" +google-services = "4.4.2" 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" } diff --git a/snippets/gradle/libs.versions.toml b/snippets/gradle/libs.versions.toml index e94df7254..51c86a4f5 100644 --- a/snippets/gradle/libs.versions.toml +++ b/snippets/gradle/libs.versions.toml @@ -1,14 +1,10 @@ [versions] -androidMapsUtils = "3.19.0" compileSdk = "36" -mapsCompose = "6.12.1" -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.4" composeMaterial = "1.9.4" @@ -17,11 +13,11 @@ 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.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" diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/libs.versions.toml b/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/libs.versions.toml index bf74e9e02..679a84f68 100644 --- a/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/libs.versions.toml +++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] compileSdk = "36" -gradle = "8.10.1" +gradle = "8.13.1" kotlinGradlePlugin = "2.2.21" material = "1.12.0" minSdk = "24" From 71fac8eed2f7772afc3342898c8d02c6e5eaf770 Mon Sep 17 00:00:00 2001 From: dkhawk <107309+dkhawk@users.noreply.github.com> Date: Thu, 13 Nov 2025 16:27:09 -0700 Subject: [PATCH 3/3] chore: Update Compose BOM, AGP, and Google Services plugins This commit updates the following dependencies to their latest versions: - AndroidX Compose BOM to `2025.11.00` - Android Gradle Plugin to `8.13.1` - Google Services to `4.4.4` --- FireMarkers/gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FireMarkers/gradle/libs.versions.toml b/FireMarkers/gradle/libs.versions.toml index 6ec767d5f..422e796e1 100644 --- a/FireMarkers/gradle/libs.versions.toml +++ b/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,8 +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" -google-services = "4.4.2" +android-gradle-plugin = "8.13.1" +google-services = "4.4.4" ksp = "2.2.20-2.0.4" secrets-gradle-plugin = "2.0.1"