Skip to content

Commit f0d1b7f

Browse files
committed
Update based on PR feedback
1 parent f66825c commit f0d1b7f

File tree

4 files changed

+0
-8
lines changed

4 files changed

+0
-8
lines changed

Sources/Build/BuildOperation.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,6 @@ public final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildS
399399
public func build(subset: BuildSubset, buildOutputs: [BuildOutput]) async throws -> BuildResult {
400400
var result = BuildResult(
401401
serializedDiagnosticPathsByTargetName: .failure(StringError("Building was skipped")),
402-
packageGraph: try await self.getPackageGraph(),
403402
replArguments: nil,
404403
)
405404

@@ -464,7 +463,6 @@ public final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildS
464463

465464
result = BuildResult(
466465
serializedDiagnosticPathsByTargetName: result.serializedDiagnosticPathsByTargetName,
467-
packageGraph: result.packageGraph,
468466
symbolGraph: result.symbolGraph,
469467
buildPlan: buildResultBuildPlan,
470468
replArguments: buildResultReplArgs,

Sources/SPMBuildCore/BuildSystem/BuildSystem.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,20 +97,17 @@ public typealias CLIArguments = [String]
9797
public struct BuildResult {
9898
package init(
9999
serializedDiagnosticPathsByTargetName: Result<[String: [AbsolutePath]], Error>,
100-
packageGraph: ModulesGraph,
101100
symbolGraph: SymbolGraphResult? = nil,
102101
buildPlan: BuildPlan? = nil,
103102
replArguments: CLIArguments?
104103
) {
105104
self.serializedDiagnosticPathsByTargetName = serializedDiagnosticPathsByTargetName
106-
self.packageGraph = packageGraph
107105
self.symbolGraph = symbolGraph
108106
self.buildPlan = buildPlan
109107
self.replArguments = replArguments
110108
}
111109

112110
public let replArguments: CLIArguments?
113-
public let packageGraph: ModulesGraph
114111
public let symbolGraph: SymbolGraphResult?
115112
public let buildPlan: BuildPlan?
116113

Sources/SwiftBuildSupport/SwiftBuildSystem.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,6 @@ public final class SwiftBuildSystem: SPMBuildCore.BuildSystem {
345345
guard !buildParameters.shouldSkipBuilding else {
346346
return BuildResult(
347347
serializedDiagnosticPathsByTargetName: .failure(StringError("Building was skipped")),
348-
packageGraph: try await self.getPackageGraph(),
349348
replArguments: nil,
350349
)
351350
}
@@ -588,7 +587,6 @@ public final class SwiftBuildSystem: SPMBuildCore.BuildSystem {
588587

589588
return BuildResult(
590589
serializedDiagnosticPathsByTargetName: .success(serializedDiagnosticPathsByTargetName),
591-
packageGraph: try await self.getPackageGraph(),
592590
symbolGraph: SymbolGraphResult(
593591
outputLocationForTarget: { target, buildParameters in
594592
return ["\(buildParameters.triple.archName)", "\(target).symbolgraphs"]

Sources/XCBuildSupport/XcodeBuildSystem.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ public final class XcodeBuildSystem: SPMBuildCore.BuildSystem {
163163
public func build(subset: BuildSubset, buildOutputs: [BuildOutput]) async throws -> BuildResult {
164164
let buildResult = BuildResult(
165165
serializedDiagnosticPathsByTargetName: .failure(StringError("XCBuild does not support reporting serialized diagnostics.")),
166-
packageGraph: try await self.getPackageGraph(),
167166
replArguments: nil,
168167
)
169168

0 commit comments

Comments
 (0)