FIX :: [IOS-47] conflict 해결

MaeumGaGym · Mar 27, 2024 · 9085200 · 9085200
2 parents 96e38eb + 373df28
commit 9085200
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 14 deletions.
diff --git a/Plugins/DependencyPlugin/ProjectDescriptionHelpers/Dependency+SPM.swift b/Plugins/DependencyPlugin/ProjectDescriptionHelpers/Dependency+SPM.swift
@@ -22,6 +22,7 @@ public extension TargetDependency.SPM {
     static let KakaoSDK = TargetDependency.external(name: "KakaoSDK")
     static let Mango = TargetDependency.external(name: "Mango")
     static let SnapshotTesting = TargetDependency.external(name: "SnapshotTesting")
+//    static let Alamofire = TargetDependency.external(name: "Alamofire")
 }
 
 //public extension Package {

diff --git a/Projects/Modules/MGFlow/Sources/Flow/AuthFlow.swift b/Projects/Modules/MGFlow/Sources/Flow/AuthFlow.swift
@@ -73,7 +73,7 @@ public class AuthFlow: Flow {
     }
 
     private func navigateToNicknameViewScreen() -> FlowContributors {
-        let vc = NicknameViewController(NicknameViewModel(useCase: self.useCase))
+        let vc = NicknameViewController(NicknameViewModel())
         rootViewController.pushViewController(vc, animated: true)
         return .none
     }

diff --git a/Projects/Modules/ThirdPartyLibs/Project.swift b/Projects/Modules/ThirdPartyLibs/Project.swift
@@ -18,6 +18,7 @@ let project = Project.makeModule(
         .SPM.Lottie,
         .SPM.kingfisher,
         .SPM.KakaoSDK,
-        .SPM.MindGymKit
+        .SPM.MindGymKit,
+//        .SPM.Alamofire
     ]
 )
diff --git a/Supporting/WidgetExtension.entitlements b/Supporting/WidgetExtension.entitlements
diff --git a/Supporting/마음가짐.entitlements b/Supporting/마음가짐.entitlements
@@ -10,5 +10,7 @@
 	<true/>
 	<key>com.apple.developer.healthkit.access</key>
 	<array/>
+        <key>application-identifier</key>
+	<string>$(AppIdentifierPrefix)com.maeumGaGym-health-iOS.release</string>
 </dict>
 </plist>
diff --git a/Tuist/Dependencies.swift b/Tuist/Dependencies.swift
@@ -9,12 +9,13 @@ let dependencies = Dependencies(
         .remote(url: "https://github.com/ReactiveX/RxSwift.git", requirement: .upToNextMinor(from: "6.5.0")),
         .remote(url: "https://github.com/RxSwiftCommunity/RxFlow.git", requirement: .upToNextMajor(from: "2.13.0")),
         .remote(url: "https://github.com/Swinject/Swinject.git", requirement: .upToNextMajor(from: "2.8.3")),
-        .remote(url: "https://github.com/Moya/Moya.git", requirement: .upToNextMajor(from: "15.0.0")),
+        .remote(url: "https://github.com/MaeumGaGym/Moya", requirement: .upToNextMajor(from: "15.0.1")),
         .remote(url: "https://github.com/airbnb/lottie-ios", requirement: .upToNextMajor(from: "4.3.3")),
         .remote(url: "https://github.com/onevcat/Kingfisher", requirement: .upToNextMajor(from: "7.0.0")),
         .remote(url: "https://github.com/MaeumgaGym/MindGymKit", requirement: .upToNextMajor(from: "0.2.4")),
         .remote(url: "https://github.com/kakao/kakao-ios-sdk", requirement: .branch("master")),
         .remote(url: "https://github.com/MaeumGaGym/Mango", requirement: .upToNextMajor(from: "101.0.0")),
+//        .remote(url: "https://github.com/MaeumGaGym/Alamofire", requirement: .upToNextMinor(from: "5.5.1")),
         .remote(url: "https://github.com/pointfreeco/swift-snapshot-testing", requirement: .upToNextMajor(from: "1.15.4")),
         .remote(url: "https://github.com/google/GoogleSignIn-iOS.git", requirement: .upToNextMajor(from: "7.0.0"))
     ], baseSettings: Settings.settings(

diff --git a/Tuist/ProjectDescriptionHelpers/Project+Templates.swift b/Tuist/ProjectDescriptionHelpers/Project+Templates.swift
@@ -18,7 +18,7 @@ public extension Project {
 
         let configurationName: ConfigurationName = "Development"
         let hasDynamicFramework = targets.contains(.dynamicFramework)
-        let deploymentTarget = Environment.deploymentTarget
+        let deploymentTarget = DeploymentTarget.iOS(targetVersion: "15.0", devices: .iphone)
         let platform = Environment.platform
 
         let baseSettings: SettingsDictionary = .baseSettings.setCodeSignManual()
@@ -42,6 +42,7 @@ public extension Project {
                 infoPlist: .extendingDefault(with: infoPlist),
                 sources: ["Sources/**/*.swift"],
                 resources: [.glob(pattern: "Resources/**", excluding: [])],
+                entitlements: .relativeToRoot("Supporting/마음가짐.entitlements"),
                 scripts: [.swiftLintScript],
                 dependencies: [
                     internalDependencies,

diff --git a/asdfasdf.jpeg b/asdfasdf.jpeg