Merge branch 'develop' into 530-refactory-storage-tab

.github/workflows/CI.yml

@@ -10,7 +10,8 @@ on:
       - "*"
 
 env:
-  CACHED_DEPENDENCY_PATHS: ${{ github.workspace }}/Tuist/Dependencies
+  CACHED_PACKAGE_DEPENDENCY_PATHS: ${{ github.workspace }}/Tuist/Dependencies
+  CACHED_CARTHAGE_DEPENDENCY_PATHS: ${{ github.workspace }}/Carthage
   MASTER_KEY_PATH: Tuist/master.key
   GOOGLE_SERVICE_INFO_PLIST_PATH: Projects/App/Resources/GoogleService-Info.plist
   SECRET_XCCONFIG_PATH: Projects/App/XCConfig/Secrets.xcconfig
@@ -23,34 +24,46 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Select Xcode 15.0
-        run: sudo xcode-select -s /Applications/Xcode_15.0.app/Contents/Developer
+      - name: Select Xcode 15.3
+        run: sudo xcode-select -s /Applications/Xcode_15.3.app/Contents/Developer
 
-      - name: Compute dependency cache key
-        id: compute_hash
-        run: echo "hash=${{ hashFiles('Tuist/Package.swift') }}" >> $GITHUB_OUTPUT
+      - name: Compute package dependency cache key
+        id: compute_package_hash
+        run: echo "package_hash=${{ hashFiles('Package.swift') }}" >> $GITHUB_OUTPUT
 
-      - name: Check dependency cache
+      - name: Check package dependency cache
         uses: actions/cache@v3
-        id: cache_dependencies
+        id: cache_package_dependencies
         with:
-          path: ${{ env.CACHED_DEPENDENCY_PATHS }}
-          key: ${{ steps.compute_hash.outputs.hash }}
+          path: ${{ env.CACHED_PACKAGE_DEPENDENCY_PATHS }}
+          key: ${{ steps.compute_package_hash.outputs.package_hash }}
+
+      - name: Compute carthage dependency cache key
+        id: compute_carthage_hash
+        run: echo "carthage_hash=${{ hashFiles('Cartfile') }}" >> $GITHUB_OUTPUT
+
+      - name: Check carthage dependency cache
+        uses: actions/cache@v3
+        id: cache_carthage_dependencies
+        with:
+          path: ${{ env.CACHED_CARTHAGE_DEPENDENCY_PATHS }}
+          key: ${{ steps.compute_carthage_hash.outputs.carthage_hash }}
 
       - uses: jdx/mise-action@v2
-        if: steps.cache_dependencies.outputs.cache-hit == ''
+        if: steps.cache_package_dependencies.outputs.cache-hit == '' || steps.cache_carthage_dependencies.outputs.cache-hit == ''
 
       - name: Install tuist
-        if: steps.cache_dependencies.outputs.cache-hit == ''
+        if: steps.cache_package_dependencies.outputs.cache-hit == '' || steps.cache_carthage_dependencies.outputs.cache-hit == ''
         run: |
-          tuist_version=`cat .tuist-version`
-          mise install tuist@$tuist_version
+          brew install carthage
+          mise install tuist
 
       - name: Install dependencies needs
-        if: steps.cache_dependencies.outputs.cache-hit == ''
-        run: tuist fetch
+        if: steps.cache_package_dependencies.outputs.cache-hit == '' || steps.cache_carthage_dependencies.outputs.cache-hit == ''
+        run: make install
     outputs:
-      dependency_cache_key: ${{ steps.compute_hash.outputs.hash }}
+      package_dependency_cache_key: ${{ steps.compute_package_hash.outputs.package_hash }}
+      carthage_dependency_cache_key: ${{ steps.compute_carthage_hash.outputs.carthage_hash }}
 
   test:
     name: 🧪 Test
@@ -63,8 +76,8 @@ jobs:
       - name: List Xcode installations
         run: sudo ls -1 /Applications | grep "Xcode"
 
-      - name: Select Xcode 15.0
-        run: sudo xcode-select -s /Applications/Xcode_15.0.app/Contents/Developer
+      - name: Select Xcode 15.3
+        run: sudo xcode-select -s /Applications/Xcode_15.3.app/Contents/Developer
 
       - name: Show swift version
         run: swift --version
@@ -73,22 +86,26 @@ jobs:
 
       - name: Install tuist
         run: |
-          tuist_version=`cat .tuist-version`
-          mise install tuist@$tuist_version
+          brew install carthage
+          mise install tuist
 
-      - name: Check dependency cache
+      - name: Check package dependency cache
         uses: actions/cache@v3
-        id: cache_dependencies
+        id: cache_package_dependencies
         with:
-          path: ${{ env.CACHED_DEPENDENCY_PATHS }}
-          key: ${{ needs.prepare-ci.outputs.dependency_cache_key }}
+          path: ${{ env.CACHED_PACKAGE_DEPENDENCY_PATHS }}
+          key: ${{ needs.prepare-ci.outputs.package_dependency_cache_key }}
 
-      - name: Install dependencies needs
-        if: steps.cache_dependencies.outputs.cache-hit != 'true'
-        run: tuist fetch
+      - name: Check carthage dependency cache
+        uses: actions/cache@v3
+        id: cache_carthage_dependencies
+        with:
+          path: ${{ env.CACHED_CARTHAGE_DEPENDENCY_PATHS }}
+          key: ${{ needs.prepare-ci.outputs.carthage_dependency_cache_key }}
 
-      - name: Remove Signing
-        run: rm -rf Tuist/Signing
+      - name: Install dependencies needs
+        if: steps.cache_package_dependencies.outputs.cache-hit != 'true' || steps.cache_carthage_dependencies.outputs.cache-hit != 'true'
+        run: make install
 
       - name: Make `Secrets.xcconfig`
         run: |

.gitignore

@@ -66,6 +66,7 @@ DerivedData/
 *.perspectivev3
 !default.perspectivev3
 .build/
+Carthage/
 
 ### Xcode Patch ###
 *.xcodeproj/*

.mise.toml

@@ -0,0 +1,2 @@
+[tools]
+tuist = "4.12.1"

.package.resolved

@@ -11,5 +11,5 @@
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }

Cartfile

@@ -0,0 +1 @@
+github "realm/realm-swift" ~> 10.50.0

Cartfile.resolved

@@ -0,0 +1 @@
+github "realm/realm-swift" "v10.50.0"

Makefile

@@ -1,7 +1,11 @@
 generate:
-	tuist fetch
+	make install
 	TUIST_ENV=DEV TUIST_ROOT_DIR=${PWD} tuist generate
 
+install:
+	carthage update --use-xcframeworks 
+	tuist install
+
 test:
 	TUIST_ENV=DEV TUIST_ROOT_DIR=${PWD} tuist test
 
@@ -28,4 +32,4 @@ setup:
 	sh Scripts/Setup.sh
 
 format:
-	swiftformat ./Projects --config .swiftformat
+	swiftformat ./Projects --config .swiftformat