Skip to content

Commit 2496670

Browse files
[dependabot]: Bump com.google.android.gms:play-services-maps from 18.2.0 to 19.2.0 in /packages/google_maps_flutter/google_maps_flutter_android/android (#9120)
Bumps com.google.android.gms:play-services-maps from 18.2.0 to 19.2.0. [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.android.gms:play-services-maps&package-manager=gradle&previous-version=18.2.0&new-version=19.2.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) You can trigger a rebase of this PR by commenting `@dependabot rebase`. --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> > **Note** > Automatic rebases have been disabled on this pull request as it has been open for over 30 days.
1 parent 85daf43 commit 2496670

File tree

8 files changed

+23
-6
lines changed

8 files changed

+23
-6
lines changed

packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 2.17.0
2+
3+
* Updates `com.google.android.gms:play-services-maps` to 19.2.0.
4+
* Marks `AndroidMapRenderer.legacy` as deprecated, since it's deprecated in the
5+
current version of the Google Maps SDK.
6+
17
## 2.16.2
28

39
* Removes documentation related to the map renderer selection API, as the

packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ android {
3737

3838
dependencies {
3939
implementation "androidx.annotation:annotation:1.9.1"
40-
implementation 'com.google.android.gms:play-services-maps:18.2.0'
40+
implementation 'com.google.android.gms:play-services-maps:19.2.0'
4141
implementation 'com.google.maps.android:android-maps-utils:3.6.0'
4242
androidTestImplementation 'androidx.test:runner:1.6.2'
4343
androidTestImplementation 'androidx.test:rules:1.6.1'

packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,14 @@ static int toMapType(@NonNull Messages.PlatformMapType type) {
360360
return MAP_TYPE_NORMAL;
361361
}
362362

363+
// For now, suppress the deprecation warning for LEGACY; in theory using it
364+
// no longer does anything, but since that's a server-side decision that could
365+
// potentially change. Once enough time has passed that there's no plausible
366+
// chance of the server honoring LEGACY again, that mapping can be removed and
367+
// it can just return null, causing anyone still using the deprecated value
368+
// in Dart to actually request the platform default (which is what the server
369+
// is already doing in practice currently).
370+
@SuppressWarnings("deprecation")
363371
static @Nullable MapsInitializer.Renderer toMapRendererType(
364372
@Nullable Messages.PlatformRendererType type) {
365373
if (type == null) {

packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/GoogleMapInitializerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public void initializer_OnMapsSdkInitializedWithLatestRenderer() {
4848
verify(result, never()).error(any());
4949
}
5050

51+
@SuppressWarnings("deprecation")
5152
@Test
5253
public void initializer_OnMapsSdkInitializedWithLegacyRenderer() {
5354
doNothing().when(googleMapInitializer).initializeWithRendererRequest(Renderer.LEGACY);

packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/PolygonControllerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import static org.mockito.Mockito.mock;
88
import static org.mockito.Mockito.spy;
99

10-
import com.google.android.gms.internal.maps.zzag;
10+
import com.google.android.gms.internal.maps.zzao;
1111
import com.google.android.gms.maps.model.Polygon;
1212
import org.junit.Test;
1313
import org.mockito.Mockito;
@@ -16,7 +16,7 @@ public class PolygonControllerTest {
1616

1717
@Test
1818
public void controller_SetsStrokeDensity() {
19-
final zzag z = mock(zzag.class);
19+
final zzao z = mock(zzao.class);
2020
final Polygon polygon = spy(new Polygon(z));
2121

2222
final float density = 5;

packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/PolylineControllerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import static org.mockito.Mockito.mock;
88
import static org.mockito.Mockito.spy;
99

10-
import com.google.android.gms.internal.maps.zzaj;
10+
import com.google.android.gms.internal.maps.zzar;
1111
import com.google.android.gms.maps.model.Polyline;
1212
import org.junit.Test;
1313
import org.mockito.Mockito;
@@ -16,7 +16,7 @@ public class PolylineControllerTest {
1616

1717
@Test
1818
public void controller_SetsStrokeDensity() {
19-
final zzaj z = mock(zzaj.class);
19+
final zzar z = mock(zzar.class);
2020
final Polyline polyline = spy(new Polyline(z));
2121

2222
final float density = 5;

packages/google_maps_flutter/google_maps_flutter_android/lib/src/google_maps_flutter_android.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ enum AndroidMapRenderer {
5252
latest,
5353

5454
/// Legacy renderer type.
55+
@Deprecated('The legacy renderer is no longer supported by the Google Maps, '
56+
'SDK, so requesting it will have no effect.')
5557
legacy,
5658

5759
/// Requests the default map renderer type.

packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: google_maps_flutter_android
22
description: Android implementation of the google_maps_flutter plugin.
33
repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_android
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
5-
version: 2.16.2
5+
version: 2.17.0
66

77
environment:
88
sdk: ^3.6.0

0 commit comments

Comments
 (0)