From 2059a72d88213e9fab1ffedbb7affd55b1bcdc92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petrus=20Nguy=E1=BB=85n=20Th=C3=A1i=20H=E1=BB=8Dc?= Date: Fri, 21 Jun 2024 17:19:05 +0700 Subject: [PATCH] update deps (#33) related to #27 * update deps * Update build-example.yml * update deps * update deps * Update build-example.yml * Apply suggestions from code review * fix * fix --- .github/workflows/build-example.yml | 8 +- example/lib/custom.dart | 5 +- example/lib/main.dart | 14 +- example/pubspec.lock | 168 ++++++++----- example/pubspec.yaml | 10 +- lib/src/flutter_google_places.dart | 37 ++- .../google_maps_webservice/src/places.dart | 55 ++--- .../google_maps_webservice/src/places.g.dart | 4 +- lib/src/places_autocomplete_field.dart | 4 +- lib/src/places_autocomplete_form_field.dart | 14 +- pubspec.lock | 228 +++++++++++------- pubspec.yaml | 30 +-- 12 files changed, 336 insertions(+), 241 deletions(-) diff --git a/.github/workflows/build-example.yml b/.github/workflows/build-example.yml index 567970b..3831dd3 100644 --- a/.github/workflows/build-example.yml +++ b/.github/workflows/build-example.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: '11' + java-version: '17' - uses: subosito/flutter-action@v2.4.0 with: @@ -52,7 +52,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: [ '3.10.0' ] + version: [ '3.19.6', '3.22.0' ] defaults: run: working-directory: ./example @@ -62,7 +62,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: '11' + java-version: '17' - uses: subosito/flutter-action@v2.4.0 with: @@ -78,4 +78,4 @@ jobs: run: flutter pub get - name: Build APK - run: flutter build apk --no-shrink + run: flutter build apk --debug --no-shrink diff --git a/example/lib/custom.dart b/example/lib/custom.dart index c7e3399..d305e6d 100644 --- a/example/lib/custom.dart +++ b/example/lib/custom.dart @@ -9,9 +9,8 @@ import 'main.dart'; // basically your widget need to extends [GooglePlacesAutocompleteWidget] // and your state [GooglePlacesAutocompleteState] class CustomSearchScaffold extends PlacesAutocompleteWidget { - CustomSearchScaffold({Key? key}) + CustomSearchScaffold({super.key}) : super( - key: key, apiKey: kGoogleApiKey, sessionToken: const Uuid().v4(), language: 'en', @@ -19,7 +18,7 @@ class CustomSearchScaffold extends PlacesAutocompleteWidget { ); @override - _CustomSearchScaffoldState createState() => _CustomSearchScaffoldState(); + PlacesAutocompleteState createState() => _CustomSearchScaffoldState(); } class _CustomSearchScaffoldState extends PlacesAutocompleteState { diff --git a/example/lib/main.dart b/example/lib/main.dart index d190c79..4062f79 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -32,7 +32,7 @@ final customTheme = ThemeData( ); class RoutesWidget extends StatelessWidget { - const RoutesWidget({Key? key}) : super(key: key); + const RoutesWidget({super.key}); @override Widget build(BuildContext context) { @@ -48,10 +48,10 @@ class RoutesWidget extends StatelessWidget { } class MyApp extends StatefulWidget { - const MyApp({Key? key}) : super(key: key); + const MyApp({super.key}); @override - _MyAppState createState() => _MyAppState(); + State createState() => _MyAppState(); } class _MyAppState extends State { @@ -127,7 +127,9 @@ class _MyAppState extends State { components: [const Component(Component.country, 'fr')], resultTextStyle: Theme.of(context).textTheme.titleMedium, ); - + if (!mounted) { + return; + } await displayPrediction(p, ScaffoldMessenger.of(context)); } } @@ -139,12 +141,12 @@ Future displayPrediction( } // get detail (lat/lng) - final _places = GoogleMapsPlaces( + final places = GoogleMapsPlaces( apiKey: kGoogleApiKey, apiHeaders: await const GoogleApiHeaders().getHeaders(), ); - final detail = await _places.getDetailsByPlaceId(p.placeId!); + final detail = await places.getDetailsByPlaceId(p.placeId!); final geometry = detail.result.geometry!; final lat = geometry.location.lat; final lng = geometry.location.lng; diff --git a/example/pubspec.lock b/example/pubspec.lock index 87aab85..8b18ef1 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -45,18 +45,18 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.18.0" crypto: dependency: transitive description: name: crypto - sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" dart_either: dependency: transitive description: @@ -77,10 +77,18 @@ packages: dependency: transitive description: name: ffi - sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.1.2" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + url: "https://pub.dev" + source: hosted + version: "1.1.0" flutter: dependency: "direct main" description: flutter @@ -90,10 +98,10 @@ packages: dependency: transitive description: name: flutter_bloc_pattern - sha256: "76fc4e7cd79cfe770ca69a0ea8133cf1ac180ecf42e86d316db3693fcd871501" + sha256: "934b42da57797a759b62659bb157625749f602239c26f13adde7c61ee65d3e3f" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "3.0.0" flutter_google_places_hoc081098: dependency: "direct main" description: @@ -105,10 +113,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493 + sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "4.0.0" flutter_provider: dependency: transitive description: @@ -131,18 +139,18 @@ packages: dependency: "direct main" description: name: google_api_headers - sha256: "104a73abca28c65b969482077d4c98c871ac38c3dd426a1536287baec50cec01" + sha256: a4f0a82dc4a2019a4fea0724ef3db91769c67b954115ae1088962507f5ecc6c9 url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "4.1.2" http: dependency: transitive description: name: http - sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.1" http_parser: dependency: transitive description: @@ -151,110 +159,126 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" - js: + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" + url: "https://pub.dev" + source: hosted + version: "4.9.0" + leak_tracker: dependency: transitive description: - name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" url: "https://pub.dev" source: hosted - version: "0.6.7" - json_annotation: + version: "10.0.4" + leak_tracker_flutter_testing: dependency: transitive description: - name: json_annotation - sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + 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: "4.8.1" + version: "3.0.1" lints: dependency: transitive description: name: lints - sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c + sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "4.0.0" listenable_stream: dependency: transitive description: name: listenable_stream - sha256: "5458276035c7eb66477c30f8eab0942e56537ba3d268172574f7af97e265e894" + sha256: "80decc4ef1dd999b42cf696d63f7729d1298a68f75b6bf3c944851ce5bf0eafd" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "2.0.1" matcher: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.2.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" package_info_plus: dependency: transitive description: name: package_info_plus - sha256: ceb027f6bc6a60674a233b4a90a7658af1aebdea833da0b5b53c1e9821a78c7b + sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0 url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "8.0.0" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + sha256: f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.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" rxdart: dependency: transitive description: name: rxdart - sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb" + sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962" url: "https://pub.dev" source: hosted - version: "0.27.7" + version: "0.28.0" rxdart_ext: dependency: transitive description: name: rxdart_ext - sha256: ca0b07216b4568e70d88154efd893ded54cf8cea43276c66baae245a843c326f + sha256: "95df7e8b13140e2c3fdb3b943569a51f18090e82aaaf6ca6e8e6437e434a6fb0" url: "https://pub.dev" source: hosted - version: "0.2.9" + version: "0.3.0" sky_engine: dependency: transitive description: flutter @@ -264,26 +288,34 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" + source: hosted + version: "1.10.0" + sprintf: + dependency: transitive + description: + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "7.0.0" stack_trace: 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" string_scanner: dependency: transitive description: @@ -304,26 +336,26 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.7.0" typed_data: dependency: transitive description: name: typed_data - sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" uuid: dependency: "direct main" description: name: uuid - sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313" + sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8" url: "https://pub.dev" source: hosted - version: "3.0.7" + version: "4.4.0" vector_math: dependency: transitive description: @@ -332,14 +364,30 @@ 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: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + url: "https://pub.dev" + source: hosted + version: "0.5.1" win32: dependency: transitive description: name: win32 - sha256: "7dacfda1edcca378031db9905ad7d7bd56b29fd1a90b0908b71a52a12c41e36b" + sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4 url: "https://pub.dev" source: hosted - version: "5.0.3" + version: "5.5.1" sdks: - dart: ">=3.0.0 <4.0.0" - flutter: ">=3.10.0" + dart: ">=3.4.3 <4.0.0" + flutter: ">=3.22.2" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 4db795d..f198f06 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -4,19 +4,19 @@ publish_to: none description: A new Flutter project. environment: - sdk: '>=2.14.0 <3.0.0' - flutter: '>=2.8.0' + sdk: '>=3.3.4 <4.0.0' + flutter: '>=3.19.6' dependencies: flutter: sdk: flutter flutter_google_places_hoc081098: path: ../ - google_api_headers: ^2.0.0 - uuid: ^3.0.7 + google_api_headers: ^4.0.3 + uuid: ^4.4.0 dev_dependencies: - flutter_lints: ^1.0.4 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter diff --git a/lib/src/flutter_google_places.dart b/lib/src/flutter_google_places.dart index 1b53021..3be3cb5 100644 --- a/lib/src/flutter_google_places.dart +++ b/lib/src/flutter_google_places.dart @@ -158,7 +158,7 @@ class PlacesAutocompleteWidget extends StatefulWidget { final TextStyle? resultTextStyle; PlacesAutocompleteWidget( - {Key? key, + {super.key, required this.apiKey, this.mode = Mode.fullscreen, this.hint = 'Search', @@ -185,8 +185,7 @@ class PlacesAutocompleteWidget extends StatefulWidget { this.textDecoration, this.textStyle, this.cursorColor, - this.resultTextStyle}) - : super(key: key) { + this.resultTextStyle}) { if (apiKey == null && proxyBaseUrl == null) { throw ArgumentError( 'One of `apiKey` and `proxyBaseUrl` fields is required'); @@ -385,8 +384,10 @@ class PlacesAutocompleteResult extends StatelessWidget { final TextStyle? resultTextStyle; const PlacesAutocompleteResult( - {Key? key, required this.onTap, required this.logo, this.resultTextStyle}) - : super(key: key); + {super.key, + required this.onTap, + required this.logo, + this.resultTextStyle}); @override Widget build(BuildContext context) { @@ -423,11 +424,11 @@ class AppBarPlacesAutoCompleteTextField extends StatefulWidget { final Color? cursorColor; const AppBarPlacesAutoCompleteTextField({ - Key? key, + super.key, required this.textDecoration, required this.textStyle, required this.cursorColor, - }) : super(key: key); + }); @override State createState() => @@ -486,7 +487,7 @@ class PoweredByGoogleImage extends StatelessWidget { final _poweredByGoogleBlack = 'packages/flutter_google_places_hoc081098/assets/google_black.png'; - const PoweredByGoogleImage({Key? key}) : super(key: key); + const PoweredByGoogleImage({super.key}); @override Widget build(BuildContext context) { @@ -509,11 +510,10 @@ class PredictionsListView extends StatelessWidget { final TextStyle? resultTextStyle; const PredictionsListView( - {Key? key, + {super.key, required this.predictions, required this.onTap, - this.resultTextStyle}) - : super(key: key); + this.resultTextStyle}); @override Widget build(BuildContext context) { @@ -535,11 +535,10 @@ class PredictionTile extends StatelessWidget { final TextStyle? resultTextStyle; const PredictionTile( - {Key? key, + {super.key, required this.prediction, required this.onTap, - this.resultTextStyle}) - : super(key: key); + this.resultTextStyle}); @override Widget build(BuildContext context) { @@ -593,8 +592,8 @@ abstract class PlacesAutocompleteState extends State { return true; }()); - return Rx.using( - () => GoogleMapsPlaces( + return Rx.using( + resourceFactory: () => GoogleMapsPlaces( apiKey: widget.apiKey, baseUrl: widget.proxyBaseUrl, httpClient: widget.httpClient, @@ -603,13 +602,13 @@ abstract class PlacesAutocompleteState extends State { ...?widget.headers, }, ), - (GoogleMapsPlaces places) => - Rx.never().startWith(places), - (GoogleMapsPlaces places) { + streamFactory: (places) => Rx.never().startWith(places), + disposer: (places) { assert(() { debugPrint('[flutter_google_places_hoc081098] disposed'); return true; }()); + return places.dispose(); }, ); diff --git a/lib/src/google_maps_webservice/src/places.dart b/lib/src/google_maps_webservice/src/places.dart index 40788a1..222d0ee 100644 --- a/lib/src/google_maps_webservice/src/places.dart +++ b/lib/src/google_maps_webservice/src/places.dart @@ -21,16 +21,12 @@ const _queryAutocompleteUrl = '/queryautocomplete/json'; /// https://developers.google.com/places/web-service/ class GoogleMapsPlaces extends GoogleWebService { GoogleMapsPlaces({ - String? apiKey, - String? baseUrl, - Client? httpClient, - Map? apiHeaders, + super.apiKey, + super.baseUrl, + super.httpClient, + super.apiHeaders, }) : super( - apiKey: apiKey, - baseUrl: baseUrl, apiPath: _placesUrl, - httpClient: httpClient, - apiHeaders: apiHeaders, ); Future searchNearbyWithRadius( @@ -538,15 +534,16 @@ class PlacesSearchResponse extends GoogleResponseStatus { final String? nextPageToken; PlacesSearchResponse({ - required String status, - String? errorMessage, + required super.status, + super.errorMessage, this.results = const [], this.htmlAttributions = const [], this.nextPageToken, - }) : super(status: status, errorMessage: errorMessage); + }); factory PlacesSearchResponse.fromJson(Map json) => _$PlacesSearchResponseFromJson(json); + Map toJson() => _$PlacesSearchResponseToJson(this); } @@ -614,6 +611,7 @@ class PlacesSearchResult { factory PlacesSearchResult.fromJson(Map json) => _$PlacesSearchResultFromJson(json); + Map toJson() => _$PlacesSearchResultToJson(this); } @@ -704,6 +702,7 @@ class PlaceDetails { factory PlaceDetails.fromJson(Map json) => _$PlaceDetailsFromJson(json); + Map toJson() => _$PlaceDetailsToJson(this); } @@ -727,6 +726,7 @@ class OpeningHoursDetail { factory OpeningHoursDetail.fromJson(Map json) => _$OpeningHoursDetailFromJson(json); + Map toJson() => _$OpeningHoursDetailToJson(this); } @@ -746,6 +746,7 @@ class OpeningHoursPeriodDate { factory OpeningHoursPeriodDate.fromJson(Map json) => _$OpeningHoursPeriodDateFromJson(json); + Map toJson() => _$OpeningHoursPeriodDateToJson(this); } @@ -759,6 +760,7 @@ class OpeningHoursPeriod { factory OpeningHoursPeriod.fromJson(Map json) => _$OpeningHoursPeriodFromJson(json); + Map toJson() => _$OpeningHoursPeriodToJson(this); } @@ -782,6 +784,7 @@ class Photo { }); factory Photo.fromJson(Map json) => _$PhotoFromJson(json); + Map toJson() => _$PhotoToJson(this); } @@ -797,22 +800,19 @@ class AlternativeId { factory AlternativeId.fromJson(Map json) => _$AlternativeIdFromJson(json); + Map toJson() => _$AlternativeIdToJson(this); } enum PriceLevel { @JsonValue(0) free, - @JsonValue(1) inexpensive, - @JsonValue(2) moderate, - @JsonValue(3) expensive, - @JsonValue(4) veryExpensive, } @@ -827,17 +827,15 @@ class PlacesDetailsResponse extends GoogleResponseStatus { final List htmlAttributions; PlacesDetailsResponse({ - required String status, - String? errorMessage, + required super.status, + super.errorMessage, required this.result, required this.htmlAttributions, - }) : super( - status: status, - errorMessage: errorMessage, - ); + }); factory PlacesDetailsResponse.fromJson(Map json) => _$PlacesDetailsResponseFromJson(json); + Map toJson() => _$PlacesDetailsResponseToJson(this); } @@ -876,6 +874,7 @@ class Review { }); factory Review.fromJson(Map json) => _$ReviewFromJson(json); + Map toJson() => _$ReviewToJson(this); } @@ -886,16 +885,14 @@ class PlacesAutocompleteResponse extends GoogleResponseStatus { final List predictions; PlacesAutocompleteResponse({ - required String status, - String? errorMessage, + required super.status, + super.errorMessage, required this.predictions, - }) : super( - status: status, - errorMessage: errorMessage, - ); + }); factory PlacesAutocompleteResponse.fromJson(Map json) => _$PlacesAutocompleteResponseFromJson(json); + Map toJson() => _$PlacesAutocompleteResponseToJson(this); } @@ -937,6 +934,7 @@ class Prediction { factory Prediction.fromJson(Map json) => _$PredictionFromJson(json); + Map toJson() => _$PredictionToJson(this); } @@ -952,6 +950,7 @@ class Term { }); factory Term.fromJson(Map json) => _$TermFromJson(json); + Map toJson() => _$TermToJson(this); @override @@ -979,6 +978,7 @@ class MatchedSubstring { factory MatchedSubstring.fromJson(Map json) => _$MatchedSubstringFromJson(json); + Map toJson() => _$MatchedSubstringToJson(this); @override @@ -1010,5 +1010,6 @@ class StructuredFormatting { factory StructuredFormatting.fromJson(Map json) => _$StructuredFormattingFromJson(json); + Map toJson() => _$StructuredFormattingToJson(this); } diff --git a/lib/src/google_maps_webservice/src/places.g.dart b/lib/src/google_maps_webservice/src/places.g.dart index 8cec477..266eabe 100644 --- a/lib/src/google_maps_webservice/src/places.g.dart +++ b/lib/src/google_maps_webservice/src/places.g.dart @@ -186,7 +186,7 @@ Map _$OpeningHoursDetailToJson(OpeningHoursDetail instance) => OpeningHoursPeriodDate _$OpeningHoursPeriodDateFromJson( Map json) => OpeningHoursPeriodDate( - day: json['day'] as int, + day: (json['day'] as num).toInt(), time: json['time'] as String, ); @@ -313,7 +313,7 @@ Prediction _$PredictionFromJson(Map json) => Prediction( ?.map((e) => Term.fromJson(e as Map)) .toList() ?? [], - distanceMeters: json['distance_meters'] as int?, + distanceMeters: (json['distance_meters'] as num?)?.toInt(), placeId: json['place_id'] as String?, reference: json['reference'] as String?, types: diff --git a/lib/src/places_autocomplete_field.dart b/lib/src/places_autocomplete_field.dart index 3071df7..3f471b9 100644 --- a/lib/src/places_autocomplete_field.dart +++ b/lib/src/places_autocomplete_field.dart @@ -37,7 +37,7 @@ class PlacesAutocompleteField extends StatefulWidget { /// by the decoration to save space for the labels), set the [decoration] to /// null. const PlacesAutocompleteField({ - Key? key, + super.key, required this.apiKey, this.controller, this.leading, @@ -61,7 +61,7 @@ class PlacesAutocompleteField extends StatefulWidget { this.overlayBorderRadius, this.textStyle, this.textStyleFormField, - }) : super(key: key); + }); /// Controls the text being edited. /// diff --git a/lib/src/places_autocomplete_form_field.dart b/lib/src/places_autocomplete_form_field.dart index 706d560..d5352ad 100644 --- a/lib/src/places_autocomplete_form_field.dart +++ b/lib/src/places_autocomplete_form_field.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'google_maps_webservice/places.dart'; import 'flutter_google_places.dart'; +import 'google_maps_webservice/places.dart'; import 'places_autocomplete_field.dart'; /// A [FormField] that contains a [PlacesAutocompleteField]. @@ -43,7 +43,7 @@ class PlacesAutocompleteFormField extends FormField { /// For documentation about the various parameters, see the [PlacesAutocompleteField] class /// and [PlacesAutocompleteField], the constructor. PlacesAutocompleteFormField({ - Key? key, + super.key, required String? apiKey, this.controller, Icon? leading, @@ -62,21 +62,17 @@ class PlacesAutocompleteFormField extends FormField { bool? strictbounds, ValueChanged? onError, InputDecoration? inputDecoration = const InputDecoration(), - AutovalidateMode autovalidateMode = AutovalidateMode.disabled, - FormFieldSetter? onSaved, - FormFieldValidator? validator, + AutovalidateMode super.autovalidateMode = AutovalidateMode.disabled, + super.onSaved, + super.validator, Map? headers, BorderRadius? overlayBorderRadius, TextStyle? textStyle, TextStyle? textStyleFormField, }) : assert(initialValue == null || controller == null), super( - key: key, initialValue: controller != null ? controller.text : (initialValue ?? ''), - onSaved: onSaved, - validator: validator, - autovalidateMode: autovalidateMode, builder: (FormFieldState field) { final state = field as _TextFormFieldState; final effectiveDecoration = inputDecoration diff --git a/pubspec.lock b/pubspec.lock index 75a79ff..03b677a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,26 +5,26 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a + sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" url: "https://pub.dev" source: hosted - version: "61.0.0" + version: "67.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 + sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" url: "https://pub.dev" source: hosted - version: "5.13.0" + version: "6.4.1" args: dependency: transitive description: name: args - sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.5.0" async: dependency: transitive description: @@ -45,10 +45,10 @@ packages: dependency: transitive description: name: build - sha256: "43865b79fbb78532e4bff7c33087aa43b1d488c4fdef014eaef568af6d8016dc" + sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.1" build_config: dependency: transitive description: @@ -61,34 +61,34 @@ packages: dependency: transitive description: name: build_daemon - sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65" + sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.0.2" build_resolvers: dependency: transitive description: name: build_resolvers - sha256: db49b8609ef8c81cca2b310618c3017c00f03a92af44c04d310b907b2d692d95 + sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.4.2" build_runner: dependency: "direct dev" description: name: build_runner - sha256: "5e1929ad37d48bd382b124266cb8e521de5548d406a45a5ae6656c13dab73e37" + sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" url: "https://pub.dev" source: hosted - version: "2.4.5" + version: "2.4.11" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41" + sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe url: "https://pub.dev" source: hosted - version: "7.2.10" + version: "7.3.1" built_collection: dependency: transitive description: @@ -101,10 +101,10 @@ packages: dependency: transitive description: name: built_value - sha256: "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166" + sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb url: "https://pub.dev" source: hosted - version: "8.6.1" + version: "8.9.2" characters: dependency: transitive description: @@ -133,18 +133,18 @@ packages: dependency: transitive description: name: code_builder - sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189" + sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37 url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.10.0" collection: dependency: "direct main" description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.18.0" convert: dependency: transitive description: @@ -173,10 +173,10 @@ packages: dependency: transitive description: name: dart_style - sha256: f4f1f73ab3fd2afcbcca165ee601fe980d966af6a21b5970c6c9376955c528ad + sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.6" fake_async: dependency: transitive description: @@ -189,10 +189,10 @@ packages: dependency: transitive description: name: ffi - sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.1.2" file: dependency: transitive description: @@ -218,18 +218,18 @@ packages: dependency: "direct main" description: name: flutter_bloc_pattern - sha256: "76fc4e7cd79cfe770ca69a0ea8133cf1ac180ecf42e86d316db3693fcd871501" + sha256: "934b42da57797a759b62659bb157625749f602239c26f13adde7c61ee65d3e3f" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "3.0.0" flutter_lints: dependency: "direct dev" description: name: flutter_lints - sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c + sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "4.0.0" flutter_provider: dependency: transitive description: @@ -252,10 +252,10 @@ packages: dependency: transitive description: name: frontend_server_client - sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "4.0.0" glob: dependency: transitive description: @@ -268,10 +268,10 @@ packages: dependency: "direct main" description: name: google_api_headers - sha256: "104a73abca28c65b969482077d4c98c871ac38c3dd426a1536287baec50cec01" + sha256: a4f0a82dc4a2019a4fea0724ef3db91769c67b954115ae1088962507f5ecc6c9 url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "4.1.2" graphs: dependency: transitive description: @@ -284,10 +284,10 @@ packages: dependency: "direct main" description: name: http - sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.1" http_multi_server: dependency: transitive description: @@ -316,42 +316,66 @@ packages: dependency: transitive description: name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "0.7.1" json_annotation: dependency: "direct main" description: name: json_annotation - sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" url: "https://pub.dev" source: hosted - version: "4.8.1" + version: "4.9.0" json_serializable: dependency: "direct dev" description: name: json_serializable - sha256: "61a60716544392a82726dd0fa1dd6f5f1fd32aec66422b6e229e7b90d52325c4" + sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b + url: "https://pub.dev" + source: hosted + version: "6.8.0" + 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: "6.7.0" + 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: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "4.0.0" listenable_stream: dependency: "direct main" description: name: listenable_stream - sha256: "5458276035c7eb66477c30f8eab0942e56537ba3d268172574f7af97e265e894" + sha256: "80decc4ef1dd999b42cf696d63f7729d1298a68f75b6bf3c944851ce5bf0eafd" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "2.0.1" logging: dependency: transitive description: @@ -364,34 +388,34 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.8.0" meta: dependency: "direct main" description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.12.0" mime: dependency: transitive description: name: mime - sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" package_config: dependency: transitive description: @@ -404,34 +428,34 @@ packages: dependency: transitive description: name: package_info_plus - sha256: ceb027f6bc6a60674a233b4a90a7658af1aebdea833da0b5b53c1e9821a78c7b + sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0 url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "8.0.0" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + sha256: f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.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" pool: dependency: transitive description: @@ -452,26 +476,26 @@ packages: dependency: transitive description: name: pubspec_parse - sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367 + sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 url: "https://pub.dev" source: hosted - version: "1.2.3" + version: "1.3.0" rxdart: dependency: "direct main" description: name: rxdart - sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb" + sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962" url: "https://pub.dev" source: hosted - version: "0.27.7" + version: "0.28.0" rxdart_ext: dependency: "direct main" description: name: rxdart_ext - sha256: ca0b07216b4568e70d88154efd893ded54cf8cea43276c66baae245a843c326f + sha256: "95df7e8b13140e2c3fdb3b943569a51f18090e82aaaf6ca6e8e6437e434a6fb0" url: "https://pub.dev" source: hosted - version: "0.2.9" + version: "0.3.0" shelf: dependency: transitive description: @@ -484,10 +508,10 @@ packages: dependency: transitive description: name: shelf_web_socket - sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "2.0.0" sky_engine: dependency: transitive description: flutter @@ -497,42 +521,42 @@ packages: dependency: transitive description: name: source_gen - sha256: "373f96cf5a8744bc9816c1ff41cf5391bbdbe3d7a96fe98c622b6738a8a7bd33" + sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.5.0" source_helper: dependency: transitive description: name: source_helper - sha256: "3b67aade1d52416149c633ba1bb36df44d97c6b51830c2198e934e3fca87ca1f" + sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd" url: "https://pub.dev" source: hosted - version: "1.3.3" + version: "1.3.4" source_span: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: 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: @@ -561,10 +585,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.7.0" timing: dependency: transitive description: @@ -577,10 +601,10 @@ packages: dependency: transitive description: name: typed_data - sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" vector_math: dependency: transitive description: @@ -589,6 +613,14 @@ 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" watcher: dependency: transitive description: @@ -597,22 +629,38 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + url: "https://pub.dev" + source: hosted + version: "0.5.1" + web_socket: + dependency: transitive + description: + name: web_socket + sha256: "24301d8c293ce6fe327ffe6f59d8fd8834735f0ec36e4fd383ec7ff8a64aa078" + url: "https://pub.dev" + source: hosted + version: "0.1.5" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b + sha256: a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276 url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "3.0.0" win32: dependency: transitive description: name: win32 - sha256: "7dacfda1edcca378031db9905ad7d7bd56b29fd1a90b0908b71a52a12c41e36b" + sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4 url: "https://pub.dev" source: hosted - version: "5.0.3" + version: "5.5.1" yaml: dependency: transitive description: @@ -622,5 +670,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.0.0 <4.0.0" - flutter: ">=3.10.0" + dart: ">=3.4.3 <4.0.0" + flutter: ">=3.22.2" diff --git a/pubspec.yaml b/pubspec.yaml index 98fd517..2516f06 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,30 +14,32 @@ topics: - flutter-google-places environment: - sdk: '>=3.0.0 <4.0.0' - flutter: '>=3.10.0' + sdk: '>=3.3.4 <4.0.0' + flutter: '>=3.19.6' dependencies: flutter: sdk: flutter - google_api_headers: ^2.0.0 - http: ^1.0.0 - rxdart: ^0.27.7 - rxdart_ext: ^0.2.9 - listenable_stream: ^1.1.0 - collection: ^1.17.1 - flutter_bloc_pattern: ^2.3.0 - json_annotation: ^4.8.1 - meta: ^1.7.0 + google_api_headers: ^4.0.3 + http: ^1.2.1 + rxdart: ^0.28.0 + rxdart_ext: ^0.3.0 + listenable_stream: ^2.0.1 + collection: ^1.18.0 + flutter_bloc_pattern: ^3.0.0 + json_annotation: ^4.9.0 + meta: ^1.11.0 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.1 - build_runner: ^2.4.5 - json_serializable: ^6.7.0 + flutter_lints: ^4.0.0 + build_runner: ^2.4.11 + json_serializable: ^6.8.0 flutter: assets: - packages/flutter_google_places_hoc081098/assets/google_black.png - packages/flutter_google_places_hoc081098/assets/google_white.png + +# dart run build_runner build --delete-conflicting-outputs \ No newline at end of file