Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/SWBCore/BuildRequestContext.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Sources/SWBCore/ToolchainRegistry.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}

Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 []
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}

Expand Down Expand Up @@ -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))
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down