Skip to content

Adopt new async (but not yet swift 6) methods from SwiftPM #1609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 6, 2024
Merged

Adopt new async (but not yet swift 6) methods from SwiftPM #1609

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
//===----------------------------------------------------------------------===//

import Basics
import Build
@preconcurrency import Build
import BuildServerProtocol
import Dispatch
import Foundation
import LanguageServerProtocol
import PackageGraph
@preconcurrency import PackageGraph
import PackageLoading
import PackageModel
import SKLogging
Expand All @@ -26,7 +26,7 @@ import SourceControl
import SourceKitLSPAPI
import SwiftExtensions
import ToolchainRegistry
import Workspace
@preconcurrency import Workspace

import struct Basics.AbsolutePath
import struct Basics.IdentifiableSet
Expand All @@ -42,7 +42,7 @@ import class ToolchainRegistry.Toolchain
fileprivate typealias AbsolutePath = Basics.AbsolutePath

#if canImport(SPMBuildCore)
import SPMBuildCore
@preconcurrency import SPMBuildCore
#endif

/// Parameter of `reloadPackageStatusCallback` in ``SwiftPMWorkspace``.
Expand Down Expand Up @@ -368,13 +368,13 @@ extension SwiftPMBuildSystem {
}
}

let modulesGraph = try self.workspace.loadPackageGraph(
let modulesGraph = try await self.workspace.loadPackageGraph(
rootInput: PackageGraphRootInput(packages: [AbsolutePath(projectRoot)]),
forceResolvedVersions: forceResolvedVersions,
observabilityScope: observabilitySystem.topScope
)

let plan = try BuildPlan(
let plan = try await BuildPlan(
destinationBuildParameters: destinationBuildParameters,
toolsBuildParameters: toolsBuildParameters,
graph: modulesGraph,
Expand Down