Merge pull request #4 from Pavel-Sulimau/feature/use-fvm-and-update-f…

…lutter-version Use fvm and update flutter version to 3.22.2
Pavel-Sulimau · Jun 15, 2024 · 3da47e9 · 3da47e9
2 parents a65af8b + 99f9abc
commit 3da47e9
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 32 deletions.
diff --git a/.fvmrc b/.fvmrc
@@ -0,0 +1,4 @@
+{
+  "flutter": "3.22.2",
+  "flavors": {}
+}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -7,9 +7,6 @@ on:
   pull_request:
     types: [opened, reopened, synchronize]
 
-env:
-  FLUTTER_VERSION: "3.19.5"
-
 jobs:
   full_CI:
     timeout-minutes: 10
@@ -18,12 +15,19 @@ jobs:
       - name: Git Checkout
         uses: actions/checkout@v4
 
+      - name: Read FVM config
+        uses: kuhnroyal/flutter-fvm-config-action@v2
+        id: fvm-config-action
+
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: ${{env.FLUTTER_MIN_VERSION}}
+          flutter-version: ${{ steps.fvm-config-action.outputs.FLUTTER_VERSION }}
           cache: true
 
+      - name: Override Fluter SDK Path for Melos
+        run: echo "MELOS_SDK_PATH=${{ env.FLUTTER_ROOT }}" >> $GITHUB_ENV
+
       - name: Set up Melos
         uses: bluefireteam/melos-action@v3
 
@@ -48,12 +52,19 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Read FVM config
+        uses: kuhnroyal/flutter-fvm-config-action@v2
+        id: fvm-config-action
+
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: ${{env.FLUTTER_MIN_VERSION}}
+          flutter-version: ${{ steps.fvm-config-action.outputs.FLUTTER_VERSION }}
           cache: true
 
+      - name: Override Fluter SDK Path for Melos
+        run: echo "MELOS_SDK_PATH=${{ env.FLUTTER_ROOT }}" >> $GITHUB_ENV
+
       - name: Set up Melos
         uses: bluefireteam/melos-action@v3
 
@@ -95,12 +106,19 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Read FVM config
+        uses: kuhnroyal/flutter-fvm-config-action@v2
+        id: fvm-config-action
+
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: ${{env.FLUTTER_MIN_VERSION}}
+          flutter-version: ${{ steps.fvm-config-action.outputs.FLUTTER_VERSION }}
           cache: true
 
+      - name: Override Fluter SDK Path for Melos
+        run: echo "MELOS_SDK_PATH=${{ env.FLUTTER_ROOT }}" >> $GITHUB_ENV
+
       - name: Set up Melos
         uses: bluefireteam/melos-action@v3
 

diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,6 @@ pubspec_overrides.yaml
 **/test/**/goldens/**/*.*
 **/test/**/failures/**/*.*
 !**/test/**/goldens/ci/*.*
+
+# FVM Version Cache
+.fvm/
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-    "dart.lineLength": 80,
+  "dart.lineLength": 80,
+  "dart.flutterSdkPath": ".fvm/versions/3.22.2"
 }
diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock
@@ -20,4 +20,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
 
-COCOAPODS: 1.15.0
+COCOAPODS: 1.15.2
diff --git a/app/pubspec.lock b/app/pubspec.lock
@@ -132,10 +132,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.12.0"
   nested:
     dependency: transitive
     description:

diff --git a/melos.yaml b/melos.yaml
@@ -1,5 +1,7 @@
 name: flutter_modularized_di
 
+sdkPath: .fvm/flutter_sdk
+
 packages:
   - app
   - packages/**

diff --git a/packages/data/pubspec.lock b/packages/data/pubspec.lock
@@ -77,10 +77,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.12.0"
   path:
     dependency: transitive
     description:

diff --git a/packages/presentation/pubspec.lock b/packages/presentation/pubspec.lock
@@ -237,26 +237,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.4"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.3"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -293,10 +293,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.12.0"
   mime:
     dependency: transitive
     description:
@@ -466,26 +466,26 @@ packages:
     dependency: transitive
     description:
       name: test
-      sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f
+      sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073"
       url: "https://pub.dev"
     source: hosted
-    version: "1.24.9"
+    version: "1.25.2"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a
+      sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.9"
+    version: "0.6.0"
   typed_data:
     dependency: transitive
     description:
@@ -506,10 +506,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.1"
   watcher:
     dependency: transitive
     description:
@@ -552,4 +552,4 @@ packages:
     version: "3.1.2"
 sdks:
   dart: ">=3.3.0 <4.0.0"
-  flutter: ">=3.16.0"
+  flutter: ">=3.18.0-18.0.pre.54"
diff --git a/packages/presentation/test/counter/goldens/ci/counter_page.png b/packages/presentation/test/counter/goldens/ci/counter_page.png
diff --git a/pubspec.lock b/pubspec.lock
@@ -141,10 +141,10 @@ packages:
     dependency: "direct dev"
     description:
       name: melos
-      sha256: a0cb264096a315e4acdb66ae75ee594a76c97fe15ce9ae469f6c58c6c4b2be87
+      sha256: f9a6fc4f4842b7edfca2e00ab3b5b06928584f24bdc3d776ab0b30be7d599450
       url: "https://pub.dev"
     source: hosted
-    version: "5.3.0"
+    version: "6.0.0"
   meta:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -4,4 +4,4 @@ environment:
   sdk: ">=3.0.0 <4.0.0"
 
 dev_dependencies:
-  melos: ^5.3.0
+  melos: ^6.0.0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,4 @@ SPEC CHECKSUMS:

		PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796

		COCOAPODS: 1.15.0
		COCOAPODS: 1.15.2