From 41a3f20e47e5ab9baec9287f72c9d0d50fe5d61f Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Tue, 14 May 2024 21:56:36 +0200 Subject: [PATCH] chore(deps): upgrade google_maps_flutter to 2.6.1 --- example/pubspec.lock | 102 ++++++++++++++++++++++++++-------------- lib/src/google_map.dart | 15 ++---- pubspec.yaml | 8 ++-- 3 files changed, 74 insertions(+), 51 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index 7ce5fe4..685eb6e 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" csslib: dependency: transitive description: @@ -68,7 +68,7 @@ packages: path: ".." relative: true source: path - version: "2.0.0" + version: "2.0.1" flutter_lints: dependency: "direct dev" description: @@ -107,50 +107,50 @@ packages: dependency: transitive description: name: google_maps - sha256: eb20a162d642599a05179e2d155b9e803899cb377764fdec9044fa7fa474bfb8 + sha256: "47eef3836b49bb030d5cb3afc60b8451408bf34cf753e571b645d6529eb4251a" url: "https://pub.dev" source: hosted - version: "6.2.0" + version: "7.1.0" google_maps_flutter: dependency: transitive description: name: google_maps_flutter - sha256: "0c6b72b4b1e0f6204973e2b40868a75fe6380725d498f215cd7e35ed920d1c57" + sha256: c1972cbad779bc5346c49045f26ae45550a0958b1cbca5b524dd3c8954995d28 url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.6.1" google_maps_flutter_android: dependency: transitive description: name: google_maps_flutter_android - sha256: "701761b234579b4cfc0f6ae0791e2bb7184b31207b0d716e536b6d1a190dc143" + sha256: "0bcadb80eba39afda77dede89a6caafd3b68f2786b90491eceea4a01c3db181c" url: "https://pub.dev" source: hosted - version: "2.4.3" + version: "2.8.0" google_maps_flutter_ios: dependency: transitive description: name: google_maps_flutter_ios - sha256: "33bbca8d4148ed373251ea2ec2344fdc63009926b6d6be71a0854fd42409b1ba" + sha256: e5132d17f051600d90d79d9f574b177c24231da702453a036db2490f9ced4646 url: "https://pub.dev" source: hosted - version: "2.1.13" + version: "2.6.0" google_maps_flutter_platform_interface: dependency: transitive description: name: google_maps_flutter_platform_interface - sha256: "0967430c25240836b794d42336bd4c61f0e78e9fd33d1365fa9316bb36b6b410" + sha256: "167af879da4d004cd58771f1469b91dcc3b9b0a2c5334cc6bf71fd41d4b35403" url: "https://pub.dev" source: hosted - version: "2.2.5" + version: "2.6.0" google_maps_flutter_web: dependency: transitive description: name: google_maps_flutter_web - sha256: "9ae7d8001add51c6edd7befa45de5249ea9553fb42a950e7a5132a324217e72a" + sha256: "0c0d5c723d94b295cf86dd1c45ff91d2ac1fff7c05ddca4f01bef9fa0a014690" url: "https://pub.dev" source: hosted - version: "0.3.3" + version: "0.5.7" html: dependency: transitive description: @@ -191,6 +191,30 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.4" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + url: "https://pub.dev" + source: hosted + version: "10.0.4" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + url: "https://pub.dev" + source: hosted + version: "3.0.3" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" lints: dependency: transitive description: @@ -203,42 +227,42 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.12.0" path: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.8" sanitize_html: dependency: transitive description: @@ -264,18 +288,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" stream_transform: dependency: transitive description: @@ -304,10 +328,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.7.0" typed_data: dependency: transitive description: @@ -324,14 +348,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + url: "https://pub.dev" + source: hosted + version: "14.2.1" web: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.5.1" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" - flutter: ">=3.0.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.19.0" diff --git a/lib/src/google_map.dart b/lib/src/google_map.dart index 12bb468..5f13805 100644 --- a/lib/src/google_map.dart +++ b/lib/src/google_map.dart @@ -123,6 +123,9 @@ class _GoogleTrackTraceMapState extends State { controller.start.position, controller.end.position, ), + style: widget.mapStylingTheme != null + ? widget.mapStylingTheme!.getJson() + : '[{"featureType": "poi","stylers": [{"visibility": "off"}]}]', onMapCreated: _onMapCreated, onTap: widget.onTap, onLongPress: widget.onLongPress, @@ -169,18 +172,6 @@ class _GoogleTrackTraceMapState extends State { void _onMapCreated(GoogleMapController ctr) { if (mounted) { controller.mapController = ctr; - if (widget.mapStylingTheme != null) { - ctr.setMapStyle(widget.mapStylingTheme!.getJson()).onError( - (error, stackTrace) async { - throw GoogleMapsException(error.toString()); - }, - ); - } else { - // No theme provided so switching to default - ctr.setMapStyle( - '[{"featureType": "poi","stylers": [{"visibility": "off"}]}]', - ); - } controller.recenterCamera(); } } diff --git a/pubspec.yaml b/pubspec.yaml index aa597e7..2bf5b9c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,15 +3,15 @@ description: An Iconica Flutter plugin for Track & Trace Package version: 2.0.1 environment: - sdk: ">=2.14.0 <3.0.0" - flutter: ">=2.5.0" + sdk: ">=3.3.0 <4.0.0" + flutter: ">=3.19.0" dependencies: flutter: sdk: flutter flutter_polyline_points: ^1.0.0 - google_maps_flutter: ^2.0.10 - google_maps_flutter_web: ^0.3.1 + google_maps_flutter: ^2.6.1 + google_maps_flutter_web: ^0.5.7 http: ^0.13.3 dev_dependencies: