Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Chore] 순환 종속성 해결 후 빌드 되지 않는 문제 해결하기 #145

Merged
merged 3 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions App/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
5 changes: 0 additions & 5 deletions App/Sources/SceneDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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<APITarget.Users>.validateToken { login in
DispatchQueue.main.async {
var rootViewController: UIViewController
Expand Down
5 changes: 2 additions & 3 deletions Common/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
]
)
5 changes: 3 additions & 2 deletions Core/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
]
)
16 changes: 13 additions & 3 deletions Core/Sources/AWS/AWSS3Uploader.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import Foundation
import Photos

import Common
//import Common

import AWSS3

Expand Down Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down Expand Up @@ -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
}
}
2 changes: 1 addition & 1 deletion Core/Sources/Model/Keyword.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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.
//

Expand Down
Original file line number Diff line number Diff line change
@@ -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.
//

Expand Down
6 changes: 0 additions & 6 deletions Presentation/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p3
헉 .. 프레젠테이션 다 없어졌다
다음주에 설명 열심히 듣겠습니다
순환참조하는 방향?이 있는 것 같네요..!

)