Merge branch 'main' into dependabot/github_actions/github/codeql-action-4

Author: kikoso

.github/workflows/docs.yml

@@ -43,10 +43,10 @@ jobs:
     # Run dokka and create tar
     - name: Generate documentation
       run: |
-        ./gradlew dokkaHtmlMultiModule
+        ./gradlew docs:dokkaGenerate
 
         echo "Creating tar for generated docs"
-        cd $GITHUB_WORKSPACE/build/dokka/htmlMultiModule && tar cvf ~/maps-compose-docs.tar .
+        cd $GITHUB_WORKSPACE/docs/build/dokka/html && tar cvf ~/maps-compose-docs.tar .
 
         echo "Unpacking tar into gh-pages branch"
         git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*

.gitignore

@@ -11,6 +11,7 @@
 /.idea/assetWizardSettings.xml
 .DS_Store
 /build
+build/
 /captures
 .externalNativeBuild
 .cxx

README.md

@@ -29,14 +29,14 @@ You no longer need to specify the Maps SDK for Android or its Utility Library as
 
 ```groovy
 dependencies {
-    implementation 'com.google.maps.android:maps-compose:6.12.1'
+    implementation 'com.google.maps.android:maps-compose:6.12.2'
 
     // Optionally, you can include the Compose utils library for Clustering,
     // Street View metadata checks, etc.
-    implementation 'com.google.maps.android:maps-compose-utils:6.12.1'
+    implementation 'com.google.maps.android:maps-compose-utils:6.12.2'
 
     // Optionally, you can include the widgets library for ScaleBar, etc.
-    implementation 'com.google.maps.android:maps-compose-widgets:6.12.1'
+    implementation 'com.google.maps.android:maps-compose-widgets:6.12.2'
 }
 ```
 
@@ -518,7 +518,7 @@ This library is not a Google Maps Platform Core Service. Therefore, the Google M
 
 ## Support
 
-This library is offered via an open source [license]. It is not governed by the Google Maps Platform Support [Technical Support Services Guidelines, the SLA, or the [Deprecation Policy]. However, any Google Maps Platform services used by the library remain subject to the Google Maps Platform Terms of Service.
+This library is offered via an open source [license]. It is not governed by the Google Maps Platform Support [Technical Support Services Guidelines], the [SLA], or the [Deprecation Policy]. However, any Google Maps Platform services used by the library remain subject to the Google Maps Platform Terms of Service.
 
 This library adheres to [semantic versioning] to indicate when backwards-incompatible changes are introduced. Accordingly, while the library is in version 0.x, backwards-incompatible changes may be introduced at any time.
 

build-logic/convention/src/main/kotlin/dokka-convention.gradle.kts

@@ -0,0 +1,15 @@
+/**
+ * Common conventions for generating documentation with Dokka.
+ */
+
+plugins {
+    id("org.jetbrains.dokka")
+}
+
+dokka {
+    dokkaSourceSets.configureEach {
+        sourceLink {
+            localDirectory.set(rootDir)
+        }
+    }
+}

build.gradle.kts

@@ -1,7 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    val kotlinVersion by extra(libs.versions.kotlin.get())
-    val androidxTestVersion by extra(libs.versions.androidxtest.get())
     repositories {
         google()
         mavenCentral()
@@ -16,9 +14,9 @@ buildscript {
 }
 
 plugins {
-    alias(libs.plugins.dokka) apply true
+    id("org.jetbrains.dokka") version "2.1.0"
     alias(libs.plugins.compose.compiler) apply false
-    id("com.autonomousapps.dependency-analysis") version "2.0.0"
+    id("com.autonomousapps.dependency-analysis") version "3.4.1"
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.android) apply false
 
@@ -34,10 +32,5 @@ val projectArtifactId by extra { project: Project ->
 
 allprojects {
     group = "com.google.maps.android"
-    version = "6.12.1"
-    val projectArtifactId by extra { project.name }
-}
-
-tasks.register("clean", Delete::class) {
-    delete(rootProject.layout.buildDirectory)
-}
+    version = "6.12.2"
+}

docs/build.gradle.kts

@@ -0,0 +1,14 @@
+plugins {
+    kotlin("jvm") apply false
+    id("org.jetbrains.dokka")
+}
+
+dependencies {
+    dokka(project(":maps-compose"))
+    dokka(project(":maps-compose-utils"))
+    dokka(project(":maps-compose-widgets"))
+}
+
+dokka {
+    moduleName.set("Android Maps Compose")
+}

gradle/libs.versions.toml

@@ -1,27 +1,27 @@
 [versions]
-activitycompose = "1.11.0"
-agp = "8.13.0"
+activitycompose = "1.12.1"
+agp = "8.13.1"
 androidCore = "1.7.0"
 androidx-core = "1.17.0"
 androidxtest = "1.7.0"
-compose-bom = "2025.09.01"
-dokka = "2.0.0"
+compose-bom = "2025.12.00"
+dokka = "2.1.0"
 espresso = "3.7.0"
-gradleMavenPublishPlugin = "0.34.0"
+gradleMavenPublishPlugin = "0.35.0"
 jacoco-plugin = "0.2.1"
 junit = "4.13.2"
 junitktx = "1.3.0"
-kotlin = "2.2.20"
+kotlin = "2.2.21"
 kotlinxCoroutines = "1.10.2"
 leakcanaryAndroid = "2.14"
 mapsecrets = "2.0.1"
-mapsktx = "5.2.0"
+mapsktx = "5.2.1"
 material3 = "1.4.0"
 materialIconsExtendedAndroid = "1.7.8"
-mockk = "1.14.5"
-mockkAndroid = "1.14.5"
-org-jacoco-core = "0.8.13"
-screenshot = "0.0.1-alpha11"
+mockk = "1.14.6"
+mockkAndroid = "1.14.6"
+org-jacoco-core = "0.8.14"
+screenshot = "0.0.1-alpha12"
 constraintlayout = "2.2.1"
 material = "1.13.0"
 robolectric = "4.16"

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.