Use renamed async versions of the new methods

Author: plemarquand

Examples/package-info/Sources/package-info/example.swift

@@ -20,7 +20,7 @@ struct Example {
 
         let observability = ObservabilitySystem({ print("\($0): \($1)") })
 
-        let workspace = try await Workspace(forRootPackage: packagePath)
+        let workspace = try await Workspace.create(forRootPackage: packagePath)
 
         let manifest = try await workspace.loadRootManifest(at: packagePath, observabilityScope: observability.topScope)
 

Sources/Commands/PackageCommands/APIDiff.swift

@@ -284,7 +284,7 @@ struct APIDiff: AsyncSwiftCommand {
         try workingCopy.checkout(revision: baselineRevision)
 
         // Create the workspace for this package.
-        let workspace = try await Workspace(
+        let workspace = try await Workspace.create(
             forRootPackage: baselinePackageRoot,
             cancellator: swiftCommandState.cancellator
         )

Sources/Commands/Utilities/APIDigester.swift

@@ -114,7 +114,7 @@ struct APIDigesterBaselineDumper {
         try workingCopy.checkout(revision: baselineRevision)
 
         // Create the workspace for this package.
-        let workspace = try await Workspace(
+        let workspace = try await Workspace.create(
             forRootPackage: baselinePackageRoot,
             cancellator: swiftCommandState.cancellator
         )

Sources/CoreCommands/SwiftCommandState.swift

@@ -491,7 +491,7 @@ public final class SwiftCommandState {
             self.observabilityHandler.progress,
             self.observabilityHandler.prompt
         )
-        let workspace = try await Workspace(
+        let workspace = try await Workspace.create(
             fileSystem: self.fileSystem,
             location: .init(
                 scratchDirectory: self.scratchDirectory,
@@ -831,7 +831,7 @@ public final class SwiftCommandState {
             outputHandler: { print($0.description) }
         )
 
-        swiftSDK = try await SwiftSDK.deriveTargetSwiftSDK(
+        swiftSDK = try await SwiftSDK.deriveTargetSwiftSDKAsync(
             hostSwiftSDK: hostSwiftSDK,
             hostTriple: hostToolchain.targetTriple,
             customToolsets: self.options.locations.toolsetPaths,
@@ -851,17 +851,17 @@ public final class SwiftCommandState {
             return hostToolchain
         }
 
-        return try await UserToolchain(swiftSDK: swiftSDK, environment: self.environment, fileSystem: self.fileSystem)
+        return try await UserToolchain.create(swiftSDK: swiftSDK, environment: self.environment, fileSystem: self.fileSystem)
     }
 
     public func getHostToolchain() async throws -> UserToolchain {
-        var hostSwiftSDK = try await SwiftSDK.hostSwiftSDK(
+        var hostSwiftSDK = try await SwiftSDK.hostSwiftSDKAsync(
             environment: self.environment,
             observabilityScope: self.observabilityScope
         )
         hostSwiftSDK.targetTriple = self.hostTriple
 
-        return try await UserToolchain(
+        return try await UserToolchain.create(
             swiftSDK: hostSwiftSDK,
             environment: self.environment,
             customTargetInfo: targetInfo,

Sources/PackageModel/SwiftSDKs/SwiftSDK.swift

@@ -16,6 +16,7 @@ import TSCBasic
 
 import class Basics.AsyncProcess
 
+
 import struct TSCUtility.Version
 
 /// Errors related to Swift SDKs.
@@ -520,17 +521,16 @@ public struct SwiftSDK: Equatable {
     }
 
     /// The Swift SDK describing the host platform.
-    @available(*, deprecated, renamed: "hostSwiftSDK")
+    @available(*, deprecated, renamed: "hostSwiftSDKAsync")
     public static func hostDestination(
         _ binDir: Basics.AbsolutePath? = nil,
         originalWorkingDirectory: Basics.AbsolutePath? = nil,
         environment: Environment
     ) async throws -> SwiftSDK {
-        try await self.hostSwiftSDK(binDir, environment: environment)
+        try await self.hostSwiftSDKAsync(binDir, environment: environment)
     }
 
-    /// The Swift SDK for the host platform.
-    @available(*, deprecated, message: "Use the async alternative")
+    /// The Swift SDK for the host platform (synchronous version).
     public static func hostSwiftSDK(
         _ binDir: Basics.AbsolutePath? = nil,
         environment: Environment = .current,
@@ -545,8 +545,8 @@ public struct SwiftSDK: Equatable {
         )
     }
 
-    /// The Swift SDK for the host platform.
-    public static func hostSwiftSDK(
+    /// The Swift SDK for the host platform (asynchronous version).
+    public static func hostSwiftSDKAsync(
         _ binDir: Basics.AbsolutePath? = nil,
         environment: Environment = .current,
         observabilityScope: ObservabilityScope? = nil,
@@ -624,7 +624,7 @@ public struct SwiftSDK: Equatable {
         )
     }
 
-    /// Helper to get the SDK path for a Darwin platform (async version).
+    /// Helper to get the SDK path for a Darwin platform (sync version).
     private static func getSDKPath(
         for darwinPlatform: DarwinPlatform,
         environment: Environment
@@ -847,7 +847,7 @@ public struct SwiftSDK: Equatable {
         return nil
     }
 
-    /// Computes the target Swift SDK for the given options.
+    /// Computes the target Swift SDK for the given options (synchronous version).
     public static func deriveTargetSwiftSDK(
       hostSwiftSDK: SwiftSDK,
       hostTriple: Triple,
@@ -861,6 +861,51 @@ public struct SwiftSDK: Equatable {
       store: SwiftSDKBundleStore,
       observabilityScope: ObservabilityScope,
       fileSystem: FileSystem
+    ) throws -> SwiftSDK {
+        let semaphore = DispatchSemaphore(value: 0)
+        var result: Result<SwiftSDK, Error>!
+
+        Task {
+            do {
+                let sdk = try await deriveTargetSwiftSDKAsync(
+                    hostSwiftSDK: hostSwiftSDK,
+                    hostTriple: hostTriple,
+                    customToolsets: customToolsets,
+                    customCompileDestination: customCompileDestination,
+                    customCompileTriple: customCompileTriple,
+                    customCompileToolchain: customCompileToolchain,
+                    customCompileSDK: customCompileSDK,
+                    swiftSDKSelector: swiftSDKSelector,
+                    architectures: architectures,
+                    store: store,
+                    observabilityScope: observabilityScope,
+                    fileSystem: fileSystem
+                )
+                result = .success(sdk)
+            } catch {
+                result = .failure(error)
+            }
+            semaphore.signal()
+        }
+
+        semaphore.wait()
+        return try result.get()
+    }
+
+    /// Computes the target Swift SDK for the given options (async version).
+    public static func deriveTargetSwiftSDKAsync(
+      hostSwiftSDK: SwiftSDK,
+      hostTriple: Triple,
+      customToolsets: [Basics.AbsolutePath] = [],
+      customCompileDestination: Basics.AbsolutePath? = nil,
+      customCompileTriple: Triple? = nil,
+      customCompileToolchain: Basics.AbsolutePath? = nil,
+      customCompileSDK: Basics.AbsolutePath? = nil,
+      swiftSDKSelector: String? = nil,
+      architectures: [String] = [],
+      store: SwiftSDKBundleStore,
+      observabilityScope: ObservabilityScope,
+      fileSystem: FileSystem
     ) async throws -> SwiftSDK {
         var swiftSDK: SwiftSDK
         var isBasedOnHostSDK: Bool = false