diff --git a/14th-team5-iOS/App/Project.swift b/14th-team5-iOS/App/Project.swift index 3d188ab4..fd9fea69 100644 --- a/14th-team5-iOS/App/Project.swift +++ b/14th-team5-iOS/App/Project.swift @@ -19,7 +19,7 @@ private let targets: [Target] = [ "CFBundleDisplayName": .string("Bibbi"), "CFBundleVersion": .string("1"), "CFBuildVersion": .string("0"), - "CFBundleShortVersionString": .string("1.2.4"), + "CFBundleShortVersionString": .string("1.2.5"), "UILaunchStoryboardName": .string("LaunchScreen"), "UISupportedInterfaceOrientations": .array([.string("UIInterfaceOrientationPortrait")]), "UIUserInterfaceStyle": .string("Dark"), diff --git a/14th-team5-iOS/App/Sources/Presentation/Account/AccountSignUp/ViewControllers/AccountProfileViewController.swift b/14th-team5-iOS/App/Sources/Presentation/Account/AccountSignUp/ViewControllers/AccountProfileViewController.swift index aefdcb32..f664557f 100644 --- a/14th-team5-iOS/App/Sources/Presentation/Account/AccountSignUp/ViewControllers/AccountProfileViewController.swift +++ b/14th-team5-iOS/App/Sources/Presentation/Account/AccountSignUp/ViewControllers/AccountProfileViewController.swift @@ -229,10 +229,11 @@ extension AccountProfileViewController: PHPickerViewControllerDelegate { let itemProvider = results.first?.itemProvider picker.dismiss(animated: true) if let imageProvider = itemProvider, imageProvider.canLoadObject(ofClass: UIImage.self) { - imageProvider.loadObject(ofClass: UIImage.self) { image, error in - guard let photoImage: UIImage = image as? UIImage, + imageProvider.loadObject(ofClass: UIImage.self) { [weak self] image, error in + guard let self = self, + let photoImage: UIImage = image as? UIImage, let originalData: Data = photoImage.jpegData(compressionQuality: 1.0) else { return } - imageProvider.didSelectProfileImageWithProcessing(photo: originalData, error: error) + self.reactor?.action.onNext(.didTapPHAssetsImage(originalData)) } } } diff --git a/14th-team5-iOS/Core/Sources/Extensions/Bundle+Ext.swift b/14th-team5-iOS/Core/Sources/Extensions/Bundle+Ext.swift index ab0e4667..27224aaf 100644 --- a/14th-team5-iOS/Core/Sources/Extensions/Bundle+Ext.swift +++ b/14th-team5-iOS/Core/Sources/Extensions/Bundle+Ext.swift @@ -65,6 +65,6 @@ extension Bundle { } public var xAppKey: String { - "da91623d-fe55-4115-8e14-aa7581761963" + "39d7cdd1-218c-4abd-addb-ab4efff8a369" } } diff --git a/14th-team5-iOS/Core/Sources/Trash/BBNetwork/API.swift b/14th-team5-iOS/Core/Sources/Trash/BBNetwork/API.swift index adc6f670..a72bba23 100644 --- a/14th-team5-iOS/Core/Sources/Trash/BBNetwork/API.swift +++ b/14th-team5-iOS/Core/Sources/Trash/BBNetwork/API.swift @@ -53,7 +53,7 @@ public enum BibbiAPI { public var value: String { switch self { case let .auth(token): return "Bearer \(token)" - case .xAppKey: return "da91623d-fe55-4115-8e14-aa7581761963" // TODO: - 번들에서 가져오기 + case .xAppKey: return "39d7cdd1-218c-4abd-addb-ab4efff8a369" // TODO: - 번들에서 가져오기 case let .xAuthToken(token): return "\(token)" case .contentForm: return "application/x-www-form-urlencoded" case .contentJson: return "application/json" diff --git a/14th-team5-iOS/Data/Sources/Repositories/AppRepository.swift b/14th-team5-iOS/Data/Sources/Repositories/AppRepository.swift index c8dbfd03..609eb041 100644 --- a/14th-team5-iOS/Data/Sources/Repositories/AppRepository.swift +++ b/14th-team5-iOS/Data/Sources/Repositories/AppRepository.swift @@ -33,7 +33,7 @@ extension AppRepository { public func fetchAppVersion() -> Observable { // TODO: - xAppKey 불러오는 코드 다시 작성하기 - let appKey = "7b159d28-b106-4b6d-a490-1fd654ce40c2" + let appKey = "39d7cdd1-218c-4abd-addb-ab4efff8a369" return meAPIWorker.fetchAppVersion(appKey: appKey) .map { $0.toDomain() } diff --git a/Tuist/ProjectDescriptionHelpers/Project+Templates.swift b/Tuist/ProjectDescriptionHelpers/Project+Templates.swift index ebeb7e1e..481c114a 100644 --- a/Tuist/ProjectDescriptionHelpers/Project+Templates.swift +++ b/Tuist/ProjectDescriptionHelpers/Project+Templates.swift @@ -59,7 +59,7 @@ extension Project { settings: .settings( base: [ "OTHER_LDFLAGS": "$(inherited) -ObjC", - "MARKETING_VERSION": "1.2.4", + "MARKETING_VERSION": "1.2.5", "CURRENT_PROJECT_VERSION": "1", "VERSIONING_SYSTEM": "apple-generic" ],