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 8249302b7a9..280ec0de9aa 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md @@ -1,9 +1,12 @@ +## 2.18.8 + +* Bumps com.google.maps.android:android-maps-utils from 3.6.0 to 3.19.1. + ## 2.18.7 * Replaces internal use of deprecated methods. ## 2.18.6 - * Bumps com.android.tools.build:gradle from 8.12.1 to 8.13.1. ## 2.18.5 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 4e49a1c5b8f..ed2ed10e5ea 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") 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 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()); 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 44fd1ef358d..9563058d4d2 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.7 +version: 2.18.8 environment: sdk: ^3.9.0