[google_map_flutter] Add missing template type parameter to `invokeMethod` calls. Bump minimum Flutter version to 1.5.0. Replace invokeMethod with invokeMapMethod wherever necessary.
diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md index d7e623d..08bb514 100644 --- a/packages/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,9 @@ +## 0.5.15+1 + +* Add missing template type parameter to `invokeMethod` calls. +* Bump minimum Flutter version to 1.5.0. +* Replace invokeMethod with invokeMapMethod wherever necessary. + ## 0.5.15 * Add support for Polygons.
diff --git a/packages/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/lib/src/controller.dart index b3f3990..af86f89 100644 --- a/packages/google_maps_flutter/lib/src/controller.dart +++ b/packages/google_maps_flutter/lib/src/controller.dart
@@ -22,10 +22,7 @@ assert(id != null); final MethodChannel channel = MethodChannel('plugins.flutter.io/google_maps_$id'); - // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter. - // https://github.com/flutter/flutter/issues/26431 - // ignore: strong_mode_implicit_dynamic_method - await channel.invokeMethod('map#waitForMap'); + await channel.invokeMethod<void>('map#waitForMap'); return GoogleMapController._( channel, initialCameraPosition, @@ -92,10 +89,7 @@ /// The returned [Future] completes after listeners have been notified. Future<void> _updateMapOptions(Map<String, dynamic> optionsUpdate) async { assert(optionsUpdate != null); - // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter. - // https://github.com/flutter/flutter/issues/26431 - // ignore: strong_mode_implicit_dynamic_method - await channel.invokeMethod( + await channel.invokeMethod<void>( 'map#update', <String, dynamic>{ 'options': optionsUpdate, @@ -111,10 +105,7 @@ /// The returned [Future] completes after listeners have been notified. Future<void> _updateMarkers(_MarkerUpdates markerUpdates) async { assert(markerUpdates != null); - // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter. - // https://github.com/flutter/flutter/issues/26431 - // ignore: strong_mode_implicit_dynamic_method - await channel.invokeMethod( + await channel.invokeMethod<void>( 'markers#update', markerUpdates._toMap(), ); @@ -128,10 +119,7 @@ /// The returned [Future] completes after listeners have been notified. Future<void> _updatePolygons(_PolygonUpdates polygonUpdates) async { assert(polygonUpdates != null); - // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter. - // https://github.com/flutter/flutter/issues/26431 - // ignore: strong_mode_implicit_dynamic_method - await channel.invokeMethod( + await channel.invokeMethod<void>( 'polygons#update', polygonUpdates._toMap(), ); @@ -145,10 +133,7 @@ /// The returned [Future] completes after listeners have been notified. Future<void> _updatePolylines(_PolylineUpdates polylineUpdates) async { assert(polylineUpdates != null); - // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter. - // https://github.com/flutter/flutter/issues/26431 - // ignore: strong_mode_implicit_dynamic_method - await channel.invokeMethod( + await channel.invokeMethod<void>( 'polylines#update', polylineUpdates._toMap(), ); @@ -162,10 +147,7 @@ /// The returned [Future] completes after listeners have been notified. Future<void> _updateCircles(_CircleUpdates circleUpdates) async { assert(circleUpdates != null); - // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter. - // https://github.com/flutter/flutter/issues/26431 - // ignore: strong_mode_implicit_dynamic_method - await channel.invokeMethod( + await channel.invokeMethod<void>( 'circles#update', circleUpdates._toMap(), ); @@ -176,10 +158,7 @@ /// The returned [Future] completes after the change has been started on the /// platform side. Future<void> animateCamera(CameraUpdate cameraUpdate) async { - // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter. - // https://github.com/flutter/flutter/issues/26431 - // ignore: strong_mode_implicit_dynamic_method - await channel.invokeMethod('camera#animate', <String, dynamic>{ + await channel.invokeMethod<void>('camera#animate', <String, dynamic>{ 'cameraUpdate': cameraUpdate._toJson(), }); } @@ -189,21 +168,15 @@ /// The returned [Future] completes after the change has been made on the /// platform side. Future<void> moveCamera(CameraUpdate cameraUpdate) async { - // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter. - // https://github.com/flutter/flutter/issues/26431 - // ignore: strong_mode_implicit_dynamic_method - await channel.invokeMethod('camera#move', <String, dynamic>{ + await channel.invokeMethod<void>('camera#move', <String, dynamic>{ 'cameraUpdate': cameraUpdate._toJson(), }); } /// Return [LatLngBounds] defining the region that is visible in a map. Future<LatLngBounds> getVisibleRegion() async { - // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter. - // https://github.com/flutter/flutter/issues/26431 - // ignore: strong_mode_implicit_dynamic_method - final Map<dynamic, dynamic> latLngBounds = - await channel.invokeMethod('map#getVisibleRegion'); + final Map<String, dynamic> latLngBounds = + await channel.invokeMapMethod<String, dynamic>('map#getVisibleRegion'); final LatLng southwest = LatLng._fromJson(latLngBounds['southwest']); final LatLng northeast = LatLng._fromJson(latLngBounds['northeast']);
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml index 9af1da6..4a94ae6 100644 --- a/packages/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/pubspec.yaml
@@ -27,4 +27,4 @@ environment: sdk: ">=2.0.0-dev.47.0 <3.0.0" - flutter: ">=0.11.9 <2.0.0" + flutter: ">=1.5.0 <2.0.0"