Merge branch 'develop' into release

.github/workflows/swift.yml

@@ -3,95 +3,106 @@ name: Bibbi
 on:
   push:
     branches:
-      - develop
-      - feature/*
+      - feat/*
       - fix/*
-    tags:
-      - "v*"
+  pull_request:
+    branches:
+      - release/**
+      - develop
 
 jobs:  
   build:
-    runs-on: macos-latest
+    runs-on: macos-13
     strategy:
       matrix:
         xcodebuild-scheme: ['App']
 
     steps:
-
+      - uses: actions/checkout@v3
+      - uses: jdx/mise-action@v2
+      - uses: ruby/setup-ruby@v1
+        with: 
+          ruby-version: '3.2.0'
+
+
       - name: Setup Xcode version
         uses: maxim-lobanov/setup-xcode@v1
         with:
-            xcode-version: latest
+            xcode-version: '15.0'
 
       - name: Checkout branch
         uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Bring Bibbi ignored file with Config
         uses: actions/checkout@v3
         with: 
           repository: depromeet/14th-team5-iOS-ignored
           path: depromeet/14th-team5-iOS/14th-team5-iOS/XCConfig
           token: ${{secrets.ACTION_TOKEN}}
-
-      - name: Setting Tuist Master Key
-        run: | 
-          printf "%s" "${{ secrets.MASTER_KEY }}" > Tuist/master.key
-        env:
-          MASTER_KEY: ${{secrets.MASTER_KEY}}
 
       - name: Install Tuist CLI
-        run: curl -Ls https://install.tuist.io| bash
+        run: bash <(curl -Ls https://install.tuist.io)
 
       - name: Install FastLane 
-        run: brew install fastlane
-
-      - uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
-
+          ruby-version: '3.2.0'
+      - run: brew install fastlane
+
       - name: Tuist Clean Command
         run: tuist clean
 
       - name: Tuist Fetch Command
         run: tuist fetch
-
-      - name: Tuist Siging Decrept
-        run: tuist signing decrypt
 
-      - name: Fastalne setup Keychain
-        run: fastlane setup_keychain
-        env:
-            APP_NAME: ${{secrets.APP_NAME}}
-            WIDGET_NAME: ${{secrets.WIDGET_NAME}}
-            KEYCHAIN_NAME: ${{ secrets.KEYCHAIN_NAME }}
-            KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+      - name: Tuist Generate Commnad
+        run: tuist generate
 
-      - name: Tuist generate Command      
-        run: tuist generate  
-
+      - name: fastlane upload_stg_testflight
+        if: github.event.pull_request.base.ref == '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}}
+          BUNDLE_ID: ${{secrets.BUNDLE_ID}}
+          SLACK_HOOK_URL: ${{secrets.SLACK_HOOK_URL}}
+          WIDGET_BUNDLE_ID: ${{secrets.WIDGET_BUNDLE_ID}}
+          PROFILE_PATH: ${{secrets.PROFILE_PATH}}
+          APP_NAME: ${{secrets.APP_NAME}}
+          APPLE_ID: ${{secrets.APPLE_ID}}
+          TEAM_ID: ${{secrets.TEAM_ID}}
+          WIDGET_NAME: ${{secrets.WIDGET_NAME}}
+        run: fastlane github_action_stg_upload_testflight
 
-      # - name: Tuist Build Command
-      #   run: tuist build
-
-      # - run: fastlane upload_dev_to_testflight
-      #   env:
-      #     KEYCHAIN_NAME: ${{ secrets.KEYCHAIN_NAME }}
-      #     KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
-      #     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 }}
 
 
-
-
-      # - name: bibbi app scheme output # Bibbi App Scheme Output Code
-      #   run: xcodebuild -list -workspace "Bibbi.xcworkspace"
-
-      # - name: xcode build App 🛠️ # Bibbi App Build
-      #   run: xcodebuild clean build -workspace "./Bibbi.xcworkspace" -scheme "${{ matrix.xcodebuild-scheme }}" -destination "platform=iOS Simulator,name=iPhone 13 mini,OS=latest"
-
-      # - name: Upload coverage to Codecov
-      #   uses: codecov/codecov-action@v1.2.1
-      #   env:
-      #     CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      - name: fastlane upload_prd_testflight
+        if: 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 }}
+          APP_STORE_CONNECT_API_KEY_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY }}
+          PROJECT_PATH: ${{ secrets.PROJECT_PATH }}
+          MATCH_PASSWORD: ${{secrets.MATCH_PASSWORD}}
+          SLACK_HOOK_URL: ${{secrets.SLACK_HOOK_URL}}
+          MATCH_PERSONAL_TOKEN: ${{ secrets.MATCH_PERSONAL_TOKEN}}
+          PRD_SCHEME: ${{secrets.PRD_SCHEME}}
+          BUNDLE_ID: ${{secrets.BUNDLE_ID}}
+          WIDGET_BUNDLE_ID: ${{secrets.WIDGET_BUNDLE_ID}}
+          PROFILE_PATH: ${{secrets.PROFILE_PATH}}
+          APP_NAME: ${{secrets.APP_NAME}}
+          APPLE_ID: ${{secrets.APPLE_ID}}
+          TEAM_ID: ${{secrets.TEAM_ID}}
+          WIDGET_NAME: ${{secrets.WIDGET_NAME}}
+        run: fastlane github_action_prd_upload_testflight
 
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v1.2.1
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.gitignore

@@ -4,7 +4,7 @@
 
 ## User settings
 xcuserdata/
-
+master.key
 .env
 
 ## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)

.tuist-version

@@ -1 +1 @@
-3.38.0
+3.20.0

14th-team5-iOS/App/Project (김건우의 충돌된 사본 2024-03-01).swift

@@ -0,0 +1,68 @@
+//
+//  Project.swift
+//  ProjectDescriptionHelpers
+//
+//  Created by Kim dohyun on 2023/11/14.
+//
+
+import ProjectDescription
+import ProjectDescriptionHelpers
+
+private let targets: [Target] = [
+    .makeModular(
+        layer: .App,
+        factory: .init(
+            products: .app,
+            dependencies: ModuleLayer.App.dependencies,
+            bundleId: "com.5ing.bibbi",
+            infoPlist: .extendingDefault(with: [                
+                "CFBundleDisplayName": .string("Bibbi"),
+                "CFBundleVersion": .string("1"),
+                "CFBuildVersion": .string("0"),
+                "CFBundleShortVersionString": .string("1.1.7"),
+                "UILaunchStoryboardName": .string("LaunchScreen.storyboard"),
+                "UISupportedInterfaceOrientations": .array([.string("UIInterfaceOrientationPortrait")]),
+                "UIUserInterfaceStyle": .string("Light"),
+                "NSPhotoLibraryAddUsageDescription" : .string("프로필 사진, 피드 업로드를 위한 사진 촬영을 위해 Bibbi가 앨범에 접근할 수 있도록 허용해 주세요"),
+                "NSCameraUsageDescription": .string("프로필 사진, 피드 업로드를 위한 사진 촬영을 위해 Bibbi가 카메라에 접근할 수 있도록 허용해 주세요"),
+                "UIApplicationSceneManifest" : .dictionary([
+                    "UIApplicationSupportsMultipleScenes" : .boolean(false),
+                    "UISceneConfigurations" : .dictionary([
+                        "UIWindowSceneSessionRoleApplication" : .array([
+                            .dictionary([
+                                "UISceneConfigurationName" : .string("Default Configuration"),
+                                "UISceneDelegateClassName" : .string("$(PRODUCT_MODULE_NAME).SceneDelegate")
+                            ])
+                        ])
+                    ])
+                ]),
+                "LSApplicationQueriesSchemes": .array([.string("kakaokompassauth"), .string("kakaolink")]),
+                "CFBundleURLTypes": .array([
+                    .dictionary([
+                        "CFBundleURLSchemes": .array([.string("$(KAKAO_API_KEY)")]),
+                    ]),
+                ]),
+                "KAKAO_LOGIN_API_KEY": .string("$(KAKAO_LOGIN_API_KEY)"),
+                "MIXPANEL_API_KEY": .string("$(MIXPANEL_API_KEY)"),
+                "TEAM_ID": .string("$(TEAM_ID)"),
+            ]),
+            entitlements: .relativeToRoot("App.entitlements")
+        )
+    ),
+    .makeModular(extenions: .Widget, factory: .init(
+        products: .appExtension,
+        dependencies: ExtensionsLayer.Widget.dependencies,
+        bundleId: "com.5ing.bibbi.widget",
+        infoPlist: .extendingDefault(with: [
+            "CFBundleDisplayName": .string("Bibbi"),
+            "NSExtension" : .dictionary([
+                "NSExtensionPointIdentifier": .string("com.apple.widgetkit-extension")
+            ])
+        ]),
+        entitlements: .relativeToRoot("WidgetExtension.entitlements")
+    )
+)
+]
+
+
+private let app = Project.makeApp(name: ModuleLayer.App.rawValue, target: targets)

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

@@ -19,8 +19,8 @@ private let targets: [Target] = [
                 "CFBundleDisplayName": .string("Bibbi"),
                 "CFBundleVersion": .string("1"),
                 "CFBuildVersion": .string("0"),
-                "CFBundleShortVersionString": .string("1.0.1"),
-                "UILaunchStoryboardName": .string("Launch Screen"),
+                "CFBundleShortVersionString": .string("1.1.8"),
+                "UILaunchStoryboardName": .string("LaunchScreen.storyboard"),
                 "UISupportedInterfaceOrientations": .array([.string("UIInterfaceOrientationPortrait")]),
                 "UIUserInterfaceStyle": .string("Light"),
                 "NSPhotoLibraryAddUsageDescription" : .string("프로필 사진, 피드 업로드를 위한 사진 촬영을 위해 Bibbi가 앨범에 접근할 수 있도록 허용해 주세요"),
@@ -43,9 +43,22 @@ private let targets: [Target] = [
                     ]),
                 ]),
                 "KAKAO_LOGIN_API_KEY": .string("$(KAKAO_LOGIN_API_KEY)"),
+                "MIXPANEL_API_KEY": .string("$(MIXPANEL_API_KEY)"),
                 "TEAM_ID": .string("$(TEAM_ID)"),
             ]),
-            entitlements: .file(path: .relativeToRoot("App.entitlements"))
+            settings: .settings(
+                base: [
+                    "CODE_SIGN_STYLE": "Manual",
+                    "DEVELOPMENT_TEAM": "P9P4WJ623F",
+                    "PROVISIONING_PROFILE_SPECIFIER": "match AppStore com.5ing.bibbi",
+                    "CODE_SIGN_IDENTITY": "Apple Distribution"
+                ],
+                configurations: [
+                    .build(.dev, name: "DEV"),
+                    .build(.prd, name: "PRD"),
+                    .build(.stg, name: "STG")
+                ]),
+            entitlements: .relativeToRoot("App.entitlements")
         )
     ),
     .makeModular(extenions: .Widget, factory: .init(
@@ -58,7 +71,19 @@ private let targets: [Target] = [
                 "NSExtensionPointIdentifier": .string("com.apple.widgetkit-extension")
             ])
         ]),
-        entitlements: .file(path: .relativeToRoot("WidgetExtension.entitlements"))
+        settings: .settings(
+            base: [
+                "CODE_SIGN_STYLE": "Manual",
+                "DEVELOPMENT_TEAM": "P9P4WJ623F",
+                "PROVISIONING_PROFILE_SPECIFIER": "match AppStore com.5ing.bibbi.widget",
+                "CODE_SIGN_IDENTITY": "Apple Distribution"
+            ],
+            configurations: [
+                .build(.dev, name: "DEV"),
+                .build(.prd, name: "PRD"),
+                .build(.stg, name: "STG")
+            ]),
+        entitlements: .relativeToRoot("WidgetExtension.entitlements")
     )
 )
 ]