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

프로젝트 구조 변경 #50

Merged
merged 1 commit into from
Jul 23, 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
2 changes: 1 addition & 1 deletion Projects/App/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ let project = Project(
.project(target: "FeatureLogin", path: .relativeToRoot("Projects/Feature")),
.project(target: "FeaturePokit", path: .relativeToRoot("Projects/Feature")),
.project(target: "FeatureCategoryDetail", path: .relativeToRoot("Projects/Feature")),
.project(target: "Data", path: .relativeToRoot("Projects/Data"))
.external(name: "FirebaseMessaging")
],
settings: .settings
)
Expand Down
6 changes: 2 additions & 4 deletions Projects/CoreKit/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@ let coreKit: Target = .target(
name: "CoreKit",
destinations: .appDestinations,
// TODO: 프로젝트에 맞는 product로 변경해야 함
product: .framework,
product: TuistRelease.isRelease ? .staticFramework : .framework,
bundleId: .moduleBundleId(name: "CoreKit"),
deploymentTargets: .appMinimunTarget,
infoPlist: .file(path: .relativeToRoot("Projects/App/Resources/Pokit-info.plist")),
sources: ["Sources/**"],
dependencies: coreKitDependencies + [
.external(name: "GoogleSignIn")
],
dependencies: coreKitDependencies,
settings: .settings
)

Expand Down
2 changes: 1 addition & 1 deletion Projects/DSKit/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ let project = Project(
name: "DSKit",
destinations: .appDestinations,
// TODO: 프로젝트에 맞는 product로 변경해야 함
product: .framework,
product: TuistRelease.isRelease ? .staticFramework : .framework,
bundleId: .moduleBundleId(name: "DSKit"),
deploymentTargets: .appMinimunTarget,
infoPlist: .file(path: .relativeToRoot("Projects/App/Resources/Pokit-info.plist")),
Expand Down
33 changes: 0 additions & 33 deletions Projects/Data/Project.swift

This file was deleted.

8 changes: 0 additions & 8 deletions Projects/Data/Resources/Resource.swift

This file was deleted.

2 changes: 1 addition & 1 deletion Projects/Domain/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let project = Project(
name: "Domain",
destinations: .appDestinations,
// TODO: 프로젝트에 맞는 product로 변경해야 함
product: .framework,
product: TuistRelease.isRelease ? .staticFramework : .framework,
bundleId: .moduleBundleId(name: "Domain"),
deploymentTargets: .appMinimunTarget,
infoPlist: .file(path: .relativeToRoot("Projects/App/Resources/Pokit-info.plist")),
Expand Down
2 changes: 1 addition & 1 deletion Projects/SharedThirdPartyLib/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let project = Project(
name: "SharedThirdPartyLib",
destinations: .appDestinations,
// TODO: 프로젝트에 맞는 product로 변경해야 함
product: .framework,
product: TuistRelease.isRelease ? .staticFramework : .framework,
bundleId: .moduleBundleId(name: "SharedThirdPartyLib"),
deploymentTargets: .appMinimunTarget,
infoPlist: .file(path: .relativeToRoot("Projects/App/Resources/Pokit-info.plist")),
Expand Down
2 changes: 1 addition & 1 deletion Projects/Util/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let project = Project(
name: "Util",
destinations: .appDestinations,
// TODO: 프로젝트에 맞는 product로 변경해야 함
product: .framework,
product: TuistRelease.isRelease ? .staticFramework : .framework,
bundleId: .moduleBundleId(name: "Util"),
deploymentTargets: .appMinimunTarget,
infoPlist: .file(path: .relativeToRoot("Projects/App/Resources/Pokit-info.plist")),
Expand Down
4 changes: 2 additions & 2 deletions Tuist/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import PackageDescription
// Default is .staticFramework
// productTypes: ["Alamofire": .framework,]
productTypes: [
"GoogleSignIn": .framework,
"ComposableArchitecture": .framework
"GoogleSignInSwift": .framework,
"ComposableArchitecture": TuistRelease.isRelease ? .staticFramework : .framework
]
)
#endif
Expand Down
8 changes: 7 additions & 1 deletion Tuist/ProjectDescriptionHelpers/CoreKit.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public enum CoreKit: String, CaseIterable {
case core = "Core"
case coreNetwork = "CoreNetwork"
case coreLinkPresentation = "CoreLinkPresentation"
case data = "Data"

private var dependencies: [TargetDependency] {
switch self {
Expand All @@ -30,13 +31,18 @@ public enum CoreKit: String, CaseIterable {
.project(target: "Util", path: .relativeToRoot("Projects/Util")),
.project(target: "SharedThirdPartyLib", path: .relativeToRoot("Projects/SharedThirdPartyLib"))
]
case .data:
return [
.external(name: "GoogleSignInSwift"),
.project(target: "Core", path: .relativeToRoot("Projects/CoreKit"))
]
}
}

public var target: Target {
.makeChildTarget(
name: "\(self.rawValue)",
product: .framework,
product: TuistRelease.isRelease ? .staticFramework : .framework,
bundleName: "CoreKit.\(self.rawValue)",
dependencies: self.dependencies
)
Expand Down
1 change: 0 additions & 1 deletion Tuist/ProjectDescriptionHelpers/Feature.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ public enum Feature: String, CaseIterable {
product: TuistRelease.isRelease ? .staticFramework : .framework,
bundleName: "Feature.\(self.rawValue)",
infoPlist: .file(path: .relativeToRoot("Projects/App/Resources/Pokit-info.plist")),
resources: ["Feature\(self.rawValue)/Resources/**"],
dependencies: [
.project(target: "DSKit", path: .relativeToRoot("Projects/DSKit")),
.project(target: "Domain", path: .relativeToRoot("Projects/Domain"))
Expand Down
Binary file modified graph.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.