[fix] #135 코드 사이닝 오류 수정

YAPP-Github · Oct 2, 2024 · 74f8efb · 74f8efb
1 parent e5f10de
commit 74f8efb
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 30 deletions.
diff --git a/Makefile b/Makefile
@@ -52,13 +52,14 @@ download-privates:
 	@if [ ! -d "Pokit_iOS_Private" ]; then \
 		git clone git@github.com:stealmh/Pokit_iOS_Private.git; \
 	fi
-	@if [ -f "Pokit_iOS_Private/xcconfig/Secret.xcconfig" ]; then \
+	@if [ -f "Pokit_iOS_Private/xcconfig/Debug.xcconfig" ] && [ -f "Pokit_iOS_Private/xcconfig/Release.xcconfig" ]; then \
 		mkdir -p xcconfig; \
-		cp Pokit_iOS_Private/xcconfig/Secret.xcconfig xcconfig/Secret.xcconfig; \
+		cp Pokit_iOS_Private/xcconfig/Debug.xcconfig xcconfig/Debug.xcconfig; \
+		cp Pokit_iOS_Private/xcconfig/Release.xcconfig xcconfig/Release.xcconfig; \
 		cp Pokit_iOS_Private/auth/AuthKey.p8 Projects/CoreKit/Resources/AuthKey.p8; \
 		cp Pokit_iOS_Private/GoogleService-Info.plist Projects/App/Resources/GoogleService-Info.plist; \
 		rm -rf Pokit_iOS_Private; \
-		echo "✅ Secret 파일을 성공적으로 다운로드하고 Pokit_iOS_Private 폴더를 삭제했습니다."; \
+		echo "✅ Debug.xcconfig와 Release.xcconfig 파일을 성공적으로 다운로드하고 Pokit_iOS_Private 폴더를 삭제했습니다."; \
 	else \
-		echo "❌ Secret.xcconfig 파일을 찾을 수 없습니다."; \
+		echo "❌ Debug.xcconfig 또는 Release.xcconfig 파일을 찾을 수 없습니다." && exit 1; \
 	fi
diff --git a/Projects/App/Project.swift b/Projects/App/Project.swift
@@ -36,19 +36,7 @@ let project = Project(
                 // TODO: 의존성 추가
                 .external(name: "FirebaseMessaging")
             ],
-            settings: .settings(
-                base: [
-                    "OTHER_LDFLAGS": "$(inherited) -ObjC",
-                    "CODE_SIGN_IDENTITY": "Apple Distribution",
-                    "PROVISIONING_PROFILE_SPECIFIER": "match AppStore com.pokitmons.pokit 1721720816",
-                    "PROVISIONING_PROFILE": "match AppStore com.pokitmons.pokit 1721720816",
-                    "DEVELOPMENT_TEAM": "\(developmentTeam ?? "")"
-                ],
-                configurations: [
-                    .debug(name: "Debug", xcconfig: .relativeToRoot("xcconfig/Secret.xcconfig")),
-                    .release(name: "Release", xcconfig: .relativeToRoot("xcconfig/Secret.xcconfig"))
-                ]
-            )
+            settings: .settings
         )
     ]
 )
diff --git a/Projects/CoreKit/Project.swift b/Projects/CoreKit/Project.swift
@@ -37,15 +37,7 @@ let coreKit: Target = .target(
         .external(name: "KakaoSDKShare"),
         .external(name: "KakaoSDKTemplate"),
     ],
-    settings: .settings(
-        base: [
-            "OTHER_LDFLAGS": "$(inherited) -ObjC",
-        ],
-        configurations: [
-            .debug(name: "Debug", xcconfig: .relativeToRoot("xcconfig/Secret.xcconfig")),
-            .release(name: "Release", xcconfig: .relativeToRoot("xcconfig/Secret.xcconfig"))
-        ]
-    )
+    settings: .settings
 )
 
 let project = Project(

diff --git a/Projects/DSKit/Project.swift b/Projects/DSKit/Project.swift
@@ -26,7 +26,8 @@ let project = Project(
                 // TODO: 의존성 추가
                 .project(target: "Util", path: .relativeToRoot("Projects/Util")),
                 .external(name: "NukeUI")
-            ]
+            ],
+            settings: .settings
         )
     ]
 )
diff --git a/Projects/Util/Project.swift b/Projects/Util/Project.swift
@@ -22,7 +22,8 @@ let project = Project(
             sources: ["Sources/**"],
             dependencies: [
                 // TODO: 의존성 추가
-            ]
+            ],
+            settings: .settings
         )
     ]
 )
diff --git a/Tuist/ProjectDescriptionHelpers/Settings+Extension.swift b/Tuist/ProjectDescriptionHelpers/Settings+Extension.swift
@@ -12,6 +12,17 @@ public extension Settings {
         return .settings(
             base: [
                 "OTHER_LDFLAGS": "$(inherited) -ObjC",
+                "CODE_SIGN_STYLE": "Manual"
+            ],
+            configurations: [
+                .debug(name: "Debug", xcconfig: .relativeToRoot("xcconfig/Debug.xcconfig")),
+                .release(
+                    name: "Release",
+                    settings: [
+                        "CODE_SIGN_IDENTITY": "Apple Distribution"
+                    ],
+                    xcconfig: .relativeToRoot("xcconfig/Release.xcconfig")
+                )
             ]
         )
     }

diff --git a/fastlane/Matchfile b/fastlane/Matchfile
@@ -1,8 +1,8 @@
-git_url(ENV['MATCH_URL'])
+git_url('https://github.com/stealmh/Pokit_iOS_Private')
 
 storage_mode("git")
 
-type("appstore") # The default type, can be: appstore, adhoc, enterprise or development
+type("development") # The default type, can be: appstore, adhoc, enterprise or development
 
 app_identifier(["com.pokitmons.pokit"])
 username("shapekim98@gmail.com") # Your Apple Developer Portal username