Fork Sync: Update from parent repository

.github/workflows/swift.yml

@@ -43,7 +43,7 @@ jobs:
           token: ${{secrets.ACTION_TOKEN}}
 
       - name: Install Tuist CLI
-        run: bash <(curl -Ls https://install.tuist.io)
+        run: brew install tuist
 
       - name: Install FastLane 
         uses: ruby/setup-ruby@v1
@@ -55,12 +55,12 @@ jobs:
         run: tuist clean
 
       - name: Tuist Fetch Command
-        run: tuist fetch
+        run: tuist install
 
       - name: Tuist Generate Commnad
         run: tuist generate
-
-      - name: fastlane upload_stg_testflight
+        
+      - name: fastlane upload_prd_testflight
         if: github.event.pull_request.base.ref == 'release' && github.head_ref == 'develop'
         env:
           APP_STORE_CONNECT_API_KEY_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_ID }}
@@ -69,7 +69,7 @@ jobs:
           PROJECT_PATH: ${{ secrets.PROJECT_PATH }}
           MATCH_PASSWORD: ${{secrets.MATCH_PASSWORD}}
           MATCH_PERSONAL_TOKEN: ${{ secrets.MATCH_PERSONAL_TOKEN}}
-          DEV_SCHEME: ${{secrets.DEV_SCHEME}}
+          PRD_SCHEME: ${{secrets.PRD_SCHEME}}
           BUNDLE_ID: ${{secrets.BUNDLE_ID}}
           SLACK_HOOK_URL: ${{secrets.SLACK_HOOK_URL}}
           WIDGET_BUNDLE_ID: ${{secrets.WIDGET_BUNDLE_ID}}
@@ -81,8 +81,8 @@ jobs:
         run: fastlane github_action_prd_upload_testflight
 
 
-      - name: fastlane upload_prd_testflight
-        if: github.event.pull_request.base.ref == 'develop' && github.head_ref == 'feature'
+      - name: fastlane upload_stg_testflight
+        if: github.event.pull_request.base.ref == 'develop' && startsWith(github.head_ref, 'feat/')
         env:
           APP_STORE_CONNECT_API_KEY_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_ID }}
           APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
@@ -91,7 +91,7 @@ jobs:
           MATCH_PASSWORD: ${{secrets.MATCH_PASSWORD}}
           SLACK_HOOK_URL: ${{secrets.SLACK_HOOK_URL}}
           MATCH_PERSONAL_TOKEN: ${{ secrets.MATCH_PERSONAL_TOKEN}}
-          PRD_SCHEME: ${{secrets.PRD_SCHEME}}
+          DEV_SCHEME: ${{secrets.DEV_SCHEME}}
           BUNDLE_ID: ${{secrets.BUNDLE_ID}}
           WIDGET_BUNDLE_ID: ${{secrets.WIDGET_BUNDLE_ID}}
           PROFILE_PATH: ${{secrets.PROFILE_PATH}}

.mise.toml

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

14th-team5-iOS/App/Project.swift

@@ -58,7 +58,7 @@ private let targets: [Target] = [
                     .build(.prd, name: "PRD"),
                     .build(.stg, name: "STG")
                 ]),
-            entitlements: .relativeToRoot("App.entitlements")
+            entitlements: .file(path: .relativeToRoot("App.entitlements"))
         )
     ),
     .makeModular(extenions: .Widget, factory: .init(
@@ -83,7 +83,7 @@ private let targets: [Target] = [
                 .build(.prd, name: "PRD"),
                 .build(.stg, name: "STG")
             ]),
-        entitlements: .relativeToRoot("WidgetExtension.entitlements")
+        entitlements: .file(path: .relativeToRoot("App.entitlements"))
     )
 )
 ]

14th-team5-iOS/App/Resources/PrivacyInfo.xcprivacy

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>NSPrivacyTracking</key>
+    <false />
+    <key>NSPrivacyTrackingDomains</key>
+    <array />
+    <key>NSPrivacyCollectedDataTypes</key>
+    <array>
+      <dict>
+        <key>NSPrivacyCollectedDataType</key>
+        <string>NSPrivacyCollectedDataTypePhotosorVideos</string>
+        <key>NSPrivacyCollectedDataTypeLinked</key>
+        <false />
+        <key>NSPrivacyCollectedDataTypeTracking</key>
+        <false />
+        <key>NSPrivacyCollectedDataTypePurposes</key>
+        <array>
+          <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+        </array>
+      </dict>
+      <dict>
+        <key>NSPrivacyCollectedDataType</key>
+        <string>NSPrivacyCollectedDataTypeOtherUserContactInfo</string>
+        <key>NSPrivacyCollectedDataTypeLinked</key>
+        <false />
+        <key>NSPrivacyCollectedDataTypeTracking</key>
+        <false />
+        <key>NSPrivacyCollectedDataTypePurposes</key>
+        <array>
+          <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+        </array>
+      </dict>
+      <dict>
+        <key>NSPrivacyCollectedDataType</key>
+        <string>NSPrivacyCollectedDataTypeProductInteraction</string>
+        <key>NSPrivacyCollectedDataTypeLinked</key>
+        <false />
+        <key>NSPrivacyCollectedDataTypeTracking</key>
+        <false />
+        <key>NSPrivacyCollectedDataTypePurposes</key>
+        <array>
+          <string>NSPrivacyCollectedDataTypePurposeAnalytics</string>
+        </array>
+      </dict>
+      <dict>
+        <key>NSPrivacyCollectedDataType</key>
+        <string>NSPrivacyCollectedDataTypeUserID</string>
+        <key>NSPrivacyCollectedDataTypeLinked</key>
+        <true />
+        <key>NSPrivacyCollectedDataTypeTracking</key>
+        <false />
+        <key>NSPrivacyCollectedDataTypePurposes</key>
+        <array>
+          <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+        </array>
+      </dict>
+    </array>
+    <key>NSPrivacyAccessedAPITypes</key>
+    <array>
+      <dict>
+        <key>NSPrivacyAccessedAPIType</key>
+        <string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+        <key>NSPrivacyAccessedAPITypeReasons</key>
+        <array>
+          <string>1C8F.1</string>
+        </array>
+      </dict>
+    </array>
+  </dict>
+</plist>