Merge pull request #345 from icapps/feature/344-fix-fvm

FT-344: Updated gitignore, removed fvm_config, added .fvmrc
icapps · Jun 3, 2024 · 2908fe8 · 2908fe8
2 parents d3a85bb + 567c385
commit 2908fe8
Show file tree

Hide file tree

Showing 20 changed files with 9 additions and 9 deletions.
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
diff --git a/.fvmrc b/.fvmrc
@@ -0,0 +1,3 @@
+{
+    "flutter": "3.10.6"
+}
diff --git 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
@@ -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
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
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
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
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
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
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
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
diff --git a/...permission/img/analytics_permission_screen_initial_state_dark_mode_ipad_pro.png b/...permission/img/analytics_permission_screen_initial_state_dark_mode_ipad_pro.png
diff --git a/...ermission/img/analytics_permission_screen_initial_state_dark_mode_iphone_11.png b/...ermission/img/analytics_permission_screen_initial_state_dark_mode_iphone_11.png
diff --git a/...ermission/img/analytics_permission_screen_initial_state_light_mode_ipad_pro.png b/...ermission/img/analytics_permission_screen_initial_state_light_mode_ipad_pro.png
diff --git a/...rmission/img/analytics_permission_screen_initial_state_light_mode_iphone_11.png b/...rmission/img/analytics_permission_screen_initial_state_light_mode_iphone_11.png
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
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
diff --git 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
@@ -55,6 +55,7 @@ void main(List<String> 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']);