Skip to content

Commit ae152de

Browse files
authored
Merge pull request #1609 from AndrewHoos/asyncGraphLoading
Adopt new async (but not yet swift 6) methods from SwiftPM
2 parents 0d2a159 + a516809 commit ae152de

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import Basics
14-
import Build
14+
@preconcurrency import Build
1515
import BuildServerProtocol
1616
import Dispatch
1717
import Foundation
1818
import LanguageServerProtocol
19-
import PackageGraph
19+
@preconcurrency import PackageGraph
2020
import PackageLoading
2121
import PackageModel
2222
import SKLogging
@@ -26,7 +26,7 @@ import SourceControl
2626
import SourceKitLSPAPI
2727
import SwiftExtensions
2828
import ToolchainRegistry
29-
import Workspace
29+
@preconcurrency import Workspace
3030

3131
import struct Basics.AbsolutePath
3232
import struct Basics.IdentifiableSet
@@ -42,7 +42,7 @@ import class ToolchainRegistry.Toolchain
4242
fileprivate typealias AbsolutePath = Basics.AbsolutePath
4343

4444
#if canImport(SPMBuildCore)
45-
import SPMBuildCore
45+
@preconcurrency import SPMBuildCore
4646
#endif
4747

4848
/// Parameter of `reloadPackageStatusCallback` in ``SwiftPMWorkspace``.
@@ -374,13 +374,13 @@ extension SwiftPMBuildSystem {
374374
}
375375
}
376376

377-
let modulesGraph = try self.workspace.loadPackageGraph(
377+
let modulesGraph = try await self.workspace.loadPackageGraph(
378378
rootInput: PackageGraphRootInput(packages: [AbsolutePath(projectRoot)]),
379379
forceResolvedVersions: forceResolvedVersions,
380380
observabilityScope: observabilitySystem.topScope
381381
)
382382

383-
let plan = try BuildPlan(
383+
let plan = try await BuildPlan(
384384
destinationBuildParameters: destinationBuildParameters,
385385
toolsBuildParameters: toolsBuildParameters,
386386
graph: modulesGraph,

0 commit comments

Comments
 (0)