From 74f8efbca35fd48b9313f8c1a3e3e6958e4c9d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=8F=84=ED=98=95?= <108233361+ShapeKim98@users.noreply.github.com> Date: Wed, 2 Oct 2024 17:14:31 +0900 Subject: [PATCH] =?UTF-8?q?[fix]=20#135=20=EC=BD=94=EB=93=9C=20=EC=82=AC?= =?UTF-8?q?=EC=9D=B4=EB=8B=9D=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 9 +++++---- Projects/App/Project.swift | 14 +------------- Projects/CoreKit/Project.swift | 10 +--------- Projects/DSKit/Project.swift | 3 ++- Projects/Util/Project.swift | 3 ++- .../Settings+Extension.swift | 11 +++++++++++ fastlane/Matchfile | 4 ++-- 7 files changed, 24 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index 8a090c56..5e4d72bd 100644 --- 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 index 7b965c96..17015873 100644 --- 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 index ea0dd934..d1b4ba3c 100644 --- 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 index 0c0dd71c..f8465a9f 100644 --- 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 index e5c44d37..3bf7431f 100644 --- 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 index d869536e..4c80b022 100644 --- 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 index 591d5fd3..ea2c5529 100644 --- 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