From 4e916eefc21db5656e5fb1d9514f043efeb3fc50 Mon Sep 17 00:00:00 2001 From: Ryunosuke Muramatsu Date: Thu, 17 Aug 2023 10:16:28 +0900 Subject: [PATCH] build: Flutter 3.13 (#234) * build: bump Flutter/Dart to 3.13.0/3.1.0 * fix: dart fix * chore: update gap package * chore: run iOS * chore: remove ignore Co-authored-by: naipaka --------- Co-authored-by: naipaka --- .fvm/fvm_config.json | 2 +- packages/amazon_paapi/pubspec.yaml | 2 +- packages/analysis_logger/pubspec.yaml | 2 +- packages/authenticator/pubspec.yaml | 2 +- packages/convenient_widgets/pubspec.yaml | 2 +- .../ios/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../account/components/account_page_body.dart | 3 +- .../async_notifier_provider_page.dart | 2 +- .../notifier_provider_page.dart | 2 +- .../state_notifier_provider_page.dart | 2 +- .../components/settings_page_body.dart | 2 +- .../lib/pages/splash/splash_page.dart | 1 - packages/flutter_app/pubspec.lock | 40 +++++++++++-------- packages/flutter_app/pubspec.yaml | 4 +- packages/notification_receiver/pubspec.yaml | 2 +- packages/notification_sender/pubspec.yaml | 2 +- .../remote_parameter_fetcher/pubspec.yaml | 2 +- .../rest_api_client/lib/src/dio_client.dart | 2 +- packages/rest_api_client/pubspec.yaml | 2 +- packages/themes/pubspec.yaml | 2 +- packages/util/pubspec.yaml | 2 +- pubspec.lock | 2 +- pubspec.yaml | 2 +- 24 files changed, 47 insertions(+), 41 deletions(-) diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json index 2f49d155..7d9198e3 100644 --- a/.fvm/fvm_config.json +++ b/.fvm/fvm_config.json @@ -1,4 +1,4 @@ { - "flutterSdkVersion": "3.10.6", + "flutterSdkVersion": "3.13.0", "flavors": {} } \ No newline at end of file diff --git a/packages/amazon_paapi/pubspec.yaml b/packages/amazon_paapi/pubspec.yaml index 520245cb..0b972479 100644 --- a/packages/amazon_paapi/pubspec.yaml +++ b/packages/amazon_paapi/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: "none" version: 1.0.0 environment: - sdk: ^3.0.3 + sdk: ^3.1.0 dependencies: collection: ^1.15.0 diff --git a/packages/analysis_logger/pubspec.yaml b/packages/analysis_logger/pubspec.yaml index 5a04ddf5..35bb9424 100644 --- a/packages/analysis_logger/pubspec.yaml +++ b/packages/analysis_logger/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: none environment: - sdk: ^3.0.3 + sdk: ^3.1.0 dependencies: authenticator: diff --git a/packages/authenticator/pubspec.yaml b/packages/authenticator/pubspec.yaml index 8818c82d..d6e5ab90 100644 --- a/packages/authenticator/pubspec.yaml +++ b/packages/authenticator/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: "none" version: 1.0.0 environment: - sdk: ^3.0.3 + sdk: ^3.1.0 dependencies: collection: ^1.16.0 diff --git a/packages/convenient_widgets/pubspec.yaml b/packages/convenient_widgets/pubspec.yaml index 058a113c..b5ec8217 100644 --- a/packages/convenient_widgets/pubspec.yaml +++ b/packages/convenient_widgets/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: "none" version: 1.0.0 environment: - sdk: ^3.0.3 + sdk: ^3.1.0 dependencies: flutter: diff --git a/packages/flutter_app/ios/Runner.xcodeproj/project.pbxproj b/packages/flutter_app/ios/Runner.xcodeproj/project.pbxproj index e76e3bec..4ecd5348 100644 --- a/packages/flutter_app/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/flutter_app/ios/Runner.xcodeproj/project.pbxproj @@ -176,7 +176,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1250; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/packages/flutter_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/flutter_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c87d15a3..a6b826db 100644 --- a/packages/flutter_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/flutter_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ Navigator.pop(context, true), child: Text(l10n.buttonSignOut), - ) + ), ], ); }, @@ -37,7 +37,6 @@ class AccountPageBody extends HookConsumerWidget { return; } final signedOut = await authenticator.signOut(); - // ignore: use_build_context_synchronously if (!context.mounted) { return; } diff --git a/packages/flutter_app/lib/pages/riverpod_example_page/async_notifier_provider_page/async_notifier_provider_page.dart b/packages/flutter_app/lib/pages/riverpod_example_page/async_notifier_provider_page/async_notifier_provider_page.dart index f61fae68..c643dbea 100644 --- a/packages/flutter_app/lib/pages/riverpod_example_page/async_notifier_provider_page/async_notifier_provider_page.dart +++ b/packages/flutter_app/lib/pages/riverpod_example_page/async_notifier_provider_page/async_notifier_provider_page.dart @@ -101,7 +101,7 @@ class AsyncNotifierProviderPage extends ConsumerWidget { title: const Text(title), actions: [ // ボタンを押して新しいTodoを追加できる（実際のアプリではTodoのタイトル等を入力できるようにする） - IconButton(onPressed: addTodo, icon: const Icon(Icons.add)) + IconButton(onPressed: addTodo, icon: const Icon(Icons.add)), ], ), body: SafeArea( diff --git a/packages/flutter_app/lib/pages/riverpod_example_page/notifier_provider_page/notifier_provider_page.dart b/packages/flutter_app/lib/pages/riverpod_example_page/notifier_provider_page/notifier_provider_page.dart index 29143792..6ba6870a 100644 --- a/packages/flutter_app/lib/pages/riverpod_example_page/notifier_provider_page/notifier_provider_page.dart +++ b/packages/flutter_app/lib/pages/riverpod_example_page/notifier_provider_page/notifier_provider_page.dart @@ -82,7 +82,7 @@ class NotifierProviderPage extends ConsumerWidget { title: const Text(title), actions: [ // ボタンを押して新しいTodoを追加できる（実際のアプリではTodoのタイトル等を入力できるようにする） - IconButton(onPressed: addTodo, icon: const Icon(Icons.add)) + IconButton(onPressed: addTodo, icon: const Icon(Icons.add)), ], ), body: SafeArea( diff --git a/packages/flutter_app/lib/pages/riverpod_example_page/state_notifier_provider_page/state_notifier_provider_page.dart b/packages/flutter_app/lib/pages/riverpod_example_page/state_notifier_provider_page/state_notifier_provider_page.dart index 197ade15..1bb0781e 100644 --- a/packages/flutter_app/lib/pages/riverpod_example_page/state_notifier_provider_page/state_notifier_provider_page.dart +++ b/packages/flutter_app/lib/pages/riverpod_example_page/state_notifier_provider_page/state_notifier_provider_page.dart @@ -77,7 +77,7 @@ class StateNotifierProviderPage extends ConsumerWidget { title: const Text(title), actions: [ // ボタンを押して新しいTodoを追加できる（実際はTodoのタイトル等を入力できるようにすると良い） - IconButton(onPressed: addTodo, icon: const Icon(Icons.add)) + IconButton(onPressed: addTodo, icon: const Icon(Icons.add)), ], ), body: SafeArea( diff --git a/packages/flutter_app/lib/pages/settings_page/components/settings_page_body.dart b/packages/flutter_app/lib/pages/settings_page/components/settings_page_body.dart index e766c28a..259becce 100644 --- a/packages/flutter_app/lib/pages/settings_page/components/settings_page_body.dart +++ b/packages/flutter_app/lib/pages/settings_page/components/settings_page_body.dart @@ -33,7 +33,7 @@ class SettingsPageBody extends HookConsumerWidget { ListTile( title: Text(userDevice.name), subtitle: Text('${userDevice.osName} ${userDevice.osVersion}'), - ) + ), ], ); } diff --git a/packages/flutter_app/lib/pages/splash/splash_page.dart b/packages/flutter_app/lib/pages/splash/splash_page.dart index aac90b89..8131c31c 100644 --- a/packages/flutter_app/lib/pages/splash/splash_page.dart +++ b/packages/flutter_app/lib/pages/splash/splash_page.dart @@ -23,7 +23,6 @@ class SplashPage extends HookConsumerWidget { counter.update((state) => state - 1); } final signedIn = await ref.read(isSignedInProvider.future); - // ignore: use_build_context_synchronously if (!context.mounted) { return; } diff --git a/packages/flutter_app/pubspec.lock b/packages/flutter_app/pubspec.lock index 0a770cac..ac66e0f8 100644 --- a/packages/flutter_app/pubspec.lock +++ b/packages/flutter_app/pubspec.lock @@ -259,10 +259,10 @@ packages: dependency: "direct main" description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.2" color: dependency: transitive description: @@ -678,10 +678,10 @@ packages: dependency: "direct main" description: name: gap - sha256: db02ec4ac4511ea8d324d7f671d526959a8e7857468b4ea64113fe8a82f16a2c + sha256: f19387d4e32f849394758b91377f9153a1b41d79513ef7668c088c77dbc6955d url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "3.0.1" glob: dependency: transitive description: @@ -910,18 +910,18 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: @@ -942,10 +942,10 @@ packages: dependency: "direct dev" description: name: mockito - sha256: dd61809f04da1838a680926de50a9e87385c1de91c6579629c3d1723946e8059 + sha256: "8b46d7eb40abdda92d62edd01546051f0c27365e65608c284de336dccfef88cc" url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "5.4.1" modal_bottom_sheet: dependency: "direct main" description: @@ -1314,10 +1314,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" sqflite: dependency: transitive description: @@ -1394,10 +1394,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.0" themes: dependency: "direct main" description: @@ -1565,6 +1565,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.2" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" web_socket_channel: dependency: transitive description: @@ -1614,5 +1622,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=3.0.3 <4.0.0" - flutter: ">=3.7.0-0" + dart: ">=3.1.0 <4.0.0" + flutter: ">=3.7.0" diff --git a/packages/flutter_app/pubspec.yaml b/packages/flutter_app/pubspec.yaml index a61159cf..379a1af8 100644 --- a/packages/flutter_app/pubspec.yaml +++ b/packages/flutter_app/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: "none" version: 1.0.0+1 environment: - sdk: ^3.0.3 + sdk: ^3.1.0 dependencies: analysis_logger: @@ -32,7 +32,7 @@ dependencies: sdk: flutter flutter_svg: ^2.0.5 freezed_annotation: ^2.2.0 - gap: ^2.0.0 + gap: ^3.0.1 go_router: ^7.0.0 google_sign_in: ^6.1.0 hooks_riverpod: ^2.3.6 diff --git a/packages/notification_receiver/pubspec.yaml b/packages/notification_receiver/pubspec.yaml index ed78487b..495e609a 100644 --- a/packages/notification_receiver/pubspec.yaml +++ b/packages/notification_receiver/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: "none" environment: - sdk: ^3.0.3 + sdk: ^3.1.0 dependencies: firebase_messaging: ^14.6.6 diff --git a/packages/notification_sender/pubspec.yaml b/packages/notification_sender/pubspec.yaml index 68dec3f7..b3adc453 100644 --- a/packages/notification_sender/pubspec.yaml +++ b/packages/notification_sender/pubspec.yaml @@ -5,7 +5,7 @@ version: 1.0.0 homepage: https://github.com/altive/flutter_app_template/tree/main/packages/notification_sender environment: - sdk: ^3.0.3 + sdk: ^3.1.0 dependencies: flutter: diff --git a/packages/remote_parameter_fetcher/pubspec.yaml b/packages/remote_parameter_fetcher/pubspec.yaml index 7ce9a51c..f2f7c65e 100644 --- a/packages/remote_parameter_fetcher/pubspec.yaml +++ b/packages/remote_parameter_fetcher/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: none environment: - sdk: ^3.0.3 + sdk: ^3.1.0 dependencies: firebase_remote_config: ^4.2.5 diff --git a/packages/rest_api_client/lib/src/dio_client.dart b/packages/rest_api_client/lib/src/dio_client.dart index 5b259d18..4ea86dfc 100644 --- a/packages/rest_api_client/lib/src/dio_client.dart +++ b/packages/rest_api_client/lib/src/dio_client.dart @@ -20,7 +20,7 @@ Dio dioClient({ if (cookie != null) HttpHeaders.cookieHeader: cookie, if (authorization != null) HttpHeaders.authorizationHeader: authorization, - if (customHeaders != null) ...customHeaders + if (customHeaders != null) ...customHeaders, }, ), )..interceptors.addAll(interceptors); diff --git a/packages/rest_api_client/pubspec.yaml b/packages/rest_api_client/pubspec.yaml index 46067563..133f4bc6 100644 --- a/packages/rest_api_client/pubspec.yaml +++ b/packages/rest_api_client/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: "none" version: 1.0.0 environment: - sdk: ^3.0.3 + sdk: ^3.1.0 dependencies: dio: ^5.1.1 diff --git a/packages/themes/pubspec.yaml b/packages/themes/pubspec.yaml index 67ffb40e..02ee207e 100644 --- a/packages/themes/pubspec.yaml +++ b/packages/themes/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: "none" environment: - sdk: ^3.0.3 + sdk: ^3.1.0 dependencies: flutter: diff --git a/packages/util/pubspec.yaml b/packages/util/pubspec.yaml index 4944a185..05dd9699 100644 --- a/packages/util/pubspec.yaml +++ b/packages/util/pubspec.yaml @@ -6,7 +6,7 @@ version: 1.0.0 homepage: https://github.com/altive/flutter_app_template/tree/main/packages/util environment: - sdk: ^3.0.3 + sdk: ^3.1.0 dependencies: flutter: diff --git a/pubspec.lock b/pubspec.lock index e8ab82b6..6ad02a2a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -290,4 +290,4 @@ packages: source: hosted version: "2.1.0" sdks: - dart: ">=3.0.3 <4.0.0" + dart: ">=3.1.0 <4.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index b461dc1e..cf3ef77a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: flutter_app_template_workspace environment: - sdk: ^3.0.3 + sdk: ^3.1.0 dev_dependencies: melos: ^3.1.0