From b9393d63dca382c8aa4fe447d8f69a4d830a4130 Mon Sep 17 00:00:00 2001 From: LN Liberda Date: Thu, 5 Jun 2025 12:17:14 +0200 Subject: [PATCH] chore: Bump Flutter to 3.32.2 --- .gitignore | 1 + .gitlab-ci.yml | 2 +- flutter_version | 2 +- lib/src/f_wallet_app.dart | 2 +- .../components/transit_type_icon.dart | 3 ++- lib/src/pages/pass_details/pass_details.dart | 2 +- .../pages/pass_details/pass_details_view.dart | 2 +- .../components/pass_tab_destination.dart | 3 +-- lib/src/pages/pass_list/pass_list.dart | 2 +- lib/src/pages/pass_list/pass_list_view.dart | 2 +- lib/src/widgets/language_button.dart | 2 +- lib/src/widgets/language_dialog.dart | 3 ++- lib/src/widgets/theme_button.dart | 2 +- pubspec.lock | 20 +++++++++---------- 14 files changed, 25 insertions(+), 23 deletions(-) diff --git a/lib/src/f_wallet_app.dart b/lib/src/f_wallet_app.dart index 4d963aa..abc6159 100644 --- a/lib/src/f_wallet_app.dart +++ b/lib/src/f_wallet_app.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:dynamic_color/dynamic_color.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:hive_flutter/hive_flutter.dart'; import 'package:provider/provider.dart'; +import 'package:f_wallet/l10n/app_localizations.dart'; import 'package:f_wallet/src/utils/f_wallet_theme.dart'; import 'package:f_wallet/src/utils/hive_boxes.dart'; import 'package:f_wallet/src/utils/pass_manager.dart'; diff --git a/lib/src/pages/pass_details/components/transit_type_icon.dart b/lib/src/pages/pass_details/components/transit_type_icon.dart index ef08df1..ebcf08f 100644 --- a/lib/src/pages/pass_details/components/transit_type_icon.dart +++ b/lib/src/pages/pass_details/components/transit_type_icon.dart @@ -1,8 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:pkpass/pkpass.dart'; +import 'package:f_wallet/l10n/app_localizations.dart'; + class TransitTypeIcon extends StatelessWidget { final TransitType? transitType; final DateTime? relevantDate; diff --git a/lib/src/pages/pass_details/pass_details.dart b/lib/src/pages/pass_details/pass_details.dart index 3ddf0e7..c8d8149 100644 --- a/lib/src/pages/pass_details/pass_details.dart +++ b/lib/src/pages/pass_details/pass_details.dart @@ -5,12 +5,12 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:file_selector/file_selector.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:path_provider/path_provider.dart'; import 'package:pkpass/pkpass.dart'; import 'package:share_plus/share_plus.dart'; import 'package:url_launcher/url_launcher.dart'; +import 'package:f_wallet/l10n/app_localizations.dart'; import 'package:f_wallet/src/pages/pass_details/pass_details_view.dart'; import 'package:f_wallet/src/utils/hive_boxes.dart'; import 'package:f_wallet/src/utils/locale_locle.dart'; diff --git a/lib/src/pages/pass_details/pass_details_view.dart b/lib/src/pages/pass_details/pass_details_view.dart index f3cef4d..55d8759 100644 --- a/lib/src/pages/pass_details/pass_details_view.dart +++ b/lib/src/pages/pass_details/pass_details_view.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:pkpass/pkpass.dart'; +import 'package:f_wallet/l10n/app_localizations.dart'; import 'package:f_wallet/src/pages/pass_details/components/barcode.dart'; import 'package:f_wallet/src/pages/pass_details/pass_details.dart'; import 'package:f_wallet/src/utils/locale_locle.dart'; diff --git a/lib/src/pages/pass_list/components/pass_tab_destination.dart b/lib/src/pages/pass_list/components/pass_tab_destination.dart index 01cc621..05ca088 100644 --- a/lib/src/pages/pass_list/components/pass_tab_destination.dart +++ b/lib/src/pages/pass_list/components/pass_tab_destination.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; - +import 'package:f_wallet/l10n/app_localizations.dart'; import 'pass_tabs.dart'; class PassTabDestination extends StatelessWidget { diff --git a/lib/src/pages/pass_list/pass_list.dart b/lib/src/pages/pass_list/pass_list.dart index 839a6ab..59e3c9e 100644 --- a/lib/src/pages/pass_list/pass_list.dart +++ b/lib/src/pages/pass_list/pass_list.dart @@ -7,13 +7,13 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:file_selector/file_selector.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_sharing_intent/flutter_sharing_intent.dart'; import 'package:flutter_sharing_intent/model/sharing_file.dart'; import 'package:go_router/go_router.dart'; import 'package:pkpass/pkpass.dart'; import 'package:url_launcher/link.dart'; +import 'package:f_wallet/l10n/app_localizations.dart'; import 'package:f_wallet/src/utils/args_parser.dart'; import 'package:f_wallet/src/utils/pass_manager.dart'; import 'package:f_wallet/src/utils/version.dart'; diff --git a/lib/src/pages/pass_list/pass_list_view.dart b/lib/src/pages/pass_list/pass_list_view.dart index 742cd59..c188799 100644 --- a/lib/src/pages/pass_list/pass_list_view.dart +++ b/lib/src/pages/pass_list/pass_list_view.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:animations/animations.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:provider/provider.dart'; +import 'package:f_wallet/l10n/app_localizations.dart'; import 'package:f_wallet/src/pages/pass_list/components/pass_preview.dart'; import 'package:f_wallet/src/pages/pass_list/pass_list.dart'; import 'package:f_wallet/src/utils/pass_manager.dart'; diff --git a/lib/src/widgets/language_button.dart b/lib/src/widgets/language_button.dart index beb2435..c6a09e6 100644 --- a/lib/src/widgets/language_button.dart +++ b/lib/src/widgets/language_button.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:hive_flutter/hive_flutter.dart'; +import 'package:f_wallet/l10n/app_localizations.dart'; import 'package:f_wallet/src/utils/hive_boxes.dart'; import 'language_dialog.dart'; diff --git a/lib/src/widgets/language_dialog.dart b/lib/src/widgets/language_dialog.dart index b205dac..683c54e 100644 --- a/lib/src/widgets/language_dialog.dart +++ b/lib/src/widgets/language_dialog.dart @@ -1,8 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:locale_names/locale_names.dart'; +import 'package:f_wallet/l10n/app_localizations.dart'; + class LanguageDialog extends StatelessWidget { const LanguageDialog({super.key}); diff --git a/lib/src/widgets/theme_button.dart b/lib/src/widgets/theme_button.dart index 379ff27..261283a 100644 --- a/lib/src/widgets/theme_button.dart +++ b/lib/src/widgets/theme_button.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:hive_flutter/hive_flutter.dart'; +import 'package:f_wallet/l10n/app_localizations.dart'; import 'package:f_wallet/src/utils/hive_boxes.dart'; class ThemeButton extends StatelessWidget { diff --git a/pubspec.lock b/pubspec.lock index 11df4c2..65eebc5 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -29,10 +29,10 @@ dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.13.0" barcode: dependency: transitive description: @@ -53,18 +53,18 @@ dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" characters: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" charset: dependency: transitive description: @@ -93,18 +93,18 @@ dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" cross_file: dependency: transitive description: @@ -149,10 +149,10 @@ dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.3" ffi: dependency: transitive description: @@ -409,10 +409,10 @@ dependency: "direct main" description: name: intl - sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf + sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5" url: "https://pub.dev" source: hosted - version: "0.19.0" + version: "0.20.2" js: dependency: transitive description: @@ -433,18 +433,18 @@ dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.9" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -489,26 +489,26 @@ dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.16.0" mime: dependency: transitive description: @@ -529,10 +529,10 @@ dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" path_provider: dependency: "direct main" description: @@ -649,15 +649,15 @@ dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" sprintf: dependency: transitive description: @@ -670,42 +670,42 @@ dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.4" tint: dependency: transitive description: @@ -806,10 +806,10 @@ dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "15.0.0" web: dependency: transitive description: @@ -851,5 +851,5 @@ source: hosted version: "3.1.2" sdks: - dart: ">=3.4.0 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.22.0"