diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json deleted file mode 100644 index 2f49d155..00000000 --- a/.fvm/fvm_config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "flutterSdkVersion": "3.10.6", - "flavors": {} -} \ No newline at end of file diff --git a/.fvmrc b/.fvmrc new file mode 100644 index 00000000..6a780216 --- /dev/null +++ b/.fvmrc @@ -0,0 +1,3 @@ +{ + "flutter": "3.10.6" +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index e1813388..9f599ca6 100644 --- a/.gitignore +++ b/.gitignore @@ -92,6 +92,6 @@ Gemfile.lock # Fvm -.fvm/flutter_sdk +.fvm/ /lib/generated_plugin_registrant.dart /test/coverage_helper_test.dart diff --git a/pubspec.lock b/pubspec.lock index 15613057..845fa280 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -761,10 +761,10 @@ packages: dependency: "direct dev" description: name: mockito - sha256: dd61809f04da1838a680926de50a9e87385c1de91c6579629c3d1723946e8059 + sha256: "7d5b53bcd556c1bc7ffbe4e4d5a19c3e112b7e925e9e172dd7c6ad0630812616" url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "5.4.2" model_generator: dependency: "direct dev" description: diff --git a/test/screen/license/img/license_screen_inital_state_ipad_pro.png b/test/screen/license/img/license_screen_inital_state_ipad_pro.png index b60ca4a3..2d55895c 100644 Binary files a/test/screen/license/img/license_screen_inital_state_ipad_pro.png and b/test/screen/license/img/license_screen_inital_state_ipad_pro.png differ diff --git a/test/screen/license/img/license_screen_inital_state_iphone_11.png b/test/screen/license/img/license_screen_inital_state_iphone_11.png index e4739d93..46219b75 100644 Binary files a/test/screen/license/img/license_screen_inital_state_iphone_11.png and b/test/screen/license/img/license_screen_inital_state_iphone_11.png differ diff --git a/test/screen/login/img/login_screen_initial_state_dark_mode_ipad_pro.png b/test/screen/login/img/login_screen_initial_state_dark_mode_ipad_pro.png index b0b53d82..3116d44b 100644 Binary files a/test/screen/login/img/login_screen_initial_state_dark_mode_ipad_pro.png and b/test/screen/login/img/login_screen_initial_state_dark_mode_ipad_pro.png differ diff --git a/test/screen/login/img/login_screen_initial_state_dark_mode_iphone_11.png b/test/screen/login/img/login_screen_initial_state_dark_mode_iphone_11.png index cac5b000..ee68b31e 100644 Binary files a/test/screen/login/img/login_screen_initial_state_dark_mode_iphone_11.png and b/test/screen/login/img/login_screen_initial_state_dark_mode_iphone_11.png differ diff --git a/test/screen/login/img/login_screen_initial_state_ipad_pro.png b/test/screen/login/img/login_screen_initial_state_ipad_pro.png index afb9dd80..68f054af 100644 Binary files a/test/screen/login/img/login_screen_initial_state_ipad_pro.png and b/test/screen/login/img/login_screen_initial_state_ipad_pro.png differ diff --git a/test/screen/login/img/login_screen_initial_state_iphone_11.png b/test/screen/login/img/login_screen_initial_state_iphone_11.png index bc6dc078..a0143bae 100644 Binary files a/test/screen/login/img/login_screen_initial_state_iphone_11.png and b/test/screen/login/img/login_screen_initial_state_iphone_11.png differ diff --git a/test/screen/login/img/login_screen_login_button_disabled_ipad_pro.png b/test/screen/login/img/login_screen_login_button_disabled_ipad_pro.png index 44d39353..65646f92 100644 Binary files a/test/screen/login/img/login_screen_login_button_disabled_ipad_pro.png and b/test/screen/login/img/login_screen_login_button_disabled_ipad_pro.png differ diff --git a/test/screen/login/img/login_screen_login_button_disabled_iphone_11.png b/test/screen/login/img/login_screen_login_button_disabled_iphone_11.png index c57e3db7..57d70e39 100644 Binary files a/test/screen/login/img/login_screen_login_button_disabled_iphone_11.png and b/test/screen/login/img/login_screen_login_button_disabled_iphone_11.png differ diff --git a/test/screen/permission/img/analytics_permission_screen_initial_state_dark_mode_ipad_pro.png b/test/screen/permission/img/analytics_permission_screen_initial_state_dark_mode_ipad_pro.png index af749047..8b3f48cc 100644 Binary files a/test/screen/permission/img/analytics_permission_screen_initial_state_dark_mode_ipad_pro.png and b/test/screen/permission/img/analytics_permission_screen_initial_state_dark_mode_ipad_pro.png differ diff --git a/test/screen/permission/img/analytics_permission_screen_initial_state_dark_mode_iphone_11.png b/test/screen/permission/img/analytics_permission_screen_initial_state_dark_mode_iphone_11.png index 511ece68..14c7ecc2 100644 Binary files a/test/screen/permission/img/analytics_permission_screen_initial_state_dark_mode_iphone_11.png and b/test/screen/permission/img/analytics_permission_screen_initial_state_dark_mode_iphone_11.png differ diff --git a/test/screen/permission/img/analytics_permission_screen_initial_state_light_mode_ipad_pro.png b/test/screen/permission/img/analytics_permission_screen_initial_state_light_mode_ipad_pro.png index af749047..8b3f48cc 100644 Binary files a/test/screen/permission/img/analytics_permission_screen_initial_state_light_mode_ipad_pro.png and b/test/screen/permission/img/analytics_permission_screen_initial_state_light_mode_ipad_pro.png differ diff --git a/test/screen/permission/img/analytics_permission_screen_initial_state_light_mode_iphone_11.png b/test/screen/permission/img/analytics_permission_screen_initial_state_light_mode_iphone_11.png index 511ece68..14c7ecc2 100644 Binary files a/test/screen/permission/img/analytics_permission_screen_initial_state_light_mode_iphone_11.png and b/test/screen/permission/img/analytics_permission_screen_initial_state_light_mode_iphone_11.png differ diff --git a/test/widget/general/action/img/text_action_item_default_state.png b/test/widget/general/action/img/text_action_item_default_state.png index 19c94e5b..2fad8145 100644 Binary files a/test/widget/general/action/img/text_action_item_default_state.png and b/test/widget/general/action/img/text_action_item_default_state.png differ diff --git a/test/widget/general/action/img/text_action_item_disabled_state.png b/test/widget/general/action/img/text_action_item_disabled_state.png index 19c94e5b..2fad8145 100644 Binary files a/test/widget/general/action/img/text_action_item_disabled_state.png and b/test/widget/general/action/img/text_action_item_disabled_state.png differ diff --git a/tool/install_fvm.sh b/tool/install_fvm.sh index 886f221c..58b115a1 100755 --- a/tool/install_fvm.sh +++ b/tool/install_fvm.sh @@ -1,10 +1,10 @@ #!/bin/bash -regex='"flutterSdkVersion": "(.*)",' +regex='"flutter": "(.*)"' version="" flutter pub global activate fvm -fvmFlutterConfig=`cat .fvm/fvm_config.json` +fvmFlutterConfig=`cat .fvmrc` if [[ $fvmFlutterConfig =~ $regex ]]; then version="${BASH_REMATCH[1]}" diff --git a/tool/setup/dart/strip_boilerplate_project.dart b/tool/setup/dart/strip_boilerplate_project.dart index da8cd2a6..2632e366 100644 --- a/tool/setup/dart/strip_boilerplate_project.dart +++ b/tool/setup/dart/strip_boilerplate_project.dart @@ -55,6 +55,7 @@ void main(List args) { _replaceHomeScreenLine(); _replaceDatabaseTests(); Logger.debug('Removed import references'); + executeCommand('flutter', ['pub', 'global', 'activate', 'fvm']); executeCommand('fvm', ['flutter', 'clean']); executeCommand('fvm', ['flutter', 'packages', 'get']); executeCommand('fvm', ['flutter', 'packages', 'pub', 'run', 'build_runner', 'build', '--delete-conflicting-outputs']);