Fix/#319 Tuist 마이그레이션 및 사용 형태 수정

.github/workflows/pull_request_test.yml

@@ -30,18 +30,21 @@ jobs:
 
       - name: Get swift version
         run: swift --version
-
-      - name: Install Tuist
-        run: curl -Ls https://install.tuist.io|bash
+                    
+      - name: Mise
+        uses: jdx/mise-action@v2
 
+      - name: Install Tuist
+        run: mise install tuist@4.33.0
+
+      - name: Tuist version
+        run: mise use -g tuist@4.33.0
+
+      - name: Setup Project
+        run: make init
+
       - name: Install SwiftLint
         run: brew install swiftlint
 
-      - name: Tuist Clean
-        run: tuist clean
-
-      - name: Tuist Fetch
-        run: tuist fetch
-
       - name: Tuist Build Test
         run: tuist build App

.github/workflows/upload_testflight.yml

@@ -39,22 +39,22 @@ jobs:
         uses: swift-actions/setup-swift@v2
         with:
             swift-version: "5.10"
+
+      - name: Mise
+        uses: jdx/mise-action@v2
 
       - name: Install Tuist
-        run: curl -Ls https://install.tuist.io|bash
-
+        run: mise install tuist@4.33.0
+
+      - name: Tuist version
+        run: mise use -g tuist@4.33.0
+
+      - name: Setup Project
+        run: make init
+
       - name: Install Fastlane
         run: brew install fastlane
 
-      - name: Tuist clean
-        run: tuist clean
-
-      - name: Tuist fetch
-        run: tuist fetch
-
-      - name: Tuist generate
-        run: tuist generate
-
       - name: Fastlane Upload Testflight
         run: fastlane tf_remote
         env:

Makefile

@@ -1,12 +1,20 @@
-open_plist:
-	open -a Xcode Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/InfoPlist.swift
+init: fetch gen
+
+fetch:
+	tuist clean
+	tuist install
+gen:
+	tuist generate --no-open
 
-open_config:
-	open -a Xcode Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/XCConfig.swift
+sign:
+	@GIT_TOKEN=$$(git config user.password || git config --global user.password); \
+	if [ -z "$$GIT_TOKEN" ]; then \
+		echo "❌ Git token not found."; \
+		exit 1; \
+	fi; \
+	$(MAKE) download-privates token=$$GIT_TOKEN && \
+	fastlane sync
 
-clean_xcode:
-	rm -rf ~/Library/Developer/Xcode/DerivedData/*
-
 clean:
 	rm -rf **/**/**/*.xcodeproj
 	rm -rf **/**/*.xcodeproj
@@ -17,16 +25,24 @@ clean:
 	rm -rf **/Derived/
 	rm -rf Derived/
 
-clean_all:
-	make clean
-	make clean_xcode
+update_tuist:
+	sh ./Scripts/update_tuist.sh
 
+open_plist:
+	open -a Xcode Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/InfoPlist.swift
+
+open_config:
+	open -a Xcode Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/XCConfig.swift
+
+clean_xcode_cache:
+	rm -rf ~/Library/Developer/Xcode/DerivedData/*
+
 BASE_URL = https://raw.githubusercontent.com/Pepsi-Club/WhereMyBus-ignored/main
 
 define download_file
-	@echo "Downloading $(3) to $(1) using token: $(2)"
+	@echo "📥 Downloading $(3) to $(1)"
 	mkdir -p $(1)
-	curl -H "Authorization: token $(2)" -o $(1)/$(3) $(BASE_URL)/$(3)
+	curl -sS -H "Authorization: token $(2)" -o $(1)/$(3) $(BASE_URL)/$(3)
 endef
 
 .PHONY: download-privates
@@ -48,5 +64,3 @@ download-env:
 download-googleinfo:
 	$(call download_file, Projects/App/Resources, $(token),GoogleService-Info.plist)
 	$(call download_file, Projects/App/Resources, $(token),GoogleService-Info-debugging.plist)
-
-

Plugins/EnvironmentPlugin/Plugin.swift

@@ -6,6 +6,6 @@
 //  Copyright © 2023 https://github.com/gnksbm/Clone_AppStore. All rights reserved.
 //
 
-import ProjectDescription
+@preconcurrency import ProjectDescription
 
 let EnvironmentPlugin = Plugin(name: "EnvironmentPlugin")

Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/Buildable/InfoPlistBuildable/InfoPlist/UIKitInfoPlist.swift

@@ -0,0 +1,30 @@
+//
+//  UIKitInfoPlist.swift
+//  EnvironmentPlugin
+//
+//  Created by gnksbm on 4/11/25.
+//
+
+import Foundation
+
+public struct UIKitInfoPlist: InfoPlistBuildable {
+    public var dictionary: [String : ProjectDescription.Plist.Value] {
+        [
+            "UILaunchStoryboardName": "LaunchScreen.storyboard",
+            "UIApplicationSceneManifest": [
+                "UIApplicationSupportsMultipleScenes": false,
+                "UISceneConfigurations": [
+                    "UIWindowSceneSessionRoleApplication": [
+                        [
+                            "UISceneConfigurationName": "Default Configuration",
+                            "UISceneDelegateClassName": "$(PRODUCT_MODULE_NAME).SceneDelegate"
+                        ],
+                    ]
+                ]
+            ],
+            "UISupportedInterfaceOrientations": ["UIInterfaceOrientationPortrait"]
+        ]
+    }
+
+    public init() { }
+}

Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/Buildable/InfoPlistBuildable/InfoPlist/WhereMyBusInfoPlist.swift

@@ -0,0 +1,16 @@
+//
+//  WhereMyBusInfoPlist.swift
+//  EnvironmentPlugin
+//
+//  Created by gnksbm on 4/11/25.
+//
+
+import Foundation
+
+
+
+
+
+
+
+

Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/Buildable/InfoPlistBuildable/InfoPlistBuildable.swift

@@ -0,0 +1,26 @@
+//
+//  InfoPlistBuildable.swift
+//  EnvironmentPlugin
+//
+//  Created by gnksbm on 4/11/25.
+//
+
+import ProjectDescription
+
+public protocol InfoPlistBuildable {
+    var dictionary: [String: Plist.Value] { get }
+}
+
+public extension InfoPlistBuildable {
+    func buildInfoPlist() -> InfoPlist {
+        .dictionary(dictionary)
+    }
+}
+
+extension Array: InfoPlistBuildable where Element == any InfoPlistBuildable {
+    public var dictionary: [String : Plist.Value] {
+        reduce([String : Plist.Value]()) { partialResult, next in
+            partialResult.merging(next.dictionary) { _, new in new }
+        }
+    }
+}