Merge pull request #105 from sports-club-hanzan/enhancement/upgrade-f…

…lutter-version flutter バージョンの更新：3.3.7 -> 3.7.7
sports-club-hanzan · Mar 11, 2023 · 6a0fced · 6a0fced
2 parents aa95824 + 2f7b43e
commit 6a0fced
Show file tree

Hide file tree

Showing 58 changed files with 487 additions and 318 deletions.
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.3.7",
+  "flutterSdkVersion": "3.7.7",
   "flavors": {}
-}
+}
diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml
@@ -14,7 +14,7 @@ runs:
     - name: Setup Flutter
       uses: subosito/flutter-action@v2
       with:
-        flutter-version: '3.3.7'
+        flutter-version: '3.7.7'
         channel: 'stable'
         cache: true
 

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -35,7 +35,6 @@ linter:
     - directives_ordering
     - eol_at_end_of_file
     - flutter_style_todos
-    - invariant_booleans
     - join_return_with_assignment
     # - lines_longer_than_80_chars
     - literal_only_boolean_expressions

diff --git a/firebase/README.md b/firebase/README.md
@@ -15,8 +15,8 @@ $ brew install node
 $ npm install -g firebase-tools  # https://formulae.brew.sh/formula/firebase-cli
 # 以下は flutterfire を利用する場合のみ導入
 $ brew install fvm
-$ fvm install 3.3.7
-$ fvm use 3.3.7
+$ fvm install 3.7.7
+$ fvm use 3.7.7
 $ dart pub global activate flutterfire_cli
 # .zshrc など利用しているシェルの設定に以下を追加
 # export PATH="$PATH":"$HOME/.pub-cache/bin"

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -268,6 +268,7 @@
 		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -341,6 +342,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -70,5 +70,13 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string>Access to take a photo by camera</string>
+	<key>NSAppleMusicUsageDescription</key>
+	<string>Access to pick a photo</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Access to pick a photo</string>
 </dict>
 </plist>
diff --git a/lib/application/auth/reset_password_interactor.dart b/lib/application/auth/reset_password_interactor.dart
@@ -27,7 +27,7 @@ class ResetUserPasswordInteractor extends ResetUserPasswordUsecase {
       _logger.e('$errorMsg [email][$email][code][${e.code}][message][${e.message}]');
       unawaited(_crashlytics.recordError(e, e.stackTrace));
     } on Exception catch (e) {
-      _logger.e('$errorMsg [email][$email][error][${e.toString()}]');
+      _logger.e('$errorMsg [email][$email][error][$e]');
       unawaited(_crashlytics.recordError(e, null));
     }
     return status;

diff --git a/lib/application/pilgrimage/update_pilgrimage_progress_result.codegen.freezed.dart b/lib/application/pilgrimage/update_pilgrimage_progress_result.codegen.freezed.dart
@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'update_pilgrimage_progress_result.codegen.dart';
 
@@ -208,6 +208,8 @@ class _$_UpdatePilgrimageProgressResult
 // 新たに到達した札所の番号一覧
   @override
   List<int> get reachedPilgrimageIdList {
+    if (_reachedPilgrimageIdList is EqualUnmodifiableListView)
+      return _reachedPilgrimageIdList;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(_reachedPilgrimageIdList);
   }
@@ -218,6 +220,8 @@ class _$_UpdatePilgrimageProgressResult
   @override
   @JsonKey()
   List<LatLng> get virtualPolylineLatLngs {
+    if (_virtualPolylineLatLngs is EqualUnmodifiableListView)
+      return _virtualPolylineLatLngs;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(_virtualPolylineLatLngs);
   }

diff --git a/lib/application/user/delete/delete_user_result.codegen.freezed.dart b/lib/application/user/delete/delete_user_result.codegen.freezed.dart
@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'delete_user_result.codegen.dart';
 

diff --git a/lib/application/user/health/update_health_interactor.dart b/lib/application/user/health/update_health_interactor.dart
@@ -61,8 +61,7 @@ class UpdateHealthInteractor implements UpdateHealthUsecase {
       error = e;
     } on Exception catch (e) {
       final message = 'unexpected error when update user health information'
-          '[user][$user]'
-          '[error][${e.toString()}]';
+          ' [user][$user][error][$e]';
       _logger.e(message, e);
       unawaited(_crashlytics.log(message));
       unawaited(_crashlytics.recordError(e, null));

diff --git a/lib/application/user/health/update_health_result.codegen.freezed.dart b/lib/application/user/health/update_health_result.codegen.freezed.dart
@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'update_health_result.codegen.dart';
 

diff --git a/lib/application/user/registration/user_registration_interactor.dart b/lib/application/user/registration/user_registration_interactor.dart
@@ -43,9 +43,7 @@ class UserRegistrationInteractor extends UserRegistrationUsecase {
       await _crashlytics.recordError(e, null);
       error = e;
     } on Exception catch (e) {
-      final message = 'unexpected error when registration user'
-          '[user][$user]'
-          '[error][${e.toString()}]';
+      final message = 'unexpected error when registration user [user][$user][error][$e]';
       _logger.e(message, e);
       await _crashlytics.log(message);
       await _crashlytics.recordError(e, null);

diff --git a/lib/domain/exception/database_exception.dart b/lib/domain/exception/database_exception.dart
@@ -11,5 +11,5 @@ class DatabaseException implements Exception {
   final Exception? cause;
 
   @override
-  String toString() => 'DatabaseException: [message][$message][cause][${cause?.toString()}]';
+  String toString() => 'DatabaseException: [message][$message][cause][$cause]';
 }
diff --git a/lib/domain/exception/get_health_exception.dart b/lib/domain/exception/get_health_exception.dart
@@ -13,5 +13,5 @@ class GetHealthException implements Exception {
 
   @override
   String toString() =>
-      'GetHealthException: [message][$message][status][$status][cause][${cause.toString()}]';
+      'GetHealthException: [message][$message][status][$status][cause][$cause]';
 }
diff --git a/lib/domain/exception/sign_in_exception.dart b/lib/domain/exception/sign_in_exception.dart
@@ -24,5 +24,5 @@ class SignInException implements Exception {
 
   @override
   String toString() =>
-      'SignInException: [message][$message][status][$status][cause][${cause?.toString()}]';
+      'SignInException: [message][$message][status][$status][cause][$cause]';
 }
diff --git a/lib/domain/pilgrimage/pilgrimage_info.codegen.freezed.dart b/lib/domain/pilgrimage/pilgrimage_info.codegen.freezed.dart
@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'pilgrimage_info.codegen.dart';
 

diff --git a/lib/domain/pilgrimage/temple_image.codegen.freezed.dart b/lib/domain/pilgrimage/temple_image.codegen.freezed.dart
@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'temple_image.codegen.dart';
 

diff --git a/lib/domain/pilgrimage/temple_info.codegen.freezed.dart b/lib/domain/pilgrimage/temple_info.codegen.freezed.dart
@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'temple_info.codegen.dart';
 
@@ -275,6 +275,7 @@ class _$_TempleInfo extends _TempleInfo {
   @override
   @JsonKey()
   List<String> get images {
+    if (_images is EqualUnmodifiableListView) return _images;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(_images);
   }

diff --git a/lib/domain/ranking/ranking.codegen.dart b/lib/domain/ranking/ranking.codegen.dart
@@ -1,4 +1,3 @@
-
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:virtualpilgrimage/domain/ranking/ranking_by_period.codegen.dart';
 
@@ -34,9 +33,9 @@ class Ranking with _$Ranking {
   ///
   // ignore: prefer_constructors_over_static_methods
   static Ranking fromRankingByPeriodMap(Map<String, RankingByPeriod> map) {
-    if(map.containsKey('daily') && map.containsKey('weekly') && map.containsKey('monthly')) {
+    if (map.containsKey('daily') && map.containsKey('weekly') && map.containsKey('monthly')) {
       return Ranking(daily: map['daily']!, weekly: map['weekly']!, monthly: map['monthly']!);
     }
-    throw NullThrownError();
+    throw TypeError();
   }
 }
diff --git a/lib/domain/ranking/ranking.codegen.freezed.dart b/lib/domain/ranking/ranking.codegen.freezed.dart
@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'ranking.codegen.dart';
 

diff --git a/lib/domain/ranking/ranking_by_period.codegen.freezed.dart b/lib/domain/ranking/ranking_by_period.codegen.freezed.dart
@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'ranking_by_period.codegen.dart';
 

diff --git a/lib/domain/ranking/ranking_user.codegen.freezed.dart b/lib/domain/ranking/ranking_user.codegen.freezed.dart
@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'ranking_user.codegen.dart';
 
@@ -117,6 +117,7 @@ class _$_RankingUsers extends _RankingUsers {
      */
   @override
   List<RankingUser> get users {
+    if (_users is EqualUnmodifiableListView) return _users;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(_users);
   }

diff --git a/lib/domain/user/deleted_user.codegen.freezed.dart b/lib/domain/user/deleted_user.codegen.freezed.dart
@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'deleted_user.codegen.dart';
 

diff --git a/lib/domain/user/health/health_by_period.codegen.freezed.dart b/lib/domain/user/health/health_by_period.codegen.freezed.dart
@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'health_by_period.codegen.dart';
 

diff --git a/lib/domain/user/health/health_info.codegen.freezed.dart b/lib/domain/user/health/health_info.codegen.freezed.dart
@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'health_info.codegen.dart';
 

diff --git a/lib/domain/user/virtual_pilgrimage_user.codegen.freezed.dart b/lib/domain/user/virtual_pilgrimage_user.codegen.freezed.dart
@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'virtual_pilgrimage_user.codegen.dart';
 

diff --git a/lib/infrastructure/pilgrimage/temple_repository_impl.dart b/lib/infrastructure/pilgrimage/temple_repository_impl.dart
@@ -37,7 +37,7 @@ class TempleRepositoryImpl extends TempleRepository {
       );
     } on Exception catch (e) {
       throw DatabaseException(
-        message: 'unexpected Firestore error ${e.toString()}',
+        message: 'unexpected Firestore error $e',
         cause: e,
       );
     }
@@ -96,7 +96,7 @@ class TempleRepositoryImpl extends TempleRepository {
       );
     } on Exception catch (e) {
       throw DatabaseException(
-        message: 'unexpected Firestore error ${e.toString()}',
+        message: 'unexpected Firestore error $e',
         cause: e,
       );
     }

diff --git a/lib/infrastructure/ranking/ranking_repository_impl.dart b/lib/infrastructure/ranking/ranking_repository_impl.dart
@@ -36,10 +36,7 @@ class RankingRepositoryImpl extends RankingRepository {
         cause: e,
       );
     } on Exception catch (e) {
-      throw DatabaseException(
-        message: 'unexpected Firestore error ${e.toString()}',
-        cause: e,
-      );
+      throw DatabaseException(message: 'unexpected Firestore error [error][$e]', cause: e);
     }
   }
 }
diff --git a/lib/infrastructure/user/health_repository_impl.dart b/lib/infrastructure/user/health_repository_impl.dart
@@ -200,7 +200,7 @@ class HealthRepositoryImpl implements HealthRepository {
         // ignore: no_default_cases
         default:
           // 想定していない値が入ってきたときは開発中に気づけるようにログに出力する
-          _logger.w('got unexpected Health Data Type [type][${p.type.toString()}]');
+          _logger.w('got unexpected Health Data Type [type][$p.type]');
           break;
       }
     }