Skip to content

Commit 38d2ecc

Browse files
authored
Merge pull request swiftlang#344 from mattt/swiftpm-rename
Rename SwiftPMConfig to Workspace.Configuration
2 parents 40dfb8c + 84df7d3 commit 38d2ecc

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,29 +87,31 @@ public final class SwiftPMWorkspace {
8787

8888
let buildPath: AbsolutePath = buildSetup.path ?? packageRoot.appending(component: ".build")
8989

90+
let workspaceConfiguration = try Workspace.Configuration(path: packageRoot.appending(components: ".swiftpm", "config"), fs: fileSystem)
91+
9092
self.workspace = Workspace(
9193
dataPath: buildPath,
9294
editablesPath: packageRoot.appending(component: "Packages"),
9395
pinsFile: packageRoot.appending(component: "Package.resolved"),
9496
manifestLoader: ManifestLoader(manifestResources: toolchain.manifestResources, cacheDir: buildPath),
9597
delegate: BuildSettingProviderWorkspaceDelegate(),
96-
config: SwiftPMConfig(path: packageRoot.appending(components: ".swiftpm", "config"), fs: fileSystem),
98+
config: workspaceConfiguration,
9799
fileSystem: fileSystem,
98100
skipUpdate: true)
99101

100102
let triple = toolchain.triple
101103

102-
let swiftPMConfiguration: PackageModel.BuildConfiguration
104+
let buildConfiguration: PackageModel.BuildConfiguration
103105
switch buildSetup.configuration {
104106
case .debug:
105-
swiftPMConfiguration = .debug
107+
buildConfiguration = .debug
106108
case .release:
107-
swiftPMConfiguration = .release
109+
buildConfiguration = .release
108110
}
109111

110112
self.buildParameters = BuildParameters(
111113
dataPath: buildPath.appending(component: triple.tripleString),
112-
configuration: swiftPMConfiguration,
114+
configuration: buildConfiguration,
113115
toolchain: toolchain,
114116
flags: buildSetup.flags)
115117

0 commit comments

Comments
 (0)