Fork Sync: Update from parent repository

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,29 +1,58 @@
-## 작업 내용 🧑‍💻
 
-- TODO
+## 🔵PR을 올리기 전 아래 사항을 확인해주세요.
+- 구현한 로직과 기능이 올바르게 작동되는지 충분히 테스트해주세요.
+- 코드의 성능이나 메모리 효율성이 적절하게 고려되었는지, 불필요한 코드가 없는지 검토해주세요.
+- 이번 PR에서 구현된 주요 기능이나 해결된 문제에 대해 자세히 서술해주세요.
+(위 내용은 지워주세요)
 
-- TODO
 
-- TODO
 
-## 변경 로직 ⚒️
+## 😽개요
 
-- TODO
+* (작업한 코드에 대한 간략한 설명해주세요)
 
-- TODO
+## 🛠️작업 내용
 
-- TODO
+### (소제목)
 
-## 스크린샷 📷
+* (작업한 코드에 대한 자세한 설명해주세요. 필요하다면 이미지나 표를 첨부해주세요)
 
-| 기능 | 스크린 샷 |
-| :--: | :-------: |
-| GIF  |           |
+| 이미지① |
+| :----: |
+| |
 
-## 테스트 케이스 ✅
 
-- [ ] todo
-- [ ] todo
-- [ ] todo
+### (소제목)
 
+* (작업한 코드에 대한 자세한 설명해주세요. 필요하다면 이미지나 표를 첨부해주세요)
+
+| 이미지① |
+| :----: |
+| |
+
+
+## 🟡차후 계획 (Optional)
+
+* (작업한 코드가 추후 우리 프로젝트에 어떤 영향을 끼칠지, 앞으로 PR계획을 설명해주세요)
+
+
+## 🗾이미지 (Optional)
+
+| 이미지① |
+| :----: |
+| |
+
+
+## ✅테스트 케이스
+
+* (구현한 로직 검증을 위해 테스트한 내용을 설명해주세요)
+
+---
+
+#### 🙏🏻아래와 같이 PR을 리뷰해주세요.
+- PR 내용이 부족하다면 보충 요청해주세요.
+- 코드 스타일이 팀의 규칙에 맞게 작성되었는지, 일관성을 유지하고 있는지 확인해주세요.
+- 코드에 대한 문서화나 주석이 필요한 부분에 적절하게 작성되어 있는지 확인해주세요.
+- 구현된 로직이 효율적이고 올바르게 작성되었는지, 아키텍처를 잘 준수하고 있는지 검토해주세요.
+- 네이밍, 포매팅, 주석 등 코드의 일관성이 유지되고 있는지 확인해주세요.
 

.github/workflows/swift.yml

@@ -3,16 +3,17 @@ name: Bibbi
 on:
   push:
     branches:
-      - feat/*
-      - fix/*
+      - release
   pull_request:
     branches:
-      - release/**
+      - release
       - develop
+    types:
+      - closed
 
 jobs:  
   build:
-    runs-on: macos-13
+    runs-on: macos-latest
     strategy:
       matrix:
         xcodebuild-scheme: ['App']
@@ -24,11 +25,10 @@ jobs:
         with: 
           ruby-version: '3.2.0'
 
-
       - name: Setup Xcode version
         uses: maxim-lobanov/setup-xcode@v1
         with:
-            xcode-version: '15.0'
+            xcode-version: latest-stable
 
       - name: Checkout branch
         uses: actions/checkout@v3
@@ -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,21 +55,30 @@ 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
-        if: github.event.pull_request.base.ref == 'release' && github.head_ref == 'develop'
+
+      - name: make Google Service Info
+        run: |
+          echo "${{ secrets.GOOGLE_INFO_PLIST }}" | base64 --decode > ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_PATH }}
+
+      - name: Verify GoogleService-Info.plist creation
+        run: |
+          ls -l ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_PATH }}
+          echo "GOOGLE_SERVICE_INFO_PLIST_PATH: ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_PATH }}"
+
+      - name: fastlane upload_prd_testflight
+        if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release') }}
         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 }}
           APP_STORE_CONNECT_API_KEY_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY }}
           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}}
@@ -80,9 +89,8 @@ jobs:
           WIDGET_NAME: ${{secrets.WIDGET_NAME}}
         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.merged == true && github.event.pull_request.base.ref == 'develop' }}
         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 +99,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.8.1"

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

@@ -19,10 +19,10 @@ private let targets: [Target] = [
                 "CFBundleDisplayName": .string("Bibbi"),
                 "CFBundleVersion": .string("1"),
                 "CFBuildVersion": .string("0"),
-                "CFBundleShortVersionString": .string("1.2"),
-                "UILaunchStoryboardName": .string("LaunchScreen.storyboard"),
+                "CFBundleShortVersionString": .string("1.2.5"),
+                "UILaunchStoryboardName": .string("LaunchScreen"),
                 "UISupportedInterfaceOrientations": .array([.string("UIInterfaceOrientationPortrait")]),
-                "UIUserInterfaceStyle": .string("Light"),
+                "UIUserInterfaceStyle": .string("Dark"),
                 "NSPhotoLibraryAddUsageDescription" : .string("프로필 사진, 피드 업로드를 위한 사진 촬영을 위해 Bibbi가 앨범에 접근할 수 있도록 허용해 주세요"),
                 "NSCameraUsageDescription": .string("프로필 사진, 피드 업로드를 위한 사진 촬영을 위해 Bibbi가 카메라에 접근할 수 있도록 허용해 주세요"),
                 "UIApplicationSceneManifest" : .dictionary([
@@ -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>