Merge branch 'main' into feat/expose-remember-compose-bitmap-descriptor

Author: dkhawk

.github/workflows/triage-issue.yml

@@ -45,11 +45,15 @@ jobs:
         run: |
           # Convert comma-separated labels to gh command arguments
           IFS=',' read -ra ADDR <<< "${{ steps.run_script.outputs.labels }}"
+          priority_added=false
           for i in "${ADDR[@]}"; do
             # Trim whitespace
             label=$(echo "$i" | xargs)
-            # Only add priority labels as requested
-            if [[ "$label" == priority:* ]]; then
+            # Only add the first priority label found
+            if [[ "$label" == priority:* ]] && [ "$priority_added" = false ]; then
               gh issue edit "$ISSUE_NUMBER" --add-label "$label"
+              priority_added=true
             fi
-          done
+          done
+          # Remove 'triage me' label
+          gh issue edit "$ISSUE_NUMBER" --remove-label "triage me" || true

gradle/libs.versions.toml

@@ -10,14 +10,14 @@ androidTargetSdk = "36"
 agp = "9.0.0"
 dokka = "2.1.0"
 gradleMavenPublishPlugin = "0.36.0"
-kotlin = "2.3.0"
+kotlin = "2.3.10"
 kotlinxCoroutines = "1.10.2"
 
 # Android
-activitycompose = "1.12.2"
-androidx-core = "1.17.0"
+activitycompose = "1.13.0"
+androidx-core = "1.18.0"
 androidx-startup = "1.2.0"
-compose-bom = "2026.01.00"
+compose-bom = "2026.03.00"
 constraintlayout = "2.2.1"
 
 # Material
@@ -27,7 +27,7 @@ materialIconsExtendedAndroid = "1.7.8"
 
 # Google Maps Platform
 mapsecrets = "2.0.1"
-mapsktx = "6.0.0"
+mapsktx = "6.0.1"
 
 # Testing
 androidCore = "1.7.0"

maps-compose/src/main/java/com/google/maps/android/compose/utils/attribution/AttributionIdInitializer.kt

@@ -17,6 +17,7 @@
 package com.google.maps.android.compose.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.compose.utils.meta.AttributionId
@@ -26,6 +27,7 @@ import com.google.maps.android.compose.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<Unit> {
     override fun create(context: Context) {
         MapsApiSettings.addInternalUsageAttributionId(