Skip to content

adjust to swiftpm api change #808

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Sep 5, 2023
Merged

adjust to swiftpm api change #808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public final class SwiftPMWorkspace {
}

self.buildParameters = try BuildParameters(
dataPath: location.scratchDirectory.appending(component: toolchain.targetTriple.platformBuildPathComponent()),
dataPath: location.scratchDirectory.appending(component: toolchain.targetTriple.platformBuildPathComponent),
configuration: buildConfiguration,
toolchain: toolchain,
flags: buildSetup.flags
Expand Down
6 changes: 3 additions & 3 deletions Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {

let aswift = packageRoot.appending(components: "Sources", "lib", "a.swift")
let hostTriple = ws.buildParameters.targetTriple
let build = buildPath(root: packageRoot, platform: hostTriple.platformBuildPathComponent())
let build = buildPath(root: packageRoot, platform: hostTriple.platformBuildPathComponent)

XCTAssertEqual(ws.buildPath, build)
XCTAssertNotNil(ws.indexStorePath)
Expand Down Expand Up @@ -163,7 +163,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {

let aswift = packageRoot.appending(components: "Sources", "lib", "a.swift")
let hostTriple = ws.buildParameters.targetTriple
let build = buildPath(root: packageRoot, config: config, platform: hostTriple.platformBuildPathComponent())
let build = buildPath(root: packageRoot, config: config, platform: hostTriple.platformBuildPathComponent)

XCTAssertEqual(ws.buildPath, build)
let arguments = try ws._settings(for: aswift.asURI, .swift)!.compilerArguments
Expand Down Expand Up @@ -350,7 +350,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {
let acxx = packageRoot.appending(components: "Sources", "lib", "a.cpp")
let bcxx = packageRoot.appending(components: "Sources", "lib", "b.cpp")
let hostTriple = ws.buildParameters.targetTriple
let build = buildPath(root: packageRoot, platform: hostTriple.platformBuildPathComponent())
let build = buildPath(root: packageRoot, platform: hostTriple.platformBuildPathComponent)

XCTAssertEqual(ws.buildPath, build)
XCTAssertNotNil(ws.indexStorePath)
Expand Down