🔗 :: (#196) 첫빌드 크러시(충돌) 버그 수정

winwx · web-flow · commit af21dfadcc24 · 2024-03-28T23:26:35.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -70,5 +70,3 @@ Derived/
 Tuist/Dependencies
 
 XCConfig/
-
-Projects/App/Resources/GoogleService-Info.plist
diff --git a/Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/ProjectEnvironment.swift b/Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/ProjectEnvironment.swift
@@ -17,5 +17,5 @@ public let env = ProjectEnvironment(
     organizationName: "com.team.return",
     deploymentTarget: .iOS(targetVersion: "15.0", devices: [.iphone, .ipad]),
     platform: .iOS,
-    baseSetting: ["OTHER_LDFLAGS": .string("$(inherited)")]
+    baseSetting: ["OTHER_LDFLAGS": ["$(inherited) -Objc"]]
 )
diff --git a/Projects/App/Project.swift b/Projects/App/Project.swift
@@ -34,7 +34,8 @@ let targets: [Target] = [
         entitlements: "Support/\(env.appName).entitlements",
         scripts: scripts,
         dependencies: [
-            .Projects.flow
+            .Projects.flow,
+            .SPM.FCM
         ],
         settings: .settings(base: env.baseSetting)
     ),
diff --git a/Projects/App/Resources/GoogleService-Info.plist b/Projects/App/Resources/GoogleService-Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>API_KEY</key>
+	<string>AIzaSyDab8zMjGWDAepzHNhMFL945_qjZHk2O2U</string>
+	<key>GCM_SENDER_ID</key>
+	<string>205952649319</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.team.return.JOBIS-DSM-iOS.dev</string>
+	<key>PROJECT_ID</key>
+	<string>jobis-dev-cff3d</string>
+	<key>STORAGE_BUCKET</key>
+	<string>jobis-dev-cff3d.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:205952649319:ios:8e461e3e3142a903776cc2</string>
+</dict>
+</plist>
diff --git a/Projects/App/Sources/AppDelegate.swift b/Projects/App/Sources/AppDelegate.swift
@@ -66,8 +66,10 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
 
 extension AppDelegate: UNUserNotificationCenterDelegate {
     // 백그라운드에서 푸시 알림을 탭했을 때 실행
-    func application(_ application: UIApplication,
-                     didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+    func application(
+        _ application: UIApplication,
+        didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data
+    ) {
         print("APNS token: \(deviceToken)")
         Messaging.messaging().apnsToken = deviceToken
     }
@@ -83,7 +85,10 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
 }
 
 extension AppDelegate: MessagingDelegate {
-    func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String?) {
+    func messaging(
+        _ messaging: Messaging,
+        didReceiveRegistrationToken fcmToken: String?
+    ) {
         let token = String(describing: fcmToken)
         print("Firebase registration token: \(token)")
 
diff --git a/Projects/Flow/Sources/RejectReason/RejectReasonFlow.swift b/Projects/Flow/Sources/RejectReason/RejectReasonFlow.swift
@@ -25,7 +25,7 @@ public final class RejectReasonFlow: Flow {
         switch step {
         case .rejectReasonIsRequired:
             return navigateToRejectReason()
-        case let .reApplyIsRequired(recruitmentID, applicationID,companyName, companyImageUrl):
+        case let .reApplyIsRequired(recruitmentID, applicationID, companyName, companyImageUrl):
             return navigateToReApply(recruitmentID, applicationID, companyName, companyImageUrl)
         }
     }
diff --git a/Projects/Modules/ThirdPartyLib/Project.swift b/Projects/Modules/ThirdPartyLib/Project.swift
@@ -4,8 +4,9 @@ import DependencyPlugin
 
 let project = Project.makeModule(
     name: "ThirdPartyLib",
-    product: .framework,
+    product: .staticFramework,
     targets: [],
+    packages: [.FCM],
     dependencies: [
         .SPM.RxCocoa,
         .SPM.RxFlow,
@@ -19,6 +20,7 @@ let project = Project.makeModule(
         .SPM.kingfisher,
         .SPM.KeychainSwift,
         .SPM.ReactorKit,
-        .SPM.RxGesture
-    ], sources: []
+        .SPM.RxGesture,
+        .SPM.FCM
+    ]
 )
diff --git a/Projects/Modules/ThirdPartyLib/Sources/Void.swift b/Projects/Modules/ThirdPartyLib/Sources/Void.swift
@@ -0,0 +1,9 @@
+//
+//  Void.swift
+//  ThirdPartyLib
+//
+//  Created by 홍승재 on 3/28/24.
+//  Copyright © 2024 com.team.return. All rights reserved.
+//
+
+import Foundation
diff --git a/Projects/Presentation/Project.swift b/Projects/Presentation/Project.swift
@@ -6,10 +6,8 @@ let project = Project.makeModule(
     name: "Presentation",
     product: .staticLibrary,
     targets: [.unitTest],
-    packages: [.FCM],
     dependencies: [
         .Projects.domain,
-        .Modules.designSystem,
-        .SPM.FCM
+        .Modules.designSystem
     ]
 )
diff --git a/graph.png b/graph.png

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@ public let env = ProjectEnvironment(`
`17`	`17`	`organizationName: "com.team.return",`
`18`	`18`	`deploymentTarget: .iOS(targetVersion: "15.0", devices: [.iphone, .ipad]),`
`19`	`19`	`platform: .iOS,`
`20`		`- baseSetting: ["OTHER_LDFLAGS": .string("$(inherited)")]`
	`20`	`+ baseSetting: ["OTHER_LDFLAGS": ["$(inherited) -Objc"]]`
`21`	`21`	`)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public final class RejectReasonFlow: Flow {`
`25`	`25`	`switch step {`
`26`	`26`	`case .rejectReasonIsRequired:`
`27`	`27`	`return navigateToRejectReason()`
`28`		`- case let .reApplyIsRequired(recruitmentID, applicationID,companyName, companyImageUrl):`
	`28`	`+ case let .reApplyIsRequired(recruitmentID, applicationID, companyName, companyImageUrl):`
`29`	`29`	`return navigateToReApply(recruitmentID, applicationID, companyName, companyImageUrl)`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,8 @@ let project = Project.makeModule(`
`6`	`6`	`name: "Presentation",`
`7`	`7`	`product: .staticLibrary,`
`8`	`8`	`targets: [.unitTest],`
`9`		`- packages: [.FCM],`
`10`	`9`	`dependencies: [`
`11`	`10`	`.Projects.domain,`
`12`		`- .Modules.designSystem,`
`13`		`- .SPM.FCM`
	`11`	`+ .Modules.designSystem`
`14`	`12`	`]`
`15`	`13`	`)`