From cc042839eeadd34b3e806ffc75812fed5a40b0a7 Mon Sep 17 00:00:00 2001 From: Michael Rawdon Date: Tue, 2 Sep 2025 14:08:55 -0700 Subject: [PATCH 1/5] Fix build warning about obsolete use of await. rdar://159492256 --- Sources/SWBCore/BuildRequestContext.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/SWBCore/BuildRequestContext.swift b/Sources/SWBCore/BuildRequestContext.swift index bcfddde6..b7e3a3a3 100644 --- a/Sources/SWBCore/BuildRequestContext.swift +++ b/Sources/SWBCore/BuildRequestContext.swift @@ -101,7 +101,7 @@ public final class BuildRequestContext: Sendable { [Path("\(name).framework/\(name)"), Path("/\(name).framework/Versions/A/\(name)")] }) - for platformExtension in await workspaceContext.core.pluginManager.extensions(of: PlatformInfoExtensionPoint.self) { + for platformExtension in workspaceContext.core.pluginManager.extensions(of: PlatformInfoExtensionPoint.self) { suffixes.append(contentsOf: platformExtension.additionalKnownTestLibraryPathSuffixes()) } return suffixes From 3886e79b0653dcadf2f92570090b9b62af758cdc Mon Sep 17 00:00:00 2001 From: Michael Rawdon Date: Tue, 2 Sep 2025 14:10:06 -0700 Subject: [PATCH 2/5] Fix build warning about obsolete use of await. rdar://159492261 --- Tests/SWBAndroidPlatformTests/SWBAndroidPlatformTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/SWBAndroidPlatformTests/SWBAndroidPlatformTests.swift b/Tests/SWBAndroidPlatformTests/SWBAndroidPlatformTests.swift index 3a808d48..6e3a3129 100644 --- a/Tests/SWBAndroidPlatformTests/SWBAndroidPlatformTests.swift +++ b/Tests/SWBAndroidPlatformTests/SWBAndroidPlatformTests.swift @@ -95,7 +95,7 @@ fileprivate struct AndroidBuildOperationTests: CoreBasedTests { ), ]) let core = try await getCore() - let androidExtension = try await #require(core.pluginManager.extensions(of: SDKRegistryExtensionPoint.self).compactMap { $0 as? AndroidSDKRegistryExtension }.only) + let androidExtension = try #require(core.pluginManager.extensions(of: SDKRegistryExtensionPoint.self).compactMap { $0 as? AndroidSDKRegistryExtension }.only) let (_, androidNdk) = try #require(await androidExtension.plugin.effectiveInstallation(host: core.hostOperatingSystem)) if androidNdk.version < Version(27) && arch == "riscv64" { return // riscv64 support was introduced in NDK r27 From b366f998d7468877870ccb6f0926b96bc6277599 Mon Sep 17 00:00:00 2001 From: Michael Rawdon Date: Tue, 2 Sep 2025 14:11:39 -0700 Subject: [PATCH 3/5] Fix build warnings about obsolete use of await. rdar://159492319 --- .../FilesBasedBuildPhaseTaskProducer.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/FilesBasedBuildPhaseTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/FilesBasedBuildPhaseTaskProducer.swift index 0a76ccfb..37612eb5 100644 --- a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/FilesBasedBuildPhaseTaskProducer.swift +++ b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/FilesBasedBuildPhaseTaskProducer.swift @@ -614,7 +614,7 @@ package class FilesBasedBuildPhaseTaskProducerBase: PhasedTaskProducer { // Reorder resolvedBuildFiles so that file types which compile to Swift appear first in the list and so are processed first. // This is needed because generated sources aren't added to the the main source code list. // rdar://102834701 (File grouping for 'collection groups' is sensitive to ordering of build phase members) - let compileToSwiftFileTypes = await context.workspaceContext.core.pluginManager.fileTypesProducingGeneratedSources() + let compileToSwiftFileTypes = context.workspaceContext.core.pluginManager.fileTypesProducingGeneratedSources() var compileToSwiftFiles = [ResolvedBuildFile]() var otherBuildFiles = [ResolvedBuildFile]() for resolvedBuildFile in resolvedBuildFiles { @@ -792,7 +792,7 @@ package class FilesBasedBuildPhaseTaskProducerBase: PhasedTaskProducer { return [] } - let fileIdentifiersGeneratingSources = await context.workspaceContext.core.pluginManager.fileTypesProducingGeneratedSources() + let fileIdentifiersGeneratingSources = context.workspaceContext.core.pluginManager.fileTypesProducingGeneratedSources() guard !fileIdentifiersGeneratingSources.isEmpty else { return [] } From 683fd25d29aab78a4aefe404decb840609baf327 Mon Sep 17 00:00:00 2001 From: Michael Rawdon Date: Tue, 2 Sep 2025 14:14:52 -0700 Subject: [PATCH 4/5] Fix build warnings about obsolete use of await. rdar://159492383 --- Sources/SWBCore/ToolchainRegistry.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/SWBCore/ToolchainRegistry.swift b/Sources/SWBCore/ToolchainRegistry.swift index b701b11e..f3e1a081 100644 --- a/Sources/SWBCore/ToolchainRegistry.swift +++ b/Sources/SWBCore/ToolchainRegistry.swift @@ -286,7 +286,7 @@ public final class Toolchain: Hashable, Sendable { path.join("usr").join("bin"), ] - for platformExtension in await pluginManager.extensions(of: PlatformInfoExtensionPoint.self) { + for platformExtension in pluginManager.extensions(of: PlatformInfoExtensionPoint.self) { executableSearchPaths.append(contentsOf: platformExtension.additionalToolchainExecutableSearchPaths(toolchainIdentifier: identifier, toolchainPath: path)) } @@ -450,7 +450,7 @@ public final class ToolchainRegistry: @unchecked Sendable { var fs: any FSProxy } - for toolchainExtension in await delegate.pluginManager.extensions(of: ToolchainRegistryExtensionPoint.self) { + for toolchainExtension in delegate.pluginManager.extensions(of: ToolchainRegistryExtensionPoint.self) { do { for toolchain in try await toolchainExtension.additionalToolchains(context: Context(hostOperatingSystem: hostOperatingSystem, toolchainRegistry: self, fs: fs)) { try register(toolchain) From 1dcd69c173f88605994d1b75789708429640aafd Mon Sep 17 00:00:00 2001 From: Michael Rawdon Date: Tue, 2 Sep 2025 14:23:20 -0700 Subject: [PATCH 5/5] Fix build warnings about obsolete use of await. rdar://159492437 --- .../OtherTaskProducers/XCTestProductTypeTaskProducer.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/XCTestProductTypeTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/XCTestProductTypeTaskProducer.swift index ca200f25..10ea802d 100644 --- a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/XCTestProductTypeTaskProducer.swift +++ b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/XCTestProductTypeTaskProducer.swift @@ -270,7 +270,7 @@ final class XCTestProductPostprocessingTaskProducer: PhasedTaskProducer, TaskPro Self.swiftTestingFrameworkPath(scope, context.platform, context.workspaceContext.fs) ] - for platformExtension in await context.workspaceContext.core.pluginManager.extensions(of: PlatformInfoExtensionPoint.self) { + for platformExtension in context.workspaceContext.core.pluginManager.extensions(of: PlatformInfoExtensionPoint.self) { frameworkPaths.append(contentsOf: platformExtension.additionalTestLibraryPaths(scope: scope, platform: context.platform, fs: context.workspaceContext.fs)) } @@ -471,7 +471,7 @@ final class XCTestHostTaskProducer: PhasedTaskProducer, TaskProducer { XCTestProductPostprocessingTaskProducer.swiftTestingFrameworkPath(scope, context.platform, context.workspaceContext.fs) ] - for platformExtension in await context.workspaceContext.core.pluginManager.extensions(of: PlatformInfoExtensionPoint.self) { + for platformExtension in context.workspaceContext.core.pluginManager.extensions(of: PlatformInfoExtensionPoint.self) { srcPaths.append(contentsOf: platformExtension.additionalTestLibraryPaths(scope: scope, platform: context.platform, fs: context.workspaceContext.fs)) }