Skip to content
Open
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 Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source "https://rubygems.org"

gem 'fastlane', '~> 2.227.1'
gem 'fastlane', '~> 2.228.0'
#em 'google-cloud-env', '< 2.0.0' # 충돌 방지
gem "logger"
gem "abbrev"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ GEM
faraday_middleware (1.2.1)
faraday (~> 1.0)
fastimage (2.4.0)
fastlane (2.227.1)
fastlane (2.228.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand Down Expand Up @@ -223,7 +223,7 @@ PLATFORMS

DEPENDENCIES
abbrev
fastlane (~> 2.227.1)
fastlane (~> 2.228.0)
logger
mutex_m

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@ public extension ModulePath {
case Presentation
case Splash
case Auth
case Management
case Profile
case Member
case Management

public static let name: String = "Presentation"

}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,32 +45,32 @@ public extension ProjectDescription.Path {
// MARK: - Network
public extension ProjectDescription.Path {
static var Networking: Self {
return .relativeToRoot("Projects/\(ModulePath.Cores.name)/\(ModulePath.Networks.name)")
return .relativeToRoot("Projects/\(ModulePath.Networks.name)")
}

static func Network(implementation module: ModulePath.Networks) -> Self {
return .relativeToRoot("Projects/\(ModulePath.Cores.name)/\(ModulePath.Networks.name)/\(module.rawValue)")
return .relativeToRoot("Projects/\(ModulePath.Networks.name)/\(module.rawValue)")
}
}

// MARK: - Domain
public extension ProjectDescription.Path {
static var Domain: Self {
return .relativeToRoot("Projects/\(ModulePath.Cores.name)/\(ModulePath.Domains.name)")
return .relativeToRoot("Projects/\(ModulePath.Domains.name)")
}

static func Domain(implementation module: ModulePath.Domains) -> Self {
return .relativeToRoot("Projects/\(ModulePath.Cores.name)/\(ModulePath.Domains.name)/\(module.rawValue)")
return .relativeToRoot("Projects/\(ModulePath.Domains.name)/\(module.rawValue)")
}
}

// MARK: - Data
public extension ProjectDescription.Path {
static var Data: Self {
return .relativeToRoot("Projects/\(ModulePath.Cores.name)/\(ModulePath.Datas.name)")
return .relativeToRoot("Projects/\(ModulePath.Datas.name)")
}

static func Data(implementation module: ModulePath.Datas) -> Self {
return .relativeToRoot("Projects/\(ModulePath.Cores.name)/\(ModulePath.Datas.name)/\(module.rawValue)")
return .relativeToRoot("Projects/\(ModulePath.Datas.name)/\(module.rawValue)")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ public extension Project {
resources: ProjectDescription.ResourceFileElements? = nil,
infoPlist: ProjectDescription.InfoPlist = .default,
entitlements: ProjectDescription.Entitlements? = nil,
schemes: [ProjectDescription.Scheme] = []
schemes: [ProjectDescription.Scheme] = [],
hasTests: Bool = false
) -> Project {

let appTarget: Target = .target(
Expand Down Expand Up @@ -84,18 +85,21 @@ public extension Project {
dependencies: dependencies
)

let appTestTarget : Target = .target(
name: "\(name)Tests",
destinations: destinations,
product: .unitTests,
bundleId: "\(bundleId).\(name)Tests",
deploymentTargets: deploymentTarget,
infoPlist: .default,
sources: ["\(name)Tests/Sources/**"],
dependencies: [.target(name: name)]
)

let targets = [appTarget, appDevTarget, appStageTarget, appProdTarget ,appTestTarget]
var targets: [Target] = [appTarget, appDevTarget, appStageTarget, appProdTarget]

if hasTests {
let appTestTarget : Target = .target(
name: "\(name)Tests",
destinations: destinations,
product: .unitTests,
bundleId: "\(bundleId).\(name)Tests",
deploymentTargets: deploymentTarget,
infoPlist: .default,
sources: ["Tests/Sources/**"],
dependencies: [.target(name: name)]
)
targets.append(appTestTarget)
}

return Project(
name: name,
Expand Down Expand Up @@ -125,7 +129,8 @@ public extension Project {
resources: ProjectDescription.ResourceFileElements? = nil,
infoPlist: ProjectDescription.InfoPlist = .default,
entitlements: ProjectDescription.Entitlements? = nil,
schemes: [ProjectDescription.Scheme] = []
schemes: [ProjectDescription.Scheme] = [],
hasTests: Bool = false
) -> Project {

let appTarget: Target = .target(
Expand All @@ -141,33 +146,22 @@ public extension Project {
scripts: scripts,
dependencies: dependencies
)

let appDevTarget: Target = .target(
name: "\(name)-QA",
destinations: destinations,
product: product,
bundleId: "\(bundleId)",
deploymentTargets: deploymentTarget,
infoPlist: infoPlist,
sources: sources,
resources: resources,
entitlements: entitlements,
scripts: scripts,
dependencies: dependencies
)

let appTestTarget : Target = .target(
name: "\(name)Tests",
destinations: destinations,
product: .unitTests,
bundleId: "\(bundleId).\(name)Tests",
deploymentTargets: deploymentTarget,
infoPlist: .default,
sources: ["\(name)Tests/Sources/**"],
dependencies: [.target(name: name)]
)

let targets = [appTarget, appDevTarget, appTestTarget]

var targets: [Target] = [appTarget]

if hasTests {
let appTestTarget : Target = .target(
name: "\(name)Tests",
destinations: destinations,
product: .unitTests,
bundleId: "\(bundleId).\(name)Tests",
deploymentTargets: deploymentTarget,
infoPlist: .default,
sources: ["Tests/Sources/**"],
dependencies: [.target(name: name)]
)
targets.append(appTestTarget)
}

return Project(
name: name,
Expand Down
1 change: 0 additions & 1 deletion Projects/App/Sources/Di/ Extension+RegisterModule..swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import WeaveDI
import Core
import Repository

public extension RegisterModule {

Expand Down
133 changes: 0 additions & 133 deletions Projects/App/Sources/Di/Extension+RegisterModule.swift

This file was deleted.

8 changes: 5 additions & 3 deletions Projects/App/Sources/Reducer/AppReducer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ struct AppReducer {
enum State {
case splash(Splash.State)
case auth(AuthCoordinator.State)
case coreMember(CoreMemberCoordinator.State)
case coreMember(ManagementCoordinator.State)
case member(MemberCoordinator.State)

init() {
Expand All @@ -36,7 +36,7 @@ struct AppReducer {

case splash(Splash.Action)
case auth(AuthCoordinator.Action)
case coreMember(CoreMemberCoordinator.Action)
case coreMember(ManagementCoordinator.Action)
case member(MemberCoordinator.Action)
}

Expand All @@ -56,13 +56,15 @@ struct AppReducer {
AuthCoordinator()
}
.ifCaseLet(\.coreMember, action: \.view.coreMember) {
CoreMemberCoordinator()
ManagementCoordinator()
}
.ifCaseLet(\.member, action: \.view.member) {
MemberCoordinator()
}
}
}

extension AppReducer {
func handleViewAction(
_ state: inout State,
action: View
Expand Down
2 changes: 1 addition & 1 deletion Projects/App/Sources/View/AppView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ struct AppView: View {

case .coreMember:
if let store = store.scope(state: \.coreMember, action: \.view.coreMember) {
CoreMemberCoordinatorView(store: store)
ManagementCoordinatorView(store: store)
}

case .member:
Expand Down
2 changes: 1 addition & 1 deletion Projects/Core/Core/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import ProjectTemplatePlugin
import ProjectTemplatePlugin
import DependencyPackagePlugin

let project = Project.makeAppModule(
let project = Project.makeModule(
name: "Core",
bundleId: .appBundleID(name: ".Core"),
product: .staticFramework,
Expand Down
3 changes: 3 additions & 0 deletions Projects/Core/Core/Sources/CoreExported/CoreExported.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@
@_exported import Networks
@_exported import UseCase
@_exported import DomainInterface
@_exported import Model
@_exported import Repository

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import DependencyPlugin
import ProjectTemplatePlugin
import DependencyPackagePlugin

let project = Project.makeAppModule(
let project = Project.makeModule(
name: "API",
bundleId: .appBundleID(name: ".API"),
product: .staticFramework,
Expand Down
Loading