diff --git a/App/Project.swift b/App/Project.swift index 26cd2174..284373b0 100644 --- a/App/Project.swift +++ b/App/Project.swift @@ -65,11 +65,7 @@ let project = Project.makeModule( resources: ["Resources/**"], entitlements: .file(path: "App.entitlements"), dependencies: [ - .Project.Core, - .Project.Presentation, - .external(name: "KakaoSDKAuth", condition: .none), - .external(name: "KakaoSDKCommon", condition: .none), - .external(name: "KakaoSDKUser", condition: .none) + .Project.Presentation ], settings: settings ) diff --git a/App/Sources/SceneDelegate.swift b/App/Sources/SceneDelegate.swift index fa7dd443..23349235 100644 --- a/App/Sources/SceneDelegate.swift +++ b/App/Sources/SceneDelegate.swift @@ -41,11 +41,6 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { } window = UIWindow(frame: windowScene.coordinateSpace.bounds) window?.windowScene = windowScene -// let rootViewController = SignupViewController() -// self.window?.rootViewController = rootViewController -// self.window?.makeKeyAndVisible() -// KeychainManager.shared.delete(token: .AccessToken) -// KeychainManager.shared.delete(token: .RefreshToken) APIProvider.validateToken { login in DispatchQueue.main.async { var rootViewController: UIViewController diff --git a/Common/Project.swift b/Common/Project.swift index 72e083fb..b25ae3ab 100644 --- a/Common/Project.swift +++ b/Common/Project.swift @@ -19,8 +19,7 @@ let project = Project.makeModule( dependencies: [ .external(name: "SnapKit", condition: .none), .external(name: "Then", condition: .none), - .external(name: "RxSwift", condition: .none), - .external(name: "RxCocoa", condition: .none), - .external(name: "Kingfisher", condition: .none) + .external(name: "Kingfisher", condition: .none), + .Project.Core ] ) diff --git a/Core/Project.swift b/Core/Project.swift index 19c09931..b7cada1e 100644 --- a/Core/Project.swift +++ b/Core/Project.swift @@ -22,7 +22,8 @@ let project = Project.makeModule( .external(name: "Moya", condition: .none), .external(name: "RxSwift", condition: .none), .external(name: "RxMoya", condition: .none), - .external(name: "AWSS3", condition: .none), - .Project.Common + .external(name: "RxSwift", condition: .none), + .external(name: "RxCocoa", condition: .none), + .external(name: "AWSS3", condition: .none) ] ) diff --git a/Core/Sources/AWS/AWSS3Uploader.swift b/Core/Sources/AWS/AWSS3Uploader.swift index 6d5fc505..aa355451 100644 --- a/Core/Sources/AWS/AWSS3Uploader.swift +++ b/Core/Sources/AWS/AWSS3Uploader.swift @@ -9,7 +9,7 @@ import Foundation import Photos -import Common +//import Common import AWSS3 @@ -43,7 +43,7 @@ public class AWSS3Uploader { ) { result in switch result { case .success(let url): - videoUrl = url?.removeQueryParameters() + videoUrl = self.removeQueryParameters(url: url) case .failure(let failure): uploadError = failure } @@ -56,7 +56,7 @@ public class AWSS3Uploader { ) { result in switch result { case .success(let url): - thumbnailUrl = url?.removeQueryParameters() + thumbnailUrl = self.removeQueryParameters(url: url) case .failure(let failure): uploadError = failure } @@ -126,4 +126,14 @@ public class AWSS3Uploader { } uploadTask.resume() } + + private func removeQueryParameters(url: String?) -> String? { + guard let urlString = url else { return nil } + if let urlComponents = URLComponents(string: urlString) { + var modifiedComponents = urlComponents + modifiedComponents.query = nil + return modifiedComponents.string + } + return nil + } } diff --git a/Core/Sources/Model/Keyword.swift b/Core/Sources/Model/Keyword.swift index 54246fa5..55c095ae 100644 --- a/Core/Sources/Model/Keyword.swift +++ b/Core/Sources/Model/Keyword.swift @@ -2,7 +2,7 @@ // Keyword.swift // Core // -// Created by 한지석 on 7/10/24. +// Created by 한지석 on 9/13/24. // Copyright © 2024 com.recordy. All rights reserved. // diff --git a/Common/Sources/Extension/NotificationName+.swift b/Core/Sources/Notification/NotificationName+.swift similarity index 82% rename from Common/Sources/Extension/NotificationName+.swift rename to Core/Sources/Notification/NotificationName+.swift index 8e7c994b..1f49b4cb 100644 --- a/Common/Sources/Extension/NotificationName+.swift +++ b/Core/Sources/Notification/NotificationName+.swift @@ -1,8 +1,8 @@ // // NotificationName+.swift -// Common +// Core // -// Created by 한지석 on 7/19/24. +// Created by 한지석 on 9/13/24. // Copyright © 2024 com.recordy. All rights reserved. // diff --git a/Presentation/Project.swift b/Presentation/Project.swift index 4dab7d1d..8fb1103a 100644 --- a/Presentation/Project.swift +++ b/Presentation/Project.swift @@ -16,13 +16,7 @@ let project = Project.makeModule( product: .staticFramework, bundleId: moduleName, dependencies: [ - .Project.Core, .Project.Common, - .external(name: "SnapKit", condition: .none), - .external(name: "Then", condition: .none), - .external(name: "RxSwift", condition: .none), - .external(name: "RxCocoa", condition: .none), .external(name: "Lottie", condition: .none), - .external(name: "Kingfisher", condition: .none) ] )