From a1ef2cb4ea8a14be7ad345d5e1c673874be3394d Mon Sep 17 00:00:00 2001 From: dkhawk <107309+dkhawk@users.noreply.github.com> Date: Wed, 11 Mar 2026 12:08:15 -0600 Subject: [PATCH 1/2] fix: annotate AttributionIdInitializer with @Keep This prevents R8/ProGuard from stripping the Initializer class since it's instantiated via reflection by App Startup. --- .../android/ktx/utils/attribution/AttributionIdInitializer.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maps-ktx/src/main/java/com/google/maps/android/ktx/utils/attribution/AttributionIdInitializer.kt b/maps-ktx/src/main/java/com/google/maps/android/ktx/utils/attribution/AttributionIdInitializer.kt index 3f93833f..58a0b109 100644 --- a/maps-ktx/src/main/java/com/google/maps/android/ktx/utils/attribution/AttributionIdInitializer.kt +++ b/maps-ktx/src/main/java/com/google/maps/android/ktx/utils/attribution/AttributionIdInitializer.kt @@ -17,6 +17,7 @@ package com.google.maps.android.ktx.utils.attribution import android.content.Context +import androidx.annotation.Keep import androidx.startup.Initializer import com.google.android.gms.maps.MapsApiSettings import com.google.maps.android.ktx.utils.meta.AttributionId @@ -26,6 +27,7 @@ import com.google.maps.android.ktx.utils.meta.AttributionId * and samples are helpful to developers, such as usage of this library. * To opt out of sending the usage attribution ID, please remove this initializer from your manifest. */ +@Keep internal class AttributionIdInitializer : Initializer { override fun create(context: Context) { MapsApiSettings.addInternalUsageAttributionId( From 6e419f93809000780f2ce758f374d9224763be1c Mon Sep 17 00:00:00 2001 From: dkhawk <107309+dkhawk@users.noreply.github.com> Date: Wed, 11 Mar 2026 15:47:33 -0600 Subject: [PATCH 2/2] build(deps): update dependencies com.google.maps.android:android-maps-utils 4.1.0 -> 4.1.1 androidx.core:core-ktx 1.17.0 -> 1.18.0 androidx.activity:activity-ktx 1.12.4 -> 1.13.0 org.mockito:mockito-core 5.21.0 -> 5.23.0 --- gradle/libs.versions.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7696ed60..fa0c879e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,9 +6,9 @@ androidMinSdk = "23" androidTargetSdk = "36" androidxAppcompat = "1.7.1" -androidxCoreKtx = "1.17.0" +androidxCoreKtx = "1.18.0" # Increasing androidxActivityKtx or lifecycleRuntimeKtx will require us to upgrade the minSdk -androidxActivityKtx = "1.12.4" +androidxActivityKtx = "1.13.0" lifecycleRuntimeKtx = "2.10.0" kotlin = "2.3.0" kotlinxCoroutines = "1.10.2" @@ -18,14 +18,14 @@ androidxStartup = "1.2.0" # --- Google Maps --- # Versions for Google Play Services libraries, which are essential for this sample. androidMapsSdk = "20.0.0" -androidMapsUtils = "4.1.0" +androidMapsUtils = "4.1.1" # --- Testing --- # Versions for testing libraries. androidxJunit = "1.3.0" androidxTest = "1.7.0" junit = "4.13.2" -mockito = "5.21.0" +mockito = "5.23.0" mockitoInline = "5.2.0" mockitoKotlin = "2.2.0" truth = "1.4.5"