Merge branch 'main' into patch-1

googlemaps · Jan 23, 2025 · 4256f6a · 4256f6a
2 parents 59f2482 + f1312d9
commit 4256f6a
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -35,7 +35,7 @@ jobs:
       uses: gradle/actions/wrapper-validation@v4
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v4.2.1
+      uses: actions/setup-java@v4.6.0
       with:
         java-version: '21'
         distribution: 'adopt'

diff --git a/.github/workflows/instrumentation-test.yml b/.github/workflows/instrumentation-test.yml
@@ -38,7 +38,7 @@ jobs:
       uses: gradle/actions/wrapper-validation@v4
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v4.2.1
+      uses: actions/setup-java@v4.6.0
       with:
         java-version: '21'
         distribution: 'adopt'

diff --git a/.github/workflows/lint-report.yml b/.github/workflows/lint-report.yml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4.2.1
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: 'adopt'
           java-version: '17'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
         token: ${{ secrets.SYNCED_GITHUB_TOKEN_REPO }}
     - uses: gradle/actions/wrapper-validation@v4
     - name: Set up JDK 21
-      uses: actions/setup-java@v4.2.1
+      uses: actions/setup-java@v4.6.0
       with:
         java-version: '21'
         distribution: 'adopt'

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -38,7 +38,7 @@ jobs:
       uses: gradle/actions/wrapper-validation@v4
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v4.2.1
+      uses: actions/setup-java@v4.6.0
       with:
         java-version: '21'
         distribution: 'temurin'

diff --git a/README.md b/README.md
@@ -22,14 +22,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.4.0'
+    implementation 'com.google.maps.android:maps-compose:6.4.1'
 
     // Optionally, you can include the Compose utils library for Clustering,
     // Street View metadata checks, etc.
-    implementation 'com.google.maps.android:maps-compose-utils:6.4.0'
+    implementation 'com.google.maps.android:maps-compose-utils:6.4.1'
 
     // Optionally, you can include the widgets library for ScaleBar, etc.
-    implementation 'com.google.maps.android:maps-compose-widgets:6.4.0'
+    implementation 'com.google.maps.android:maps-compose-widgets:6.4.1'
 }
 ```
 

diff --git a/...es/draggablemarkerscollectionwithpolygon/DraggableMarkersCollectionWithPolygonActivity.kt b/...es/draggablemarkerscollectionwithpolygon/DraggableMarkersCollectionWithPolygonActivity.kt
@@ -187,9 +187,7 @@ private fun LocationMarker(
 private fun Polygon(markerPositionsModel: () -> List<() -> LatLng>) {
     val movingMarkerPositions = markerPositionsModel()
 
-    if (movingMarkerPositions.isNotEmpty()) {
-        val markerPositions = movingMarkerPositions.map { it() }
+    val markerPositions = movingMarkerPositions.map { it() }
 
-        Polygon(markerPositions)
-    }
+    Polygon(markerPositions)
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -32,7 +32,7 @@ val projectArtifactId by extra { project: Project ->
 
 allprojects {
     group = "com.google.maps.android"
-    version = "6.4.0"
+    version = "6.4.1"
     val projectArtifactId by extra { project.name }
 }
 

diff --git a/maps-compose/src/main/java/com/google/maps/android/compose/Polygon.kt b/maps-compose/src/main/java/com/google/maps/android/compose/Polygon.kt
@@ -68,6 +68,8 @@ public fun Polygon(
     zIndex: Float = 0f,
     onClick: (Polygon) -> Unit = {}
 ) {
+    if (points.isEmpty()) return // avoid SDK crash
+
     val mapApplier = currentComposer.applier as MapApplier?
     ComposeNode<PolygonNode, MapApplier>(
         factory = {