fixup

Author: tomerd

Package.swift

@@ -518,7 +518,6 @@ let package = Package(
             name: "SPMTestSupport",
             dependencies: [
                 "Basics",
-                "Build",
                 "PackageFingerprint",
                 "PackageGraph",
                 "PackageLoading",

Sources/Build/BuildPlan/BuildPlan.swift

@@ -239,9 +239,9 @@ public class BuildPlan: SPMBuildCore.BuildPlan {
     public init(
         buildParameters: BuildParameters,
         graph: PackageGraph,
-        additionalFileRules: [FileRuleDescription],
-        buildToolPluginInvocationResults: [ResolvedTarget: [BuildToolPluginInvocationResult]],
-        prebuildCommandResults: [ResolvedTarget: [PrebuildCommandResult]],
+        additionalFileRules: [FileRuleDescription] = [],
+        buildToolPluginInvocationResults: [ResolvedTarget: [BuildToolPluginInvocationResult]] = [:],
+        prebuildCommandResults: [ResolvedTarget: [PrebuildCommandResult]] = [:],
         fileSystem: FileSystem,
         observabilityScope: ObservabilityScope
     ) throws {

Sources/SPMTestSupport/misc.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import Basics
-import Build
 import struct Foundation.URL
 #if os(macOS)
 import class Foundation.Bundle
@@ -409,22 +408,3 @@ extension InitPackage {
         )
     }
 }
-
-extension BuildPlan {
-    public convenience init(
-        buildParameters: BuildParameters,
-        graph: PackageGraph,
-        fileSystem: FileSystem,
-        observabilityScope: ObservabilityScope
-    ) throws {
-        try self.init(
-            buildParameters: buildParameters,
-            graph: graph,
-            additionalFileRules: [],
-            buildToolPluginInvocationResults: [:],
-            prebuildCommandResults: [:],
-            fileSystem: fileSystem,
-            observabilityScope: observabilityScope
-        )
-    }
-}