From 9410577a0abd8f002a2b1e7b5650cfbe5d48377a Mon Sep 17 00:00:00 2001 From: Franreno Date: Sun, 23 Jul 2023 17:09:23 -0300 Subject: [PATCH 1/5] Updating configuration to accept mapType, fullscreen and streetview controls. --- .../google_maps_controller_test.dart | 24 +++++++++++++++++++ .../lib/src/convert.dart | 8 +++---- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart index 00a448a979b..93fc8c0e976 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart @@ -403,6 +403,30 @@ void main() { expect(capturedOptions!.tilt, 0); }); + testWidgets( + 'translates mapTypeControl, fullscreenControl, streetViewControl configurations', + (WidgetTester tester) async { + controller = createController( + mapConfiguration: const MapConfiguration( + mapTypeControl: true, + fullscreenControl: true, + streetViewControl: true, + )); + + controller.debugSetOverrides( + createMap: (_, gmaps.MapOptions options) { + capturedOptions = options; + return map; + }); + + controller.init(); + + expect(capturedOptions, isNotNull); + expect(capturedOptions!.mapTypeControl, true); + expect(capturedOptions!.fullscreenControl, true); + expect(capturedOptions!.streetViewControl, true); + }); + testWidgets('translates fortyFiveDegreeImageryEnabled option', (WidgetTester tester) async { controller = createController( diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart index 1e5e9192c45..7dddfafdd33 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart @@ -74,11 +74,9 @@ gmaps.MapOptions _configurationAndStyleToGmapsOptions( options.rotateControl = configuration.fortyFiveDegreeImageryEnabled; } - // These don't have any configuration entries, but they seem to be off in the - // native maps. - options.mapTypeControl = false; - options.fullscreenControl = false; - options.streetViewControl = false; + options.mapTypeControl = configuration.mapTypeControl ?? false; + options.fullscreenControl = configuration.fullscreenControl ?? false; + options.streetViewControl = configuration.streetViewControl ?? false; options.styles = styles; From 2ebad26aa23f63651e79eae2a154acfe31928aba Mon Sep 17 00:00:00 2001 From: Franreno Date: Sun, 23 Jul 2023 17:11:26 -0300 Subject: [PATCH 2/5] Including mapType, fullscreen and streetview controls to MapConfiguration --- .../lib/src/types/map_configuration.dart | 33 +++++++++ .../test/types/map_configuration_test.dart | 69 +++++++++++++++++++ 2 files changed, 102 insertions(+) diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart index 3ec973fd7d0..1c0104c0990 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart @@ -35,6 +35,9 @@ class MapConfiguration { this.indoorViewEnabled, this.trafficEnabled, this.buildingsEnabled, + this.mapTypeControl, + this.fullscreenControl, + this.streetViewControl, this.cloudMapId, }); @@ -107,6 +110,16 @@ class MapConfiguration { /// True if 3D building display should be enabled. final bool? buildingsEnabled; + /// True if the control to toggle between map types should be displayed. + final bool? mapTypeControl; + + /// True if the control to open the map on full screen should be displayed. + final bool? fullscreenControl; + + /// True if the Pegman control, that lets the user to activate the street + /// view panorama, should be displayed. + final bool? streetViewControl; + /// Identifier that's associated with a specific cloud-based map style. /// /// See https://developers.google.com/maps/documentation/get-map-id @@ -173,6 +186,14 @@ class MapConfiguration { trafficEnabled != other.trafficEnabled ? trafficEnabled : null, buildingsEnabled: buildingsEnabled != other.buildingsEnabled ? buildingsEnabled : null, + mapTypeControl: + mapTypeControl != other.mapTypeControl ? mapTypeControl : null, + fullscreenControl: fullscreenControl != other.fullscreenControl + ? fullscreenControl + : null, + streetViewControl: streetViewControl != other.streetViewControl + ? streetViewControl + : null, cloudMapId: cloudMapId != other.cloudMapId ? cloudMapId : null, ); } @@ -205,6 +226,9 @@ class MapConfiguration { indoorViewEnabled: diff.indoorViewEnabled ?? indoorViewEnabled, trafficEnabled: diff.trafficEnabled ?? trafficEnabled, buildingsEnabled: diff.buildingsEnabled ?? buildingsEnabled, + mapTypeControl: diff.mapTypeControl ?? mapTypeControl, + fullscreenControl: diff.fullscreenControl ?? fullscreenControl, + streetViewControl: diff.streetViewControl ?? streetViewControl, cloudMapId: diff.cloudMapId ?? cloudMapId, ); } @@ -231,6 +255,9 @@ class MapConfiguration { indoorViewEnabled == null && trafficEnabled == null && buildingsEnabled == null && + mapTypeControl == null && + fullscreenControl == null && + streetViewControl == null && cloudMapId == null; @override @@ -262,6 +289,9 @@ class MapConfiguration { indoorViewEnabled == other.indoorViewEnabled && trafficEnabled == other.trafficEnabled && buildingsEnabled == other.buildingsEnabled && + mapTypeControl == other.mapTypeControl && + fullscreenControl == other.fullscreenControl && + streetViewControl == other.streetViewControl && cloudMapId == other.cloudMapId; } @@ -287,6 +317,9 @@ class MapConfiguration { indoorViewEnabled, trafficEnabled, buildingsEnabled, + mapTypeControl, + fullscreenControl, + streetViewControl, cloudMapId, ]); } diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart index 2a53b8c0bbc..6aff9d0d41b 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart @@ -33,6 +33,9 @@ void main() { indoorViewEnabled: false, trafficEnabled: false, buildingsEnabled: false, + mapTypeControl: false, + fullscreenControl: false, + streetViewControl: false, ); test('only include changed fields', () async { @@ -393,6 +396,54 @@ void main() { expect(empty.hashCode, isNot(diff.hashCode)); }); + test('handle mapTypeControl', () async { + const MapConfiguration diff = MapConfiguration(mapTypeControl: true); + + const MapConfiguration empty = MapConfiguration(); + final MapConfiguration updated = diffBase.applyDiff(diff); + + // A diff applied to empty options should be the diff itself. + expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); + // A diff applied to non-empty options should update that field. + expect(updated.mapTypeControl, true); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); + }); + + test('handle fullscreenControl', () async { + const MapConfiguration diff = MapConfiguration(fullscreenControl: true); + + const MapConfiguration empty = MapConfiguration(); + final MapConfiguration updated = diffBase.applyDiff(diff); + + // A diff applied to empty options should be the diff itself. + expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); + // A diff applied to non-empty options should update that field. + expect(updated.fullscreenControl, true); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); + }); + + test('handle streetViewControl', () async { + const MapConfiguration diff = MapConfiguration(streetViewControl: true); + + const MapConfiguration empty = MapConfiguration(); + final MapConfiguration updated = diffBase.applyDiff(diff); + + // A diff applied to empty options should be the diff itself. + expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); + // A diff applied to non-empty options should update that field. + expect(updated.streetViewControl, true); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); + }); + test('handle cloudMapId', () async { const MapConfiguration diff = MapConfiguration(cloudMapId: _kCloudMapId); @@ -536,6 +587,24 @@ void main() { expect(diff.isEmpty, false); }); + test('is false with mapTypeControl', () async { + const MapConfiguration diff = MapConfiguration(mapTypeControl: true); + + expect(diff.isEmpty, false); + }); + + test('is false with fullscreenControl', () async { + const MapConfiguration diff = MapConfiguration(fullscreenControl: true); + + expect(diff.isEmpty, false); + }); + + test('is false with streetViewControl', () async { + const MapConfiguration diff = MapConfiguration(streetViewControl: true); + + expect(diff.isEmpty, false); + }); + test('is false with cloudMapId', () async { const MapConfiguration diff = MapConfiguration(cloudMapId: _kCloudMapId); From 69c8b91dcaedeb914a51ab38233e8cdf1ec2fba8 Mon Sep 17 00:00:00 2001 From: Franreno Date: Sun, 23 Jul 2023 17:14:32 -0300 Subject: [PATCH 3/5] Updating changelog --- .../google_maps_flutter_platform_interface/CHANGELOG.md | 4 ++++ .../google_maps_flutter_platform_interface/pubspec.yaml | 2 +- .../google_maps_flutter/google_maps_flutter_web/CHANGELOG.md | 4 ++++ .../google_maps_flutter/google_maps_flutter_web/pubspec.yaml | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md index c7856259978..877007e34dc 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.4.1 + +* Adds `mapType`, `fullscreen` and `streetview` controls to google maps configuration. + ## 2.4.0 * Adds options for gesture handling and tilt controls on web. diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml index 9b79a532ebb..91964ef6d1e 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml @@ -4,7 +4,7 @@ repository: https://github.com/flutter/packages/tree/main/packages/google_maps_f issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 # NOTE: We strongly prefer non-breaking changes, even at the expense of a # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes -version: 2.4.0 +version: 2.4.1 environment: sdk: ">=2.18.0 <4.0.0" diff --git a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md index 0427818ca50..3fd80194931 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.2+1 + +* Adds `mapType`, `fullscreen` and `streetview` controls to google maps configuration. + ## 0.5.2 * Adds options for gesture handling and tilt controls. diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index f1eb09c6c57..3ffc24f9ea4 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_web description: Web platform implementation of google_maps_flutter repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 0.5.2 +version: 0.5.2+1 environment: sdk: ">=2.18.0 <4.0.0" From 219858136ca535fabbcf7a7cfba1ad40242185db Mon Sep 17 00:00:00 2001 From: Franreno Date: Sun, 23 Jul 2023 20:53:49 -0300 Subject: [PATCH 4/5] Adding dependancies override --- .../google_maps_flutter/example/pubspec.yaml | 5 +++++ .../google_maps_flutter/google_maps_flutter/pubspec.yaml | 5 +++++ .../google_maps_flutter_android/example/pubspec.yaml | 5 +++++ .../google_maps_flutter_android/pubspec.yaml | 5 +++++ .../google_maps_flutter_ios/example/ios11/pubspec.yaml | 5 +++++ .../google_maps_flutter_ios/example/ios12/pubspec.yaml | 5 +++++ .../google_maps_flutter_ios/example/ios13/pubspec.yaml | 5 +++++ .../example/shared/maps_example_dart/pubspec.yaml | 5 +++++ .../google_maps_flutter_ios/pubspec.yaml | 5 +++++ .../google_maps_flutter_web/example/pubspec.yaml | 8 +++++++- .../google_maps_flutter_web/pubspec.yaml | 5 +++++ 11 files changed, 57 insertions(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml index 364d9b62d3c..52e39466563 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml @@ -33,3 +33,8 @@ flutter: uses-material-design: true assets: - assets/ + +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins +dependency_overrides: + {google_maps_flutter_platform_interface: {path: ../../../google_maps_flutter/google_maps_flutter_platform_interface}, google_maps_flutter_web: {path: ../../../google_maps_flutter/google_maps_flutter_web}} diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index e56ff513e7a..748e0bd6107 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -35,3 +35,8 @@ dev_dependencies: # The example deliberately includes limited-use secrets. false_secrets: - /example/web/index.html + +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins +dependency_overrides: + {google_maps_flutter_platform_interface: {path: ../../google_maps_flutter/google_maps_flutter_platform_interface}, google_maps_flutter_web: {path: ../../google_maps_flutter/google_maps_flutter_web}} diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml index d21ff07a34a..21c9d1c3049 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml @@ -32,3 +32,8 @@ flutter: uses-material-design: true assets: - assets/ + +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins +dependency_overrides: + {google_maps_flutter_platform_interface: {path: ../../../google_maps_flutter/google_maps_flutter_platform_interface}} 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 04c9f12bbba..2e1c46d2bec 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml @@ -29,3 +29,8 @@ dev_dependencies: flutter_test: sdk: flutter plugin_platform_interface: ^2.0.0 + +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins +dependency_overrides: + {google_maps_flutter_platform_interface: {path: ../../google_maps_flutter/google_maps_flutter_platform_interface}} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml index 050519e8acb..fbae2577e27 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml @@ -32,3 +32,8 @@ flutter: uses-material-design: true assets: - assets/ + +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins +dependency_overrides: + {google_maps_flutter_platform_interface: {path: ../../../../google_maps_flutter/google_maps_flutter_platform_interface}} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml index 050519e8acb..fbae2577e27 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml @@ -32,3 +32,8 @@ flutter: uses-material-design: true assets: - assets/ + +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins +dependency_overrides: + {google_maps_flutter_platform_interface: {path: ../../../../google_maps_flutter/google_maps_flutter_platform_interface}} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml index 050519e8acb..fbae2577e27 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml @@ -32,3 +32,8 @@ flutter: uses-material-design: true assets: - assets/ + +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins +dependency_overrides: + {google_maps_flutter_platform_interface: {path: ../../../../google_maps_flutter/google_maps_flutter_platform_interface}} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml index e20bdb9a5af..be4f9a8a8dc 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml @@ -22,3 +22,8 @@ dependencies: flutter: uses-material-design: true + +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins +dependency_overrides: + {google_maps_flutter_platform_interface: {path: ../../../../../google_maps_flutter/google_maps_flutter_platform_interface}} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml index 499387f6433..3ba2559bb53 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml @@ -27,3 +27,8 @@ dev_dependencies: flutter_test: sdk: flutter plugin_platform_interface: ^2.0.0 + +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins +dependency_overrides: + {google_maps_flutter_platform_interface: {path: ../../google_maps_flutter/google_maps_flutter_platform_interface}} diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml index 4944d77651a..c707ec4e4b5 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml @@ -24,9 +24,15 @@ dev_dependencies: sdk: flutter mockito: 5.4.1 + +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins dependency_overrides: + # Override the google_maps_flutter dependency on google_maps_flutter_web. # TODO(ditman): Unwind the circular dependency. This will create problems # if we need to make a breaking change to google_maps_flutter_web. + google_maps_flutter_platform_interface: + path: ../../../google_maps_flutter/google_maps_flutter_platform_interface google_maps_flutter_web: - path: ../ + path: ../../../google_maps_flutter/google_maps_flutter_web diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index 3ffc24f9ea4..20916af6b60 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -33,3 +33,8 @@ dev_dependencies: # The example deliberately includes limited-use secrets. false_secrets: - /example/web/index.html + +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins +dependency_overrides: + {google_maps_flutter_platform_interface: {path: ../../google_maps_flutter/google_maps_flutter_platform_interface}} From a723032ef773b42e9f2e3eae46d308771728ed9b Mon Sep 17 00:00:00 2001 From: Franreno Date: Tue, 25 Jul 2023 13:49:01 -0300 Subject: [PATCH 5/5] Removing unnecessary dependancies overrides --- .../google_maps_flutter/google_maps_flutter/pubspec.yaml | 5 ----- .../google_maps_flutter_android/pubspec.yaml | 5 ----- .../google_maps_flutter/google_maps_flutter_ios/pubspec.yaml | 5 ----- 3 files changed, 15 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index 748e0bd6107..e56ff513e7a 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -35,8 +35,3 @@ dev_dependencies: # The example deliberately includes limited-use secrets. false_secrets: - /example/web/index.html - -# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. -# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins -dependency_overrides: - {google_maps_flutter_platform_interface: {path: ../../google_maps_flutter/google_maps_flutter_platform_interface}, google_maps_flutter_web: {path: ../../google_maps_flutter/google_maps_flutter_web}} 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 2e1c46d2bec..04c9f12bbba 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml @@ -29,8 +29,3 @@ dev_dependencies: flutter_test: sdk: flutter plugin_platform_interface: ^2.0.0 - -# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. -# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins -dependency_overrides: - {google_maps_flutter_platform_interface: {path: ../../google_maps_flutter/google_maps_flutter_platform_interface}} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml index 3ba2559bb53..499387f6433 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml @@ -27,8 +27,3 @@ dev_dependencies: flutter_test: sdk: flutter plugin_platform_interface: ^2.0.0 - -# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. -# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins -dependency_overrides: - {google_maps_flutter_platform_interface: {path: ../../google_maps_flutter/google_maps_flutter_platform_interface}}