From e8404c88e4865b6e0e6cada267e116d52d24972c Mon Sep 17 00:00:00 2001 From: siwonLee <111dltldnjs@gmail.com> Date: Tue, 24 Sep 2024 09:22:43 +0900 Subject: [PATCH] =?UTF-8?q?faet:=20fastlane=20CI/CD=20=EC=9E=90=EB=8F=99?= =?UTF-8?q?=ED=99=94=20=EA=B5=AC=ED=98=84=20=EB=B0=8F=20swift=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=205.7=20=EA=B3=A0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/main.yml | 17 +- .package.resolved | 11 +- Projects/App/Project.swift | 10 +- Projects/App/Sources/AppDelegate.swift | 4 +- Projects/Core/Core/Project.swift | 3 +- Projects/Core/Utility/Project.swift | 5 +- Projects/Feature/Agency/Project.swift | 5 +- Projects/Feature/Base/Project.swift | 5 +- Projects/Feature/Ledger/Project.swift | 5 +- .../Cell/DefaultImageCell.swift | 3 +- Projects/Feature/Main/Project.swift | 5 +- Projects/Feature/MyPage/Project.swift | 5 +- .../Sources/Common/MyPageCoordinator.swift | 9 +- .../Scene/MyPage/Cell/UniversityHeader.swift | 2 +- .../MyPage/Sources/Scene/PulseView.swift | 14 +- Projects/Feature/Sign/Project.swift | 5 +- Projects/Shared/DesignSystem/Project.swift | 5 +- .../DesignSystem/Sources/Utils/Colors.swift | 50 +++--- .../DesignSystem/Sources/Utils/Images.swift | 148 +++++++++--------- Projects/Shared/ThirdPartyLips/Project.swift | 19 ++- .../Shared/ThirdPartyLips/Sources/Dummy.swift | 1 - Tuist/Dependencies.swift | 16 +- fastlane/Fastfile | 13 +- 23 files changed, 205 insertions(+), 155 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4f6656dd..67fa6f9a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,7 +6,7 @@ on: jobs: upload_testflight: - runs-on: macos_latest + runs-on: macos-latest steps: - uses: actions/checkout@v2 - name: Setup Xcode version @@ -21,14 +21,16 @@ jobs: MASTER_KEY: ${{secrets.MASTER_KEY}} - name: Install Tuist - run: curl -Ls https://install.tuist.io|bash + run: brew tap tuist/tuist + - run: brew install --formula tuist@3.42.1 + - run: tuist version - 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.0 - name: Tuist clean run: tuist clean @@ -45,10 +47,13 @@ jobs: KEYCHAIN_NAME: ${{ secrets.KEYCHAIN_NAME }} KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }} + - name: Tuist generate + run: tuist generate + - run: fastlane tf 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 }} + FASTLANE_API_KEY_ID: ${{ secrets.FASTLANE_API_KEY_ID }} + FASTLANE_API_KEY_ISSUER_ID: ${{ secrets.FASTLANE_API_KEY_ISSUER_ID }} SLACK_HOOK_URL: ${{ secrets.SLACK_HOOK_URL }} diff --git a/.package.resolved b/.package.resolved index 2ce7b7db..21638eee 100644 --- a/.package.resolved +++ b/.package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "39b4527b0aa15523ea06a34b7d9de6276b03ac8f0ddf2042b7da3a75163f3e20", + "originHash" : "be187523730f57e2e67f885adb181a4b39f93b08e0affc1b04773b10c3e1b62b", "pins" : [ { "identity" : "abseil-cpp-binary", @@ -91,6 +91,15 @@ "version" : "100.0.0" } }, + { + "identity" : "kingfisher", + "kind" : "remoteSourceControl", + "location" : "https://github.com/onevcat/Kingfisher", + "state" : { + "revision" : "4a2333d471e6aa671cbea6ed0c884eac4d90d6fb", + "version" : "8.0.1" + } + }, { "identity" : "leveldb", "kind" : "remoteSourceControl", diff --git a/Projects/App/Project.swift b/Projects/App/Project.swift index 89f8b6cd..63e24175 100644 --- a/Projects/App/Project.swift +++ b/Projects/App/Project.swift @@ -6,6 +6,13 @@ let project = Project( disableBundleAccessors: true, disableSynthesizedResourceAccessors: true ), + settings: .settings( + base: .init() + .marketingVersion("1.2.1") + .swiftVersion("5.7") + .currentProjectVersion("10") + .appleGenericVersioningSystem() + ), targets: [ Target( name: "Moneymong", @@ -55,9 +62,6 @@ let project = Project( ], settings: .settings( base: .init() - .appleGenericVersioningSystem() - .marketingVersion("1.2.1") - .currentProjectVersion("2") .cutomSetting() ), launchArguments: [ diff --git a/Projects/App/Sources/AppDelegate.swift b/Projects/App/Sources/AppDelegate.swift index 084e83ae..b7f683cd 100644 --- a/Projects/App/Sources/AppDelegate.swift +++ b/Projects/App/Sources/AppDelegate.swift @@ -2,7 +2,7 @@ import UIKit import Core -import Pulse +// import Pulse @main class AppDelegate: UIResponder, UIApplicationDelegate { @@ -11,7 +11,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - URLSessionProxyDelegate.enableAutomaticRegistration() + //URLSessionProxyDelegate.enableAutomaticRegistration() FirebaseManager.shared.initSDK() KakaoAuthManager.shared.initSDK() return true diff --git a/Projects/Core/Core/Project.swift b/Projects/Core/Core/Project.swift index 4001948a..00af81e6 100644 --- a/Projects/Core/Core/Project.swift +++ b/Projects/Core/Core/Project.swift @@ -30,7 +30,8 @@ let project = Project( ], settings: .settings(base: [ "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym", - "OTHER_LDFLAGS": "-ObjC" + "OTHER_LDFLAGS": "-ObjC", + "SWIFT_VERSION": "5.7" ]), launchArguments: [ LaunchArgument(name: "IDEPreferLogStreaming=YES", isEnabled: true), diff --git a/Projects/Core/Utility/Project.swift b/Projects/Core/Utility/Project.swift index 73ad6da1..5494ba32 100644 --- a/Projects/Core/Utility/Project.swift +++ b/Projects/Core/Utility/Project.swift @@ -15,7 +15,10 @@ let project = Project( deploymentTarget: .iOS(targetVersion: "15.0", devices: .iphone), sources: ["Sources/**"], dependencies: [ - ] + ], + settings: .settings(base: [ + "SWIFT_VERSION": "5.7" + ]) ) ] ) diff --git a/Projects/Feature/Agency/Project.swift b/Projects/Feature/Agency/Project.swift index 11465166..ded5787e 100644 --- a/Projects/Feature/Agency/Project.swift +++ b/Projects/Feature/Agency/Project.swift @@ -16,7 +16,10 @@ let project = Project( sources: ["Sources/**"], dependencies: [ .project(target: "BaseFeature", path: .relativeToRoot("Projects/Feature/Base")) - ] + ], + settings: .settings(base: [ + "SWIFT_VERSION": "5.7" + ]) ), Target( name: "AgencyFeatureTests", diff --git a/Projects/Feature/Base/Project.swift b/Projects/Feature/Base/Project.swift index d10d0c6b..e9f385da 100644 --- a/Projects/Feature/Base/Project.swift +++ b/Projects/Feature/Base/Project.swift @@ -17,7 +17,10 @@ let project = Project( dependencies: [ .project(target: "DesignSystem", path: .relativeToRoot("Projects/Shared/DesignSystem")), .project(target: "Core", path: .relativeToRoot("Projects/Core/Core")) - ] + ], + settings: .settings(base: [ + "SWIFT_VERSION": "5.7" + ]) ) ] ) diff --git a/Projects/Feature/Ledger/Project.swift b/Projects/Feature/Ledger/Project.swift index 5a5d5952..e0b0ee86 100644 --- a/Projects/Feature/Ledger/Project.swift +++ b/Projects/Feature/Ledger/Project.swift @@ -16,7 +16,10 @@ let project = Project( sources: ["Sources/**"], dependencies: [ .project(target: "BaseFeature", path: .relativeToRoot("Projects/Feature/Base")) - ] + ], + settings: .settings(base: [ + "SWIFT_VERSION": "5.7" + ]) ), Target( name: "LedgerFeatureTests", diff --git a/Projects/Feature/Ledger/Sources/Scene/Detail/Components/LedgerContentsView/Cell/DefaultImageCell.swift b/Projects/Feature/Ledger/Sources/Scene/Detail/Components/LedgerContentsView/Cell/DefaultImageCell.swift index f96fb2a9..7be2f758 100644 --- a/Projects/Feature/Ledger/Sources/Scene/Detail/Components/LedgerContentsView/Cell/DefaultImageCell.swift +++ b/Projects/Feature/Ledger/Sources/Scene/Detail/Components/LedgerContentsView/Cell/DefaultImageCell.swift @@ -2,7 +2,8 @@ import UIKit import DesignSystem import Utility -import Core +import BaseFeature +import ThirdPartyLips import Kingfisher import ReactorKit diff --git a/Projects/Feature/Main/Project.swift b/Projects/Feature/Main/Project.swift index 6acbb189..772a7c7f 100644 --- a/Projects/Feature/Main/Project.swift +++ b/Projects/Feature/Main/Project.swift @@ -19,7 +19,10 @@ let project = Project( .project(target: "MyPageFeature", path: .relativeToRoot("Projects/Feature/MyPage")), .project(target: "AgencyFeature", path: .relativeToRoot("Projects/Feature/Agency")), .project(target: "LedgerFeature", path: .relativeToRoot("Projects/Feature/Ledger")) - ] + ], + settings: .settings(base: [ + "SWIFT_VERSION": "5.7" + ]) ), Target( name: "MainFeatureTests", diff --git a/Projects/Feature/MyPage/Project.swift b/Projects/Feature/MyPage/Project.swift index 76364ff3..ae896ce2 100644 --- a/Projects/Feature/MyPage/Project.swift +++ b/Projects/Feature/MyPage/Project.swift @@ -19,7 +19,10 @@ let project = Project( target: "BaseFeature", path: .relativeToRoot("Projects/Feature/Base") ) - ] + ], + settings: .settings(base: [ + "SWIFT_VERSION": "5.7" + ]) ), Target( name: "MyPageFeatureTests", diff --git a/Projects/Feature/MyPage/Sources/Common/MyPageCoordinator.swift b/Projects/Feature/MyPage/Sources/Common/MyPageCoordinator.swift index e2150400..b8bf6ea8 100644 --- a/Projects/Feature/MyPage/Sources/Common/MyPageCoordinator.swift +++ b/Projects/Feature/MyPage/Sources/Common/MyPageCoordinator.swift @@ -35,7 +35,8 @@ public final class MyPageCoordinator: Coordinator { case .withrawal: withdrawl() case .debug: - debug() + //debug() + break } } @@ -68,7 +69,7 @@ extension MyPageCoordinator { AlertsManager.show(title: title, subTitle: subTitle, type: .default(okAction: okAction)) } - private func debug(animated: Bool = true) { - navigationController.pushViewController(UIHostingController(rootView: PulseView()), animated: animated) - } +// private func debug(animated: Bool = true) { +// navigationController.pushViewController(UIHostingController(rootView: PulseView()), animated: animated) +// } } diff --git a/Projects/Feature/MyPage/Sources/Scene/MyPage/Cell/UniversityHeader.swift b/Projects/Feature/MyPage/Sources/Scene/MyPage/Cell/UniversityHeader.swift index 2c780225..40c2e181 100644 --- a/Projects/Feature/MyPage/Sources/Scene/MyPage/Cell/UniversityHeader.swift +++ b/Projects/Feature/MyPage/Sources/Scene/MyPage/Cell/UniversityHeader.swift @@ -2,8 +2,8 @@ import UIKit import Utility import DesignSystem +import Core -import Kingfisher final class UniversityHeader: UITableViewHeaderFooterView, ReusableView { diff --git a/Projects/Feature/MyPage/Sources/Scene/PulseView.swift b/Projects/Feature/MyPage/Sources/Scene/PulseView.swift index bdca502f..cfd5f1cf 100644 --- a/Projects/Feature/MyPage/Sources/Scene/PulseView.swift +++ b/Projects/Feature/MyPage/Sources/Scene/PulseView.swift @@ -1,9 +1,9 @@ import SwiftUI -import PulseUI - -struct PulseView: View { - var body: some View { - ConsoleView() - } -} +//import PulseUI +// +//struct PulseView: View { +// var body: some View { +// ConsoleView() +// } +//} diff --git a/Projects/Feature/Sign/Project.swift b/Projects/Feature/Sign/Project.swift index 92f06b66..235999bb 100644 --- a/Projects/Feature/Sign/Project.swift +++ b/Projects/Feature/Sign/Project.swift @@ -25,7 +25,10 @@ let project = Project( sources: ["Sources/**"], dependencies: [ .project(target: "BaseFeature", path: .relativeToRoot("Projects/Feature/Base")) - ] + ], + settings: .settings(base: [ + "SWIFT_VERSION": "5.7" + ]) ), Target( name: "SignFeatureTests", diff --git a/Projects/Shared/DesignSystem/Project.swift b/Projects/Shared/DesignSystem/Project.swift index 259ad411..eddd6bb6 100644 --- a/Projects/Shared/DesignSystem/Project.swift +++ b/Projects/Shared/DesignSystem/Project.swift @@ -31,7 +31,10 @@ let project = Project( dependencies: [ .package(product: "FlexLayout"), .package(product: "PinLayout") - ] + ], + settings: .settings(base: [ + "SWIFT_VERSION": "5.7" + ]) ), Target( name: "DesignSystemDemo", diff --git a/Projects/Shared/DesignSystem/Sources/Utils/Colors.swift b/Projects/Shared/DesignSystem/Sources/Utils/Colors.swift index 974ce440..ed5c4889 100644 --- a/Projects/Shared/DesignSystem/Sources/Utils/Colors.swift +++ b/Projects/Shared/DesignSystem/Sources/Utils/Colors.swift @@ -2,52 +2,52 @@ import UIKit public enum Colors { public enum White { - public static var _1: UIColor = UIColor(hexString: "FFFFFF") + public static let _1: UIColor = UIColor(hexString: "FFFFFF") } public enum Black { - public static var _1: UIColor = UIColor(hexString: "000000") + public static let _1: UIColor = UIColor(hexString: "000000") } public enum Gray { - public static var _10: UIColor = UIColor(hexString: "0F1114") - public static var _9: UIColor = UIColor(hexString: "191A1E") - public static var _8: UIColor = UIColor(hexString: "292C34") - public static var _7: UIColor = UIColor(hexString: "37404F") - public static var _6: UIColor = UIColor(hexString: "49556A") - public static var _5: UIColor = UIColor(hexString: "77859E") - public static var _4: UIColor = UIColor(hexString: "A6B4CA") - public static var _3: UIColor = UIColor(hexString: "D9E1ED") - public static var _2: UIColor = UIColor(hexString: "E7EDF7") - public static var _1: UIColor = UIColor(hexString: "F6F8FC") - public static var _300: UIColor = UIColor(hexString: "CDD2D9") + public static let _10: UIColor = UIColor(hexString: "0F1114") + public static let _9: UIColor = UIColor(hexString: "191A1E") + public static let _8: UIColor = UIColor(hexString: "292C34") + public static let _7: UIColor = UIColor(hexString: "37404F") + public static let _6: UIColor = UIColor(hexString: "49556A") + public static let _5: UIColor = UIColor(hexString: "77859E") + public static let _4: UIColor = UIColor(hexString: "A6B4CA") + public static let _3: UIColor = UIColor(hexString: "D9E1ED") + public static let _2: UIColor = UIColor(hexString: "E7EDF7") + public static let _1: UIColor = UIColor(hexString: "F6F8FC") + public static let _300: UIColor = UIColor(hexString: "CDD2D9") } public enum Blue { - public static var _4: UIColor = UIColor(hexString: "5562FF") - public static var _3: UIColor = UIColor(hexString: "98A0FF") - public static var _2: UIColor = UIColor(hexString: "CCCFFF") - public static var _1: UIColor = UIColor(hexString: "EEEFFF") + public static let _4: UIColor = UIColor(hexString: "5562FF") + public static let _3: UIColor = UIColor(hexString: "98A0FF") + public static let _2: UIColor = UIColor(hexString: "CCCFFF") + public static let _1: UIColor = UIColor(hexString: "EEEFFF") } public enum SkyBlue { - public static var _1: UIColor = UIColor(hexString: "C7F4FF") + public static let _1: UIColor = UIColor(hexString: "C7F4FF") } public enum Mint { - public static var _3: UIColor = UIColor(hexString: "49DFBB") - public static var _2: UIColor = UIColor(hexString: "7CE9CF") - public static var _1: UIColor = UIColor(hexString: "E4FAF5") + public static let _3: UIColor = UIColor(hexString: "49DFBB") + public static let _2: UIColor = UIColor(hexString: "7CE9CF") + public static let _1: UIColor = UIColor(hexString: "E4FAF5") } public enum Yellow { - public static var _1: UIColor = UIColor(hexString: "FFE600") + public static let _1: UIColor = UIColor(hexString: "FFE600") } public enum Red { - public static var _3: UIColor = UIColor(hexString: "FF5473") - public static var _2: UIColor = UIColor(hexString: "FF8CA0") - public static var _1: UIColor = UIColor(hexString: "FFEEF1") + public static let _3: UIColor = UIColor(hexString: "FF5473") + public static let _2: UIColor = UIColor(hexString: "FF8CA0") + public static let _1: UIColor = UIColor(hexString: "FFEEF1") } } diff --git a/Projects/Shared/DesignSystem/Sources/Utils/Images.swift b/Projects/Shared/DesignSystem/Sources/Utils/Images.swift index 4ec3bdf1..2ad0991b 100644 --- a/Projects/Shared/DesignSystem/Sources/Utils/Images.swift +++ b/Projects/Shared/DesignSystem/Sources/Utils/Images.swift @@ -1,91 +1,91 @@ import UIKit public enum Images { - public static var arrowLeft = UIImage(named: "arrow.left", in: Bundle.module, with: nil) - public static var arrowRight = UIImage(named: "arrow.right", in: Bundle.module, with: nil) - public static var chevronDown = UIImage(named: "chevron.down", in: Bundle.module, with: nil) - public static var chevronLeft = UIImage(named: "chevron.left", in: Bundle.module, with: nil) - public static var chevronRight = UIImage(named: "chevron.right", in: Bundle.module, with: nil) + public static let arrowLeft = UIImage(named: "arrow.left", in: Bundle.module, with: nil) + public static let arrowRight = UIImage(named: "arrow.right", in: Bundle.module, with: nil) + public static let chevronDown = UIImage(named: "chevron.down", in: Bundle.module, with: nil) + public static let chevronLeft = UIImage(named: "chevron.left", in: Bundle.module, with: nil) + public static let chevronRight = UIImage(named: "chevron.right", in: Bundle.module, with: nil) - public static var mongClubFill = UIImage(named: "mong.club.fill", in: Bundle.module, with: nil) - public static var mongClub = UIImage(named: "mong.club", in: Bundle.module, with: nil) - public static var mongCongrats = UIImage(named: "mong.congrats", in: Bundle.module, with: nil) - public static var mongEditorFill = UIImage(named: "mong.editor.fill", in: Bundle.module, with: nil) - public static var mongEditor = UIImage(named: "mong.editor", in: Bundle.module, with: nil) - public static var mongLedger = UIImage(named: "mong.ledger", in: Bundle.module, with: nil) - public static var mong = UIImage(named: "mong", in: Bundle.module, with: nil) - public static var mongPass = UIImage(named: "mong.pass", in: Bundle.module, with: nil) - public static var mongPassNot = UIImage(named: "mong.pass.not", in: Bundle.module, with: nil) - public static var mongGray = UIImage(named: "mong.gray", in: Bundle.module, with: nil) - public static var mongStudy = UIImage(named: "mong.study", in: Bundle.module, with: nil) - public static var mongBackgroundCircle = UIImage(named: "mong.background.circle", in: Bundle.module, with: nil) - public static var mongSplash = UIImage(named: "mong.splash", in: Bundle.module, with: nil) - public static var mongCode = UIImage(named: "mong.code", in: Bundle.module, with: nil) - public static var mongParty = UIImage(named: "mong.party", in: Bundle.module, with: nil) - public static var mongLedgerEmpty = UIImage(named: "mong.ledger.empty", in: Bundle.module, with: nil) - public static var mongInquiry = UIImage(named: "mong.inquiry", in: .module, with: nil) + public static let mongClubFill = UIImage(named: "mong.club.fill", in: Bundle.module, with: nil) + public static let mongClub = UIImage(named: "mong.club", in: Bundle.module, with: nil) + public static let mongCongrats = UIImage(named: "mong.congrats", in: Bundle.module, with: nil) + public static let mongEditorFill = UIImage(named: "mong.editor.fill", in: Bundle.module, with: nil) + public static let mongEditor = UIImage(named: "mong.editor", in: Bundle.module, with: nil) + public static let mongLedger = UIImage(named: "mong.ledger", in: Bundle.module, with: nil) + public static let mong = UIImage(named: "mong", in: Bundle.module, with: nil) + public static let mongPass = UIImage(named: "mong.pass", in: Bundle.module, with: nil) + public static let mongPassNot = UIImage(named: "mong.pass.not", in: Bundle.module, with: nil) + public static let mongGray = UIImage(named: "mong.gray", in: Bundle.module, with: nil) + public static let mongStudy = UIImage(named: "mong.study", in: Bundle.module, with: nil) + public static let mongBackgroundCircle = UIImage(named: "mong.background.circle", in: Bundle.module, with: nil) + public static let mongSplash = UIImage(named: "mong.splash", in: Bundle.module, with: nil) + public static let mongCode = UIImage(named: "mong.code", in: Bundle.module, with: nil) + public static let mongParty = UIImage(named: "mong.party", in: Bundle.module, with: nil) + public static let mongLedgerEmpty = UIImage(named: "mong.ledger.empty", in: Bundle.module, with: nil) + public static let mongInquiry = UIImage(named: "mong.inquiry", in: .module, with: nil) - public static var scanPhone = UIImage(named: "scan.phone", in: Bundle.module, with: nil) - public static var accountRecord = UIImage(named: "accountRecord", in: Bundle.module, with: nil) - public static var agency = UIImage(named: "agency", in: Bundle.module, with: nil) - public static var agencyCongrats = UIImage(named: "agency.congrats", in: Bundle.module, with: nil) + public static let scanPhone = UIImage(named: "scan.phone", in: Bundle.module, with: nil) + public static let accountRecord = UIImage(named: "accountRecord", in: Bundle.module, with: nil) + public static let agency = UIImage(named: "agency", in: Bundle.module, with: nil) + public static let agencyCongrats = UIImage(named: "agency.congrats", in: Bundle.module, with: nil) - public static var check = UIImage(named: "check", in: Bundle.module, with: nil) - public static var checkboxCheck = UIImage(named: "checkbox.check", in: Bundle.module, with: nil) - public static var checkboxFill = UIImage(named: "checkbox.fill", in: Bundle.module, with: nil) - public static var checkbox = UIImage(named: "checkbox", in: Bundle.module, with: nil) - public static var closeFill = UIImage(named: "close.fill", in: Bundle.module, with: nil) - public static var close = UIImage(named: "close", in: Bundle.module, with: nil) - public static var copy = UIImage(named: "copy", in: Bundle.module, with: nil) - public static var document = UIImage(named: "document", in: Bundle.module, with: nil) - public static var hamburg = UIImage(named: "hamburg", in: Bundle.module, with: nil) - public static var intive = UIImage(named: "intive", in: Bundle.module, with: nil) - public static var logout = UIImage(named: "logout", in: Bundle.module, with: nil) - public static var money = UIImage(named: "money", in: Bundle.module, with: nil) - public static var more = UIImage(named: "more", in: Bundle.module, with: nil) - public static var paper = UIImage(named: "paper", in: Bundle.module, with: nil) - public static var pencil = UIImage(named: "pencil", in: Bundle.module, with: nil) - public static var pencilGray = UIImage(named: "pencil.gray", in: Bundle.module, with: nil) - public static var photo = UIImage(named: "photo", in: Bundle.module, with: nil) - public static var plan = UIImage(named: "plan", in: Bundle.module, with: nil) + public static let check = UIImage(named: "check", in: Bundle.module, with: nil) + public static let checkboxCheck = UIImage(named: "checkbox.check", in: Bundle.module, with: nil) + public static let checkboxFill = UIImage(named: "checkbox.fill", in: Bundle.module, with: nil) + public static let checkbox = UIImage(named: "checkbox", in: Bundle.module, with: nil) + public static let closeFill = UIImage(named: "close.fill", in: Bundle.module, with: nil) + public static let close = UIImage(named: "close", in: Bundle.module, with: nil) + public static let copy = UIImage(named: "copy", in: Bundle.module, with: nil) + public static let document = UIImage(named: "document", in: Bundle.module, with: nil) + public static let hamburg = UIImage(named: "hamburg", in: Bundle.module, with: nil) + public static let intive = UIImage(named: "intive", in: Bundle.module, with: nil) + public static let logout = UIImage(named: "logout", in: Bundle.module, with: nil) + public static let money = UIImage(named: "money", in: Bundle.module, with: nil) + public static let more = UIImage(named: "more", in: Bundle.module, with: nil) + public static let paper = UIImage(named: "paper", in: Bundle.module, with: nil) + public static let pencil = UIImage(named: "pencil", in: Bundle.module, with: nil) + public static let pencilGray = UIImage(named: "pencil.gray", in: Bundle.module, with: nil) + public static let photo = UIImage(named: "photo", in: Bundle.module, with: nil) + public static let plan = UIImage(named: "plan", in: Bundle.module, with: nil) - public static var record = UIImage(named: "record", in: Bundle.module, with: nil) - public static var reissue = UIImage(named: "reissue", in: Bundle.module, with: nil) - public static var scan = UIImage(named: "scan", in: Bundle.module, with: nil) - public static var schoolBlue = UIImage(named: "school.blue", in: Bundle.module, with: nil) - public static var school = UIImage(named: "school", in: Bundle.module, with: nil) - public static var search = UIImage(named: "search", in: Bundle.module, with: nil) - public static var hexagon = UIImage(named: "hexagon", in: Bundle.module, with: nil) - public static var time = UIImage(named: "time", in: Bundle.module, with: nil) - public static var trash = UIImage(named: "trash", in: Bundle.module, with: nil) - public static var university = UIImage(named: "university", in: Bundle.module, with: nil) - public static var kakaoTalk = UIImage(named: "kakaoTalk", in: Bundle.module, with: nil) - public static var apple = UIImage(named: "apple", in: Bundle.module, with: nil) - public static var congrats = UIImage(named: "congrats", in: Bundle.module, with: nil) + public static let record = UIImage(named: "record", in: Bundle.module, with: nil) + public static let reissue = UIImage(named: "reissue", in: Bundle.module, with: nil) + public static let scan = UIImage(named: "scan", in: Bundle.module, with: nil) + public static let schoolBlue = UIImage(named: "school.blue", in: Bundle.module, with: nil) + public static let school = UIImage(named: "school", in: Bundle.module, with: nil) + public static let search = UIImage(named: "search", in: Bundle.module, with: nil) + public static let hexagon = UIImage(named: "hexagon", in: Bundle.module, with: nil) + public static let time = UIImage(named: "time", in: Bundle.module, with: nil) + public static let trash = UIImage(named: "trash", in: Bundle.module, with: nil) + public static let university = UIImage(named: "university", in: Bundle.module, with: nil) + public static let kakaoTalk = UIImage(named: "kakaoTalk", in: Bundle.module, with: nil) + public static let apple = UIImage(named: "apple", in: Bundle.module, with: nil) + public static let congrats = UIImage(named: "congrats", in: Bundle.module, with: nil) - public static var closeCircleFill = UIImage(named: "close.circle.fill", in: Bundle.module, with: nil) - public static var plusCircleFillGreen = UIImage(named: "plus.circle.fill.green", in: Bundle.module, with: nil) - public static var plusCircleFillRed = UIImage(named: "plus.circle.fill.red", in: Bundle.module, with: nil) - public static var plusCircleFillBlue = UIImage(named: "plus.circle.fill.blue", in: Bundle.module, with: nil) + public static let closeCircleFill = UIImage(named: "close.circle.fill", in: Bundle.module, with: nil) + public static let plusCircleFillGreen = UIImage(named: "plus.circle.fill.green", in: Bundle.module, with: nil) + public static let plusCircleFillRed = UIImage(named: "plus.circle.fill.red", in: Bundle.module, with: nil) + public static let plusCircleFillBlue = UIImage(named: "plus.circle.fill.blue", in: Bundle.module, with: nil) - public static var pencilCircleFill = UIImage(named: "pencil.circle.fill", in: Bundle.module, with: nil) - public static var scanCircleFill = UIImage(named: "scan.circle.fill", in: Bundle.module, with: nil) - public static var warningFill = UIImage(named: "warning.fill", in: Bundle.module, with: nil) - public static var warning = UIImage(named: "warning", in: Bundle.module, with: nil) + public static let pencilCircleFill = UIImage(named: "pencil.circle.fill", in: Bundle.module, with: nil) + public static let scanCircleFill = UIImage(named: "scan.circle.fill", in: Bundle.module, with: nil) + public static let warningFill = UIImage(named: "warning.fill", in: Bundle.module, with: nil) + public static let warning = UIImage(named: "warning", in: Bundle.module, with: nil) - public static var kakaoLogo = UIImage(named: "kakaoLogo", in: Bundle.module, with: nil) - public static var appleLogo = UIImage(named: "appleLogo", in: Bundle.module, with: nil) + public static let kakaoLogo = UIImage(named: "kakaoLogo", in: Bundle.module, with: nil) + public static let appleLogo = UIImage(named: "appleLogo", in: Bundle.module, with: nil) - public static var cameraShutter = UIImage(named: "camera.shutter", in: Bundle.module, with: nil) - public static var scanGuide = UIImage(named: "scan.guide", in: Bundle.module, with: nil) + public static let cameraShutter = UIImage(named: "camera.shutter", in: Bundle.module, with: nil) + public static let scanGuide = UIImage(named: "scan.guide", in: Bundle.module, with: nil) - public static var agencyLineBlue = UIImage(named: "agency.line.blue", in: Bundle.module, with: nil) - public static var moneyLineBlue = UIImage(named: "money.line.blue", in: Bundle.module, with: nil) - public static var planLineBlue = UIImage(named: "plan.line.blue", in: Bundle.module, with: nil) - public static var timeLineBlue = UIImage(named: "time.line.blue", in: Bundle.module, with: nil) + public static let agencyLineBlue = UIImage(named: "agency.line.blue", in: Bundle.module, with: nil) + public static let moneyLineBlue = UIImage(named: "money.line.blue", in: Bundle.module, with: nil) + public static let planLineBlue = UIImage(named: "plan.line.blue", in: Bundle.module, with: nil) + public static let timeLineBlue = UIImage(named: "time.line.blue", in: Bundle.module, with: nil) - public static var feedback = UIImage(named: "feedback", in: Bundle.module, with: nil) + public static let feedback = UIImage(named: "feedback", in: Bundle.module, with: nil) } diff --git a/Projects/Shared/ThirdPartyLips/Project.swift b/Projects/Shared/ThirdPartyLips/Project.swift index 43b1e31c..affcfa57 100644 --- a/Projects/Shared/ThirdPartyLips/Project.swift +++ b/Projects/Shared/ThirdPartyLips/Project.swift @@ -6,6 +6,12 @@ let project = Project( disableBundleAccessors: true, disableSynthesizedResourceAccessors: true ), + packages: [ + .remote( + url: "https://github.com/onevcat/Kingfisher", + requirement: .upToNextMajor(from: "8.0.1") + ) + ], targets: [ Target( name: "ThirdPartyLips", @@ -16,15 +22,18 @@ let project = Project( sources: ["Sources/**"], dependencies: [ .external(name: "ReactorKit"), - .external(name: "Kingfisher"), + .package(product: "Kingfisher"), .external(name: "RxCocoa"), .external(name: "RxDataSources"), .external(name: "Alamofire"), .external(name: "KakaoSDKAuth"), - .external(name: "KakaoSDKUser"), - .external(name: "Pulse"), - .external(name: "PulseUI") - ] + .external(name: "KakaoSDKUser") +// .external(name: "Pulse"), +// .external(name: "PulseUI") + ], + settings: .settings(base: [ + "SWIFT_VERSION": "5.7" + ]) ) ] ) diff --git a/Projects/Shared/ThirdPartyLips/Sources/Dummy.swift b/Projects/Shared/ThirdPartyLips/Sources/Dummy.swift index 3005a3df..4fa662b6 100644 --- a/Projects/Shared/ThirdPartyLips/Sources/Dummy.swift +++ b/Projects/Shared/ThirdPartyLips/Sources/Dummy.swift @@ -1,2 +1 @@ // Dummy - diff --git a/Tuist/Dependencies.swift b/Tuist/Dependencies.swift index 639a1a89..3b985c52 100644 --- a/Tuist/Dependencies.swift +++ b/Tuist/Dependencies.swift @@ -10,14 +10,14 @@ let dependencies = Dependencies( url: "https://github.com/Alamofire/Alamofire", requirement: .upToNextMajor(from: "5.9.1") ), - .remote( - url: "https://github.com/kean/Pulse", - requirement: .branch("main") - ), - .remote( - url: "https://github.com/onevcat/Kingfisher", - requirement: .upToNextMajor(from: "7.11.0") - ), +// .remote( +// url: "https://github.com/kean/Pulse", +// requirement: .upToNextMajor(from: "5.1.1") +// ), +// .remote( +// url: "https://github.com/onevcat/Kingfisher", +// requirement: .upToNextMajor(from: "8.0.1") +// ), .remote( url: "https://github.com/ReactiveX/RxSwift", requirement: .upToNextMajor(from: "6.6.0") diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 8191ffda..44f0ae31 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -1,14 +1,12 @@ APP_NAME = "Moneymong" SCHEME = "Moneymong" - KEYCHAIN_NAME = ENV["KEYCHAIN_NAME"] KEYCHAIN_PASSWORD = ENV["KEYCHAIN_PASSWORD"] SLACK_HOOK_URL = ENV["SLACK_HOOK_URL"] FASTLANE_API_KEY_ID = ENV["FASTLANE_API_KEY_ID"] FASTLANE_API_KEY_ISSUER_ID = ENV["FASTLANE_API_KEY_ISSUER_ID"] -FASTLANE_API_KEY_CONTENT = ENV["FASTLANE_API_KEY_CONTENT"] default_platform(:ios) @@ -51,12 +49,11 @@ platform :ios do ) new_build_number = latest_testflight_build_number + 1 - #puts "New build number: #{new_build_number}" - # increment_build_number - - #increment_build_number( - # build_number: new_build_number - #) + + increment_build_number( + build_number: new_build_number, + xcodeproj: "Projects/App/Moneymong.xcodeproj" + ) # βœ… λΉŒλ“œ build_app(