Merge branch 'main' into build/migration_ui_package

Author: dkhawk

.github/header-checker-lint.yml

@@ -27,7 +27,6 @@ sourceFileExtensions:
   - 'ts'
   - 'js'
   - 'java'
-  - 'html'
   - 'txt'
   - 'kt'
   - 'kts'

.github/workflows/docs.yml

@@ -35,19 +35,19 @@ jobs:
       uses: gradle/actions/wrapper-validation@v4
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v4.2.1
+      uses: actions/setup-java@v5
       with:
         java-version: '17'
         distribution: 'temurin'
     - name: Install Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6
       with:
         go-version: '1.20'
 
     # Run dokka and create tar
     - name: Generate documentation
       run: |
-        ./gradlew dokkaHtml
+        ./gradlew dokkaGenerate
 
         echo "Creating tar for generated docs"
         cd $GITHUB_WORKSPACE/library/build/dokka/html && tar cvf ~/android-maps-utils-docs.tar .

.github/workflows/lint-report.yml

@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'adopt'
           java-version: '17'

.github/workflows/release.yml

@@ -27,7 +27,7 @@ jobs:
       with:
         token: ${{ secrets.SYNCED_GITHUB_TOKEN_REPO }}
     - name: Set up JDK 17
-      uses: actions/setup-java@v4.2.1
+      uses: actions/setup-java@v5
       with:
         java-version: '17'
         distribution: 'temurin'
@@ -51,12 +51,12 @@ jobs:
         SONATYPE_TOKEN_PASSWORD: ${{ secrets.SONATYPE_TOKEN_PASSWORD }}
         SONATYPE_TOKEN_USERNAME: ${{ secrets.SONATYPE_TOKEN }}
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v5
       with:
         node-version: '14'
 
     - name: Semantic Release
-      uses: cycjimmy/semantic-release-action@v4.2.2
+      uses: cycjimmy/semantic-release-action@v5.0.0
       with:
         extra_plugins: |
           "@semantic-release/[email protected]"

.github/workflows/report.yml

@@ -37,7 +37,7 @@ jobs:
         uses: gradle/actions/wrapper-validation@v4
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4.2.1
+        uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'temurin'

.github/workflows/test.yml

@@ -37,7 +37,7 @@ jobs:
       uses: gradle/actions/wrapper-validation@v4
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v4.2.1
+      uses: actions/setup-java@v5
       with:
         java-version: '17'
         distribution: 'temurin'

README.md

@@ -45,7 +45,7 @@ dependencies {
     // Utilities for Maps SDK for Android (requires Google Play Services)
     // You do not need to add a separate dependency for the Maps SDK for Android
     // since this library builds in the compatible version of the Maps SDK.
-    implementation 'com.google.maps.android:android-maps-utils:3.16.0'
+    implementation 'com.google.maps.android:android-maps-utils:3.19.1'
 
     // Optionally add the Kotlin Extensions (KTX) for full Kotlin language support
     // See latest version at https://github.com/googlemaps/android-maps-ktx
@@ -65,6 +65,27 @@ To run the demo app, ensure you've met the requirements above then:
 1. Add a single line to `local.properties` that looks like `MAPS_API_KEY=YOUR_API_KEY`, where `YOUR_API_KEY` is the API key you obtained earlier
 1. Build and run the `debug` variant for the Maps SDK for Android version
 
+### Setting up the Map ID
+
+Some of the features in the demo app, such as Advanced Markers, require a Map ID. You can learn more about map IDs in the [official documentation](https://developers.google.com/maps/documentation/android-sdk/map-ids/mapid-over). You can set the Map ID in one of the following ways:
+
+1.  **`secrets.properties`:** Add a line to your `secrets.properties` file with your Map ID:
+    ```
+    MAP_ID=YOUR_MAP_ID
+    ```
+
+2.  **`strings.xml`:** Alternatively, you can set the Map ID in the `demo/src/main/res/values/strings.xml` file:
+    ```xml
+    <string name="map_id">YOUR_MAP_ID</string>
+    ```
+
+3.  **XML Layout Files:** You can also hardcode the Map ID directly in the XML layout files where a map is defined, by setting the `map:mapId` attribute:
+    ```xml
+    <androidx.fragment.app.FragmentContainerView
+        map:mapId="YOUR_MAP_ID" 
+        />
+    ```
+
 ## Documentation
 
 See the [documentation] for a full list of classes and their methods.
@@ -74,6 +95,7 @@ Full guides for using the utilities are published in
 
 ## Usage
 
+<details>
   <summary>Marker utilities</summary>
 
 ### Marker utilities
@@ -82,7 +104,6 @@ Full guides for using the utilities are published in
 - Marker clustering [source](https://github.com/googlemaps/android-maps-utils/tree/main/library/src/main/java/com/google/maps/android/clustering), [guide](https://developers.google.com/maps/documentation/android-sdk/utility/marker-clustering)
 - Advanced Markers clustering [source](https://github.com/googlemaps/android-maps-utils/tree/main/library/src/main/java/com/google/maps/android/clustering), [sample code](https://github.com/googlemaps/android-maps-utils/blob/main/demo/src/main/java/com/google/maps/android/utils/demo/CustomAdvancedMarkerClusteringDemoActivity.java)
 - Marker icons [source](https://github.com/googlemaps/android-maps-utils/blob/main/library/src/main/java/com/google/maps/android/ui/IconGenerator.java), [sample code](https://github.com/googlemaps/android-maps-utils/blob/main/demo/src/main/java/com/google/maps/android/utils/demo/IconGeneratorDemoActivity.java)
-
 </details>
 
 <details>

build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt

@@ -66,8 +66,12 @@ class PublishingConventionPlugin : Plugin<Project> {
             publishToMavenCentral()
             signAllPublications()
 
+            coordinates(
+                artifactId = "android-maps-utils",
+            )
+
             pom {
-                name.set(project.name)
+                name.set("android-maps-utils")
                 description.set("Handy extensions to the Google Maps Android API.")
                 url.set("https://github.com/googlemaps/android-maps-utils")
                 licenses {

build.gradle.kts

@@ -32,10 +32,10 @@ buildscript {
 }
 
 tasks.register<Delete>("clean") {
-    delete(rootProject.buildDir)
+    delete(layout.buildDirectory)
 }
 
 allprojects {
     group = "com.google.maps.android"
-    version = "3.16.0"
+    version = "3.19.1"
 }

demo/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 /**
  * Copyright 2025 Google LLC
  *
@@ -22,13 +24,13 @@ plugins {
 
 android {
     lint {
-        sarifOutput = file("$buildDir/reports/lint-results.sarif")
+        sarifOutput = layout.buildDirectory.file("reports/lint-results.sarif").get().asFile
     }
 
     defaultConfig {
         compileSdk = libs.versions.compileSdk.get().toInt()
         applicationId = "com.google.maps.android.utils.demo"
-        minSdk = 21
+        minSdk = libs.versions.minimumSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
         versionName = "1.0"
@@ -44,12 +46,17 @@ android {
         }
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    buildFeatures {
+        viewBinding = true
     }
+
     kotlin {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
         jvmToolchain(17)
     }
+
     namespace = "com.google.maps.android.utils.demo"
 }