Skip to content

Commit

Permalink
Merge pull request #14 from baekteun/13-tuist-4x-version-upgrade
Browse files Browse the repository at this point in the history
๐Ÿ”€ :: [#13] Tuist 4.x ๋ฒ„์ „ ์—…๊ทธ๋ ˆ์ด๋“œ
  • Loading branch information
baekteun committed Apr 19, 2024
2 parents ce2b111 + 288951a commit d5676db
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 37 deletions.
3 changes: 3 additions & 0 deletions .mise.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[tools]
tuist = "4.9.0"

1 change: 0 additions & 1 deletion .tuist-version

This file was deleted.

22 changes: 22 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// swift-tools-version:5.7
import PackageDescription

#if TUIST
import ProjectDescription
import ProjectDescriptionHelpers

let packageSetting = PackageSettings(
baseSettings: .settings(
configurations: [
.debug(name: .dev),
.debug(name: .stage),
.release(name: .prod)
]
)
)
#endif

let package = Package(
name: "Package",
dependencies: []
)
8 changes: 4 additions & 4 deletions Projects/App/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ let settings: Settings = .settings(
let scripts: [TargetScript] = generateEnvironment.scripts

let targets: [Target] = [
.init(
.target(
name: env.name,
destinations: env.destinations,
product: .app,
Expand All @@ -32,7 +32,7 @@ let targets: [Target] = [
]

let schemes: [Scheme] = [
.init(
.scheme(
name: "\(env.name)-DEV",
shared: true,
buildAction: .buildAction(targets: ["\(env.name)"]),
Expand All @@ -41,7 +41,7 @@ let schemes: [Scheme] = [
profileAction: .profileAction(configuration: .dev),
analyzeAction: .analyzeAction(configuration: .dev)
),
.init(
.scheme(
name: "\(env.name)-STAGE",
shared: true,
buildAction: .buildAction(targets: ["\(env.name)"]),
Expand All @@ -50,7 +50,7 @@ let schemes: [Scheme] = [
profileAction: .profileAction(configuration: .stage),
analyzeAction: .analyzeAction(configuration: .stage)
),
.init(
.scheme(
name: "\(env.name)-PROD",
shared: true,
buildAction: .buildAction(targets: ["\(env.name)"]),
Expand Down
6 changes: 3 additions & 3 deletions Scripts/NewDependency.swift
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ signal(SIGINT, handleSIGINT)
}

func registerDependenciesSwift(url: String, version: String) {
let filePath = currentPath + "Tuist/Dependencies.swift"
let findingString = " swiftPackageManager: SwiftPackageManagerDependencies(\n [\n"
let inserting = " .remote(url: \"\(url)\", requirement: .exact(\"\(version)\")),\n"
let filePath = currentPath + "Package.swift"
let findingString = " dependencies: [\n"
let inserting = " .package(url: \"\(url)\", from: \"\(version)\"),\n"
updateFileContent(filePath: filePath, finding: findingString, inserting: inserting)
}

Expand Down
19 changes: 0 additions & 19 deletions Tuist/Dependencies.swift

This file was deleted.

12 changes: 6 additions & 6 deletions Tuist/ProjectDescriptionHelpers/Project/Project+makeModule.swift
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public extension Project {
if targets.contains(.interface) {
dependencies.append(.target(name: "\(name)Interface"))
allTargets.append(
Target(
Target.target(
name: "\(name)Interface",
destinations: destinations,
product: .framework,
Expand All @@ -79,7 +79,7 @@ public extension Project {

// MARK: - Sources
allTargets.append(
Target(
Target.target(
name: name,
destinations: destinations,
product: product,
Expand All @@ -96,7 +96,7 @@ public extension Project {
// MARK: - Testing
if targets.contains(.testing) && targets.contains(.interface) {
allTargets.append(
Target(
Target.target(
name: "\(name)Testing",
destinations: destinations,
product: .framework,
Expand Down Expand Up @@ -124,7 +124,7 @@ public extension Project {
// MARK: - Unit Test
if targets.contains(.unitTest) {
allTargets.append(
Target(
Target.target(
name: "\(name)Tests",
destinations: destinations,
product: .unitTests,
Expand All @@ -141,7 +141,7 @@ public extension Project {
// MARK: - UI Test
if targets.contains(.uiTest) {
allTargets.append(
Target(
Target.target(
name: "\(name)UITests",
destinations: destinations,
product: .uiTests,
Expand All @@ -162,7 +162,7 @@ public extension Project {
demoDependencies.append(.target(name: "\(name)Testing"))
}
allTargets.append(
Target(
Target.target(
name: "\(name)DemoApp",
destinations: destinations,
product: .app,
Expand Down
5 changes: 2 additions & 3 deletions Tuist/ProjectDescriptionHelpers/Scheme/Scheme+Template.swift
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import ProjectDescription
import ProjectDescriptionHelpers

extension Scheme {
static func makeScheme(target: ConfigurationName, name: String) -> Scheme {
return Scheme(
return Scheme.scheme(
name: name,
shared: true,
buildAction: .buildAction(targets: ["\(name)"]),
Expand All @@ -20,7 +19,7 @@ extension Scheme {
}

static func makeDemoScheme(target: ConfigurationName, name: String) -> Scheme {
return Scheme(
return Scheme.scheme(
name: name,
shared: true,
buildAction: .buildAction(targets: ["\(name)Demo"]),
Expand Down
2 changes: 1 addition & 1 deletion Tuist/ProjectDescriptionHelpers/Target/TargetSpec.swift
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public struct TargetSpec: Configurable {
}

func toTarget(with name: String, product: Product? = nil) -> Target {
Target(
Target.target(
name: name,
destinations: destinations,
product: product ?? self.product,
Expand Down

0 comments on commit d5676db

Please sign in to comment.