컨플릭트 해결

f-lab-edu · Jan 3, 2024 · 09d52ac · 09d52ac
1 parent 02c31c5
commit 09d52ac
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/pins.xcodeproj/project.pbxproj b/pins.xcodeproj/project.pbxproj
@@ -30,11 +30,8 @@
 		B742C5782AEA5EE900E95E96 /* CreateViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B742C5772AEA5EE900E95E96 /* CreateViewModel.swift */; };
 		B749AED82B3831CB00633BB1 /* AnnotationIdentifying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B749AED72B3831CB00633BB1 /* AnnotationIdentifying.swift */; };
 		B749AEDA2B38391E00633BB1 /* SettingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B749AED92B38391E00633BB1 /* SettingViewModel.swift */; };
-		B749AEDF2B383EA500633BB1 /* SettingItemHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = B749AEDE2B383EA500633BB1 /* SettingItemHandling.swift */; };
 		B749AEE12B383ECC00633BB1 /* LogoutItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B749AEE02B383ECC00633BB1 /* LogoutItem.swift */; };
 		B749AEE32B38509A00633BB1 /* DiskCacheItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B749AEE22B38509A00633BB1 /* DiskCacheItem.swift */; };
-		B749AEE52B38527300633BB1 /* ConfirmManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B749AEE42B38527300633BB1 /* ConfirmManager.swift */; };
-		B749AEE72B38636000633BB1 /* DiskCacheManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B749AEE62B38636000633BB1 /* DiskCacheManager.swift */; };
 		B74A4FC12AE78BAE00226EA7 /* SearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B74A4FC02AE78BAE00226EA7 /* SearchViewController.swift */; };
 		B74A4FC32AE78BE700226EA7 /* SearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B74A4FC22AE78BE700226EA7 /* SearchView.swift */; };
 		B74A4FC52AE7905500226EA7 /* CreateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B74A4FC42AE7905500226EA7 /* CreateViewController.swift */; };
@@ -98,6 +95,8 @@
 		B7E8A4722AEB84420026931D /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = B7E8A4712AEB84420026931D /* FirebaseCrashlytics */; };
 		B7EC21B12B456EC5008F80F7 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		B7EC21B32B458A29008F80F7 /* UITableView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7EC21B22B458A29008F80F7 /* UITableView+Extensions.swift */; };
+		B7EC21C42B459402008F80F7 /* PinsUtilKit in Frameworks */ = {isa = PBXBuildFile; productRef = B7EC21AE2B456D46008F80F7 /* PinsUtilKit */; };
+		B7EC21C72B459506008F80F7 /* SettingItemHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7EC21C62B459506008F80F7 /* SettingItemHandling.swift */; };
 		B7ECD4502B3059E60085C809 /* PinClusterAnnotationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7ECD44F2B3059E60085C809 /* PinClusterAnnotationView.swift */; };
 		B7F071B72B14855000BB5AB9 /* DetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7F071B62B14855000BB5AB9 /* DetailViewModel.swift */; };
 		B7F071B92B14876C00BB5AB9 /* PinResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7F071B82B14876C00BB5AB9 /* PinResponse.swift */; };
@@ -155,11 +154,8 @@
 		B742C5772AEA5EE900E95E96 /* CreateViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateViewModel.swift; sourceTree = "<group>"; };
 		B749AED72B3831CB00633BB1 /* AnnotationIdentifying.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnnotationIdentifying.swift; sourceTree = "<group>"; };
 		B749AED92B38391E00633BB1 /* SettingViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingViewModel.swift; sourceTree = "<group>"; };
-		B749AEDE2B383EA500633BB1 /* SettingItemHandling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingItemHandling.swift; sourceTree = "<group>"; };
 		B749AEE02B383ECC00633BB1 /* LogoutItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogoutItem.swift; sourceTree = "<group>"; };
 		B749AEE22B38509A00633BB1 /* DiskCacheItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiskCacheItem.swift; sourceTree = "<group>"; };
-		B749AEE42B38527300633BB1 /* ConfirmManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfirmManager.swift; sourceTree = "<group>"; };
-		B749AEE62B38636000633BB1 /* DiskCacheManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiskCacheManager.swift; sourceTree = "<group>"; };
 		B74A4FC02AE78BAE00226EA7 /* SearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchViewController.swift; sourceTree = "<group>"; };
 		B74A4FC22AE78BE700226EA7 /* SearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchView.swift; sourceTree = "<group>"; };
 		B74A4FC42AE7905500226EA7 /* CreateViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateViewController.swift; sourceTree = "<group>"; };
@@ -222,6 +218,7 @@
 		B7E050F02AE4FB3A007903C3 /* MainMapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMapView.swift; sourceTree = "<group>"; };
 		B7E123692B3D7C520044E1DB /* Data+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+Extensions.swift"; sourceTree = "<group>"; };
 		B7EC21B22B458A29008F80F7 /* UITableView+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITableView+Extensions.swift"; sourceTree = "<group>"; };
+		B7EC21C62B459506008F80F7 /* SettingItemHandling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingItemHandling.swift; sourceTree = "<group>"; };
 		B7ECD44F2B3059E60085C809 /* PinClusterAnnotationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinClusterAnnotationView.swift; sourceTree = "<group>"; };
 		B7F071B62B14855000BB5AB9 /* DetailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailViewModel.swift; sourceTree = "<group>"; };
 		B7F071B82B14876C00BB5AB9 /* PinResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinResponse.swift; sourceTree = "<group>"; };
@@ -235,13 +232,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B7EC21C42B459402008F80F7 /* PinsUtilKit in Frameworks */,
 				B7E8A4702AEB84420026931D /* FirebaseAnalytics in Frameworks */,
 				B7B977662AFA0F550023718B /* FirebaseFirestore in Frameworks */,
 				B7BC79172AF4AB8900BBE0A9 /* FirebaseAuth in Frameworks */,
 				B76DD4642AFE0E4B00DFE7E1 /* FirebaseStorage in Frameworks */,
 				B7E8A4722AEB84420026931D /* FirebaseCrashlytics in Frameworks */,
 				B72EDCA22B2B071C00080328 /* GoogleSignIn in Frameworks */,
-				B7EC21AF2B456D46008F80F7 /* PinsUtilKit in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -472,6 +469,7 @@
 				B795EA602B372AFB0021A791 /* CategoryCollectionViewHandling.swift */,
 				B795EA622B372C940021A791 /* ImageCollectionViewHandling.swift */,
 				B749AED72B3831CB00633BB1 /* AnnotationIdentifying.swift */,
+				B7EC21C62B459506008F80F7 /* SettingItemHandling.swift */,
 			);
 			path = Protocols;
 			sourceTree = "<group>";
@@ -742,16 +740,13 @@
 				B749AED82B3831CB00633BB1 /* AnnotationIdentifying.swift in Sources */,
 				B7194A422B1B4F3300642FDA /* SigninViewController.swift in Sources */,
 				B7DC98EB2B26179A006DD8F7 /* DetailUseCase.swift in Sources */,
-				B749AEE52B38527300633BB1 /* ConfirmManager.swift in Sources */,
 				B7ECD4502B3059E60085C809 /* PinClusterAnnotationView.swift in Sources */,
 				B749AEE12B383ECC00633BB1 /* LogoutItem.swift in Sources */,
 				B742C5782AEA5EE900E95E96 /* CreateViewModel.swift in Sources */,
-				B749AEE72B38636000633BB1 /* DiskCacheManager.swift in Sources */,
 				B7DC98E72B260C17006DD8F7 /* CommentResponse.swift in Sources */,
 				B7D051502B10AD1A00D86183 /* DetailNavigationView.swift in Sources */,
 				B71C387E2B0754F90065A783 /* UserRequest.swift in Sources */,
 				B7F071B72B14855000BB5AB9 /* DetailViewModel.swift in Sources */,
-				B749AEDF2B383EA500633BB1 /* SettingItemHandling.swift in Sources */,
 				B7614C0F2AEE085B00CAB8F0 /* ImageCollectionViewCell.swift in Sources */,
 				B7AF69312AE0FEDF00385632 /* AppDelegate.swift in Sources */,
 				B71058912AEA2974003D6039 /* MainViewModel.swift in Sources */,
@@ -795,6 +790,7 @@
 				B7B20E1D2B1CBAC700C8304B /* UserRepository.swift in Sources */,
 				B7DC98E92B260FCF006DD8F7 /* CommentView.swift in Sources */,
 				B7DC98E52B260BD9006DD8F7 /* CommentRequest.swift in Sources */,
+				B7EC21C72B459506008F80F7 /* SettingItemHandling.swift in Sources */,
 				B710588E2AEA2699003D6039 /* OSLog+Extensions.swift in Sources */,
 				B76DD4622AFE0DB000DFE7E1 /* FirestorageService.swift in Sources */,
 				B7035B852AF8D1FF000F74ED /* UIView+Extensions.swift in Sources */,
@@ -1292,7 +1288,7 @@
 			repositoryURL = "https://github.com/MojitoBar/PinsUtilsKit";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 0.1.0;
+				minimumVersion = 0.1.3;
 			};
 		};
 		B7F8B3032B30938400B869BB /* XCRemoteSwiftPackageReference "ios-snapshot-test-case" */ = {

diff --git a/pins.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/pins.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -131,8 +131,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/MojitoBar/PinsUtilsKit",
       "state" : {
-        "revision" : "eede5aa960999f87c7723fd3b06db3796f713822",
-        "version" : "0.1.0"
+        "revision" : "db7c5e98e3abc44a83b7d8452436d781a5491d26",
+        "version" : "0.1.3"
       }
     },
     {

diff --git a/pins/Presentation/View/SettingView/DiskCacheItem.swift b/pins/Presentation/View/SettingView/DiskCacheItem.swift
@@ -7,6 +7,7 @@
 
 import OSLog
 import UIKit
+import PinsUtilKit
 
 final class DiskCacheItem: SettingItemHandling {
     var title: String = "메모리"

diff --git a/pins/Presentation/View/SettingView/LogoutItem.swift b/pins/Presentation/View/SettingView/LogoutItem.swift
@@ -8,6 +8,7 @@
 import OSLog
 import UIKit
 import FirebaseAuth
+import PinsUtilKit
 
 final class LogoutItem: SettingItemHandling {
     var title: String = "로그아웃"

diff --git a/pins/Presentation/ViewController/SettingViewController.swift b/pins/Presentation/ViewController/SettingViewController.swift
@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import PinsUtilKit
 
 final class SettingViewController: UIViewController {
     private lazy var viewModel: SettingViewModel = {

diff --git a/pins/Utils/Protocols/SettingItemHandling.swift b/pins/Utils/Protocols/SettingItemHandling.swift
@@ -0,0 +1,13 @@
+//
+//  SettingItemHandling.swift
+//  pins
+//
+//  Created by 주동석 on 1/3/24.
+//
+
+import Foundation
+
+protocol SettingItemHandling {
+    var title: String { get set }
+    func performAction()
+}