From 91cb6d0301d1acdaefdf1c54dd178ede6ebac36f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Nov 2025 08:27:53 +0000 Subject: [PATCH 1/7] [dependabot]: Bump com.google.maps.android:android-maps-utils Bumps [com.google.maps.android:android-maps-utils](https://github.com/googlemaps/android-maps-utils) from 3.6.0 to 3.19.1. - [Release notes](https://github.com/googlemaps/android-maps-utils/releases) - [Changelog](https://github.com/googlemaps/android-maps-utils/blob/main/.releaserc) - [Commits](https://github.com/googlemaps/android-maps-utils/compare/v3.6.0...v3.19.1) --- updated-dependencies: - dependency-name: com.google.maps.android:android-maps-utils dependency-version: 3.19.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../google_maps_flutter_android/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle index e280be37488..e0af3fe295d 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle @@ -38,7 +38,7 @@ android { dependencies { implementation("androidx.annotation:annotation:1.9.1") implementation("com.google.android.gms:play-services-maps:19.2.0") - implementation("com.google.maps.android:android-maps-utils:3.6.0") + implementation("com.google.maps.android:android-maps-utils:3.19.1") androidTestImplementation("androidx.test:runner:1.7.0") androidTestImplementation("androidx.test:rules:1.7.0") androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0") From da30e77e2856d0db7c7bb8296a4dca1de6b6ed1a Mon Sep 17 00:00:00 2001 From: Matt Boetger Date: Mon, 17 Nov 2025 14:30:21 -0800 Subject: [PATCH 2/7] Update android-maps-utils to version 3.19.1 --- .../google_maps_flutter_android/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md index 5215e7a577d..55153981004 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.18.5 + +* Bumps com.google.maps.android:android-maps-utils from 3.6.0 to 3.19.1. + ## 2.18.4 * Updates Java compatibility version to 17 and minimum supported SDK version to Flutter 3.35/Dart 3.9. From 0098c29eb9cc9da348d2f1f419f4e66092476a89 Mon Sep 17 00:00:00 2001 From: Matt Boetger Date: Mon, 17 Nov 2025 14:30:39 -0800 Subject: [PATCH 3/7] Bump version to 2.18.5 in pubspec.yaml --- .../google_maps_flutter_android/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml index 982c86fb901..f3d0c45e227 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_android description: Android implementation of the google_maps_flutter plugin. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.18.4 +version: 2.18.5 environment: sdk: ^3.9.0 From 1729dc8625b78d69994ab6ebaa6a8df5eb5540f8 Mon Sep 17 00:00:00 2001 From: Matt Boetger Date: Mon, 17 Nov 2025 14:32:21 -0800 Subject: [PATCH 4/7] Bump version to 2.18.6 in pubspec.yaml --- .../google_maps_flutter_android/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml index 4c272074a70..bb75e4469ea 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_android description: Android implementation of the google_maps_flutter plugin. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.18.5 +version: 2.18.6 environment: sdk: ^3.9.0 From 198c1d2bd4fa03cfbbbd855baf5c8d0f53cde66a Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Mon, 24 Nov 2025 16:08:56 -0500 Subject: [PATCH 5/7] Method rename. https://github.com/googlemaps/android-maps-utils/blob/ede25264b04bd40daf075da8af4e4fe84b4ab16c/library/src/main/java/com/google/maps/android/heatmaps/HeatmapTileProvider.kt\#L146-L149 --- .../java/io/flutter/plugins/googlemaps/HeatmapController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapController.java b/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapController.java index d56143e38e0..ea4382ce27c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapController.java +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapController.java @@ -34,7 +34,7 @@ void clearTileCache() { @Override public void setWeightedData(@NonNull List weightedData) { - heatmap.setWeightedData(weightedData); + heatmap.updateData(weightedData); } @Override From 51cadeccf344cda24d7725e586c25a2aa58790ac Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Mon, 24 Nov 2025 16:11:26 -0500 Subject: [PATCH 6/7] Align changelog and pubspec --- .../google_maps_flutter_android/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml index bb75e4469ea..2082a980f77 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_android description: Android implementation of the google_maps_flutter plugin. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.18.6 +version: 2.18.7 environment: sdk: ^3.9.0 From c0ef9954876d0f6b7446c33dff67b916b27c296e Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Tue, 25 Nov 2025 14:51:42 -0500 Subject: [PATCH 7/7] migrate gradiant to getters from direct acess --- .../plugins/googlemaps/ConvertTest.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java index db66ca92b49..6f9d66ed56c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java @@ -583,15 +583,15 @@ public void ConvertToGradientReturnsCorrectData() { final Gradient result = Convert.toGradient(data); - Assert.assertEquals(3, result.mColors.length); - Assert.assertEquals(color1, result.mColors[0]); - Assert.assertEquals(color2, result.mColors[1]); - Assert.assertEquals(color3, result.mColors[2]); - Assert.assertEquals(3, result.mStartPoints.length); - Assert.assertEquals(startPoint1, result.mStartPoints[0], 0); - Assert.assertEquals(startPoint2, result.mStartPoints[1], 0); - Assert.assertEquals(startPoint3, result.mStartPoints[2], 0); - Assert.assertEquals(colorMapSize, result.mColorMapSize); + Assert.assertEquals(3, result.getColors().length); + Assert.assertEquals(color1, result.getColors()[0]); + Assert.assertEquals(color2, result.getColors()[1]); + Assert.assertEquals(color3, result.getColors()[2]); + Assert.assertEquals(3, result.getStartPoints().length); + Assert.assertEquals(startPoint1, result.getStartPoints()[0], 0); + Assert.assertEquals(startPoint2, result.getStartPoints()[1], 0); + Assert.assertEquals(startPoint3, result.getStartPoints()[2], 0); + Assert.assertEquals(colorMapSize, result.getColorMapSize()); } @Test() @@ -642,15 +642,15 @@ public void ConvertInterpretHeatmapOptionsReturnsCorrectData() { Assert.assertEquals(point.x, builder.getWeightedData().get(0).getPoint().x, 0); Assert.assertEquals(point.y, builder.getWeightedData().get(0).getPoint().y, 0); Assert.assertEquals(intensity, builder.getWeightedData().get(0).getIntensity(), 0); - Assert.assertEquals(3, builder.getGradient().mColors.length); - Assert.assertEquals(color1, builder.getGradient().mColors[0]); - Assert.assertEquals(color2, builder.getGradient().mColors[1]); - Assert.assertEquals(color3, builder.getGradient().mColors[2]); - Assert.assertEquals(3, builder.getGradient().mStartPoints.length); - Assert.assertEquals(startPoint1, builder.getGradient().mStartPoints[0], 0); - Assert.assertEquals(startPoint2, builder.getGradient().mStartPoints[1], 0); - Assert.assertEquals(startPoint3, builder.getGradient().mStartPoints[2], 0); - Assert.assertEquals(colorMapSize, builder.getGradient().mColorMapSize); + Assert.assertEquals(3, builder.getGradient().getColors().length); + Assert.assertEquals(color1, builder.getGradient().getColors()[0]); + Assert.assertEquals(color2, builder.getGradient().getColors()[1]); + Assert.assertEquals(color3, builder.getGradient().getColors()[2]); + Assert.assertEquals(3, builder.getGradient().getStartPoints().length); + Assert.assertEquals(startPoint1, builder.getGradient().getStartPoints()[0], 0); + Assert.assertEquals(startPoint2, builder.getGradient().getStartPoints()[1], 0); + Assert.assertEquals(startPoint3, builder.getGradient().getStartPoints()[2], 0); + Assert.assertEquals(colorMapSize, builder.getGradient().getColorMapSize()); Assert.assertEquals(maxIntensity, builder.getMaxIntensity(), 0); Assert.assertEquals(opacity, builder.getOpacity(), 0); Assert.assertEquals(radius, builder.getRadius());