From 40135a0ec3c12656e82032fd45eab35f9607f679 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 30 Mar 2021 10:21:30 -0400 Subject: [PATCH 1/2] [google_maps_flutter] Fix NNBD migration mistake in example The TileOverlay portion of the example app incorrectly constructed a Set and then attempted to cast it to a Set, rather than making a set of non-nullable types as required by the API. Fixes https://github.com/flutter/flutter/issues/79242 --- .../google_maps_flutter/google_maps_flutter/CHANGELOG.md | 4 ++++ .../google_maps_flutter/example/lib/tile_overlay.dart | 6 +++--- .../google_maps_flutter/google_maps_flutter/pubspec.yaml | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md index eb16024575bb..5b14d88a5cb2 100644 --- a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.2 + +* Fix incorrect typecast in TileOverlay example. + ## 2.0.1 * Update platform_plugin_interface version requirement. diff --git a/packages/google_maps_flutter/google_maps_flutter/example/lib/tile_overlay.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/tile_overlay.dart index a367511cb72f..1d6dd69c186b 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/lib/tile_overlay.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/lib/tile_overlay.dart @@ -67,8 +67,8 @@ class TileOverlayBodyState extends State { @override Widget build(BuildContext context) { - Set overlays = { - if (_tileOverlay != null) _tileOverlay, + Set overlays = { + if (_tileOverlay != null) _tileOverlay!, }; return Column( mainAxisSize: MainAxisSize.min, @@ -84,7 +84,7 @@ class TileOverlayBodyState extends State { target: LatLng(59.935460, 30.325177), zoom: 7.0, ), - tileOverlays: overlays as Set, + tileOverlays: overlays, onMapCreated: _onMapCreated, ), ), diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index d30c9d030de6..e37faebbb42c 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -1,7 +1,7 @@ name: google_maps_flutter description: A Flutter plugin for integrating Google Maps in iOS and Android applications. homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter/google_maps_flutter -version: 2.0.1 +version: 2.0.2 dependencies: flutter: From f9b1ce9de0567e621c554df1d508baef99cfae78 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 30 Mar 2021 15:30:45 -0400 Subject: [PATCH 2/2] Use a -dev version; not for publishing --- packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md | 2 +- packages/google_maps_flutter/google_maps_flutter/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md index 5b14d88a5cb2..098f5a0b1379 100644 --- a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md @@ -1,4 +1,4 @@ -## 2.0.2 +## 2.0.2-dev * Fix incorrect typecast in TileOverlay example. diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index e37faebbb42c..b7dbadae7118 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -1,7 +1,7 @@ name: google_maps_flutter description: A Flutter plugin for integrating Google Maps in iOS and Android applications. homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter/google_maps_flutter -version: 2.0.2 +version: 2.0.2-dev dependencies: flutter: