From 9fef1332f3c7e3c5f605d8a7b0ab8b242ba3a633 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Wed, 12 Feb 2025 21:14:20 -0600 Subject: [PATCH] Clean up dependencies across packages (#2585) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop dep on pkg:collection, use new bits in Dart 3.0 Fixed very old dep in navigation_and_routing – bug was fixed long ago --- .../booking/booking_repository_local.dart | 5 +---- compass_app/app/pubspec.yaml | 1 - compass_app/server/lib/routes/booking.dart | 11 ++++------- compass_app/server/pubspec.yaml | 1 - experimental/web_dashboard/.gitignore | 3 --- experimental/web_dashboard/pubspec.yaml | 1 - form_app/.gitignore | 3 --- navigation_and_routing/.gitignore | 3 --- navigation_and_routing/lib/main.dart | 12 ------------ navigation_and_routing/pubspec.yaml | 4 ---- place_tracker/.gitignore | 3 --- place_tracker/lib/place_map.dart | 6 ++---- place_tracker/pubspec.yaml | 1 - simplistic_editor/.gitignore | 3 --- 14 files changed, 7 insertions(+), 50 deletions(-) diff --git a/compass_app/app/lib/data/repositories/booking/booking_repository_local.dart b/compass_app/app/lib/data/repositories/booking/booking_repository_local.dart index 5e6a60bfc..c8bdf0e70 100644 --- a/compass_app/app/lib/data/repositories/booking/booking_repository_local.dart +++ b/compass_app/app/lib/data/repositories/booking/booking_repository_local.dart @@ -4,12 +4,9 @@ import 'dart:async'; -import 'package:collection/collection.dart'; - import '../../../domain/models/booking/booking.dart'; import '../../../domain/models/booking/booking_summary.dart'; import '../../../utils/result.dart'; - import '../../services/local/local_data_service.dart'; import 'booking_repository.dart'; @@ -35,7 +32,7 @@ class BookingRepositoryLocal implements BookingRepository { @override Future> getBooking(int id) async { - final booking = _bookings.firstWhereOrNull((booking) => booking.id == id); + final booking = _bookings.where((booking) => booking.id == id).firstOrNull; if (booking == null) { return Result.error(Exception('Booking not found')); } diff --git a/compass_app/app/pubspec.yaml b/compass_app/app/pubspec.yaml index b3f9dad40..7b9881146 100644 --- a/compass_app/app/pubspec.yaml +++ b/compass_app/app/pubspec.yaml @@ -9,7 +9,6 @@ environment: dependencies: cached_network_image: ^3.4.1 - collection: ^1.18.0 flutter: sdk: flutter flutter_localizations: diff --git a/compass_app/server/lib/routes/booking.dart b/compass_app/server/lib/routes/booking.dart index 8952b1b1c..850797bce 100644 --- a/compass_app/server/lib/routes/booking.dart +++ b/compass_app/server/lib/routes/booking.dart @@ -4,7 +4,6 @@ import 'dart:convert'; -import 'package:collection/collection.dart'; import 'package:shelf/shelf.dart'; import 'package:shelf_router/shelf_router.dart'; @@ -61,9 +60,8 @@ class BookingApi { // Get a booking by id router.get('/', (Request request, String id) { final bookingId = int.parse(id); - final booking = _bookings.firstWhereOrNull( - (booking) => booking.id == bookingId, - ); + final booking = + _bookings.where((booking) => booking.id == bookingId).firstOrNull; if (booking == null) { return Response.notFound('Invalid id'); @@ -104,9 +102,8 @@ class BookingApi { // Delete booking router.delete('/', (Request request, String id) async { final bookingId = int.parse(id); - final booking = _bookings.firstWhereOrNull( - (booking) => booking.id == bookingId, - ); + final booking = + _bookings.where((booking) => booking.id == bookingId).firstOrNull; if (booking == null) { return Response.notFound('Invalid id'); } diff --git a/compass_app/server/pubspec.yaml b/compass_app/server/pubspec.yaml index 67e940540..734269df4 100644 --- a/compass_app/server/pubspec.yaml +++ b/compass_app/server/pubspec.yaml @@ -12,7 +12,6 @@ dependencies: shelf_router: ^1.1.0 freezed_annotation: ^2.4.4 json_annotation: ^4.9.0 - collection: ^1.19.0 dev_dependencies: http: ^1.1.0 diff --git a/experimental/web_dashboard/.gitignore b/experimental/web_dashboard/.gitignore index ae1f1838e..a981f586a 100644 --- a/experimental/web_dashboard/.gitignore +++ b/experimental/web_dashboard/.gitignore @@ -30,8 +30,5 @@ .pub/ /build/ -# Web related -lib/generated_plugin_registrant.dart - # Exceptions to above rules. !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages diff --git a/experimental/web_dashboard/pubspec.yaml b/experimental/web_dashboard/pubspec.yaml index d552f7082..38c4b899d 100644 --- a/experimental/web_dashboard/pubspec.yaml +++ b/experimental/web_dashboard/pubspec.yaml @@ -8,7 +8,6 @@ environment: dependencies: cloud_firestore: ^5.0.1 - collection: ^1.16.0 community_charts_flutter: ^1.0.2 cupertino_icons: ^1.0.0 firebase_auth: ^5.1.0 diff --git a/form_app/.gitignore b/form_app/.gitignore index f3c205341..955a34860 100644 --- a/form_app/.gitignore +++ b/form_app/.gitignore @@ -31,9 +31,6 @@ .pub/ /build/ -# Web related -lib/generated_plugin_registrant.dart - # Symbolication related app.*.symbols diff --git a/navigation_and_routing/.gitignore b/navigation_and_routing/.gitignore index 0fa6b675c..69ef9b08e 100644 --- a/navigation_and_routing/.gitignore +++ b/navigation_and_routing/.gitignore @@ -31,9 +31,6 @@ .pub/ /build/ -# Web related -lib/generated_plugin_registrant.dart - # Symbolication related app.*.symbols diff --git a/navigation_and_routing/lib/main.dart b/navigation_and_routing/lib/main.dart index 2a175df87..19469b483 100644 --- a/navigation_and_routing/lib/main.dart +++ b/navigation_and_routing/lib/main.dart @@ -6,23 +6,11 @@ import 'dart:io' show Platform; import 'package:flutter/foundation.dart' show kIsWeb; import 'package:flutter/material.dart'; -import 'package:url_strategy/url_strategy.dart'; import 'package:window_size/window_size.dart'; import 'src/app.dart'; void main() { - // Use package:url_strategy until this pull request is released: - // https://github.com/flutter/flutter/pull/77103 - - // Use to setHashUrlStrategy() to use "/#/" in the address bar (default). Use - // setPathUrlStrategy() to use the path. You may need to configure your web - // server to redirect all paths to index.html. - // - // On mobile platforms, both functions are no-ops. - setHashUrlStrategy(); - // setPathUrlStrategy(); - setupWindow(); runApp(const Bookstore()); } diff --git a/navigation_and_routing/pubspec.yaml b/navigation_and_routing/pubspec.yaml index d0b8b6904..578687f8e 100644 --- a/navigation_and_routing/pubspec.yaml +++ b/navigation_and_routing/pubspec.yaml @@ -8,15 +8,11 @@ environment: dependencies: adaptive_navigation: ^0.0.3 - collection: ^1.17.0 cupertino_icons: ^1.0.2 flutter: sdk: flutter go_router: ^14.0.0 - path_to_regexp: ^0.4.0 - quiver: ^3.1.0 url_launcher: ^6.1.1 - url_strategy: ^0.3.0 window_size: git: url: https://github.com/google/flutter-desktop-embedding.git diff --git a/place_tracker/.gitignore b/place_tracker/.gitignore index 990b030d1..808f1fc86 100644 --- a/place_tracker/.gitignore +++ b/place_tracker/.gitignore @@ -69,6 +69,3 @@ !**/ios/**/default.pbxuser !**/ios/**/default.perspectivev3 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages - -# Flutter Web files -lib/generated_plugin_registrant.dart diff --git a/place_tracker/lib/place_map.dart b/place_tracker/lib/place_map.dart index be3d65a9f..ffebe88fa 100644 --- a/place_tracker/lib/place_map.dart +++ b/place_tracker/lib/place_map.dart @@ -5,7 +5,6 @@ import 'dart:async'; import 'dart:math'; -import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; @@ -279,9 +278,8 @@ class _PlaceMapState extends State { // At this point, we know the places have been updated from the list // view. We need to reconfigure the map to respect the updates. for (final place in newConfiguration.places) { - final oldPlace = _configuration!.places.firstWhereOrNull( - (p) => p.id == place.id, - ); + final oldPlace = + _configuration!.places.where((p) => p.id == place.id).firstOrNull; if (oldPlace == null || oldPlace != place) { // New place or updated place. _updateExistingPlaceMarker(place: place); diff --git a/place_tracker/pubspec.yaml b/place_tracker/pubspec.yaml index 081132d0c..8d431d440 100644 --- a/place_tracker/pubspec.yaml +++ b/place_tracker/pubspec.yaml @@ -15,7 +15,6 @@ dependencies: provider: ^6.0.2 uuid: ^4.0.0 go_router: ">=10.0.0 <15.0.0" - collection: ^1.16.0 dev_dependencies: analysis_defaults: diff --git a/simplistic_editor/.gitignore b/simplistic_editor/.gitignore index a8e938c08..24476c5d1 100644 --- a/simplistic_editor/.gitignore +++ b/simplistic_editor/.gitignore @@ -32,9 +32,6 @@ migrate_working_dir/ .pub/ /build/ -# Web related -lib/generated_plugin_registrant.dart - # Symbolication related app.*.symbols