From 86125a746096f98f59cd505774c5b6c64cc25033 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Tue, 18 Jul 2023 14:54:52 +0100 Subject: [PATCH] Use `SwiftSDK` instead of deprecated `Destination` Code utilizing libSwiftPM should use `SwiftSDK` instead, with a few other properties renamed for clarity on related types. In this PR specifically we should use new `targetTriple` instead of the deprecated `triple` on the `Toolchain` type. --- Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift b/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift index 1aa5421b9..251d601be 100644 --- a/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift +++ b/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift @@ -119,8 +119,8 @@ public final class SwiftPMWorkspace { throw Error.cannotDetermineHostToolchain } - let destination = try Destination.hostDestination(AbsolutePath(destinationToolchainBinDir)) - let toolchain = try UserToolchain(destination: destination) + let swiftSDK = try SwiftSDK.hostSwiftSDK(AbsolutePath(destinationToolchainBinDir)) + let toolchain = try UserToolchain(swiftSDK: swiftSDK) var location = try Workspace.Location( forRootPackage: AbsolutePath(packageRoot), @@ -139,8 +139,6 @@ public final class SwiftPMWorkspace { configuration: configuration, customHostToolchain: toolchain) - let triple = toolchain.triple - let buildConfiguration: PackageModel.BuildConfiguration switch buildSetup.configuration { case .debug: @@ -150,7 +148,7 @@ public final class SwiftPMWorkspace { } self.buildParameters = try BuildParameters( - dataPath: location.scratchDirectory.appending(component: triple.platformBuildPathComponent()), + dataPath: location.scratchDirectory.appending(component: toolchain.targetTriple.platformBuildPathComponent()), configuration: buildConfiguration, toolchain: toolchain, flags: buildSetup.flags