mend

Author: tomerd

Sources/Commands/APIDigester.swift

@@ -33,12 +33,6 @@ struct APIDigesterBaselineDumper {
     /// The input build parameters.
     let inputBuildParameters: BuildParameters
 
-    /// The manifest loader.
-    //let manifestLoader: ManifestLoaderProtocol
-
-    /// The repository manager.
-    //let repositoryManager: RepositoryManager
-
     /// The API digester tool.
     let apiDigesterTool: SwiftAPIDigester
 
@@ -49,8 +43,6 @@ struct APIDigesterBaselineDumper {
         baselineRevision: Revision,
         packageRoot: AbsolutePath,
         buildParameters: BuildParameters,
-        //manifestLoader: ManifestLoaderProtocol,
-        //repositoryManager: RepositoryManager,
         apiDigesterTool: SwiftAPIDigester,
         diags: DiagnosticsEngine
     ) {
@@ -106,9 +98,7 @@ struct APIDigesterBaselineDumper {
 
         // Create the workspace for this package.
         let workspace = try Workspace(
-            forRootPackage: baselinePackageRoot//,
-            //manifestLoader: manifestLoader,
-            //repositoryManager: repositoryManager
+            forRootPackage: baselinePackageRoot
         )
 
         let graph = try workspace.loadPackageGraph(
@@ -124,7 +114,7 @@ struct APIDigesterBaselineDumper {
 
         // Update the data path input build parameters so it's built in the sandbox.
         var buildParameters = inputBuildParameters
-        buildParameters.dataPath = workspace.dataPath
+        buildParameters.dataPath = workspace.location.workingDirectory
 
         // Build the baseline module.
         let buildOp = BuildOperation(

Sources/Commands/SwiftPackageTool.swift

@@ -364,13 +364,10 @@ extension SwiftPackageTool {
             try buildOp.build()
 
             // Dump JSON for the baseline package.
-            //let workspace = try swiftTool.getActiveWorkspace()
             let baselineDumper = try APIDigesterBaselineDumper(
                 baselineRevision: baselineRevision,
                 packageRoot: swiftTool.getPackageRoot(),
                 buildParameters: buildOp.buildParameters,
-                //manifestLoader: workspace.manifestLoader,
-                //repositoryManager: workspace.repositoryManager,
                 apiDigesterTool: apiDigesterTool,
                 diags: swiftTool.diagnostics
             )

Sources/Commands/SwiftTool.swift

@@ -553,9 +553,11 @@ public class SwiftTool {
         let isXcodeBuildSystemEnabled = self.options.buildSystem == .xcode
         let workspace = try Workspace(
             fileSystem: localFileSystem,
-            dataPath: buildPath,
-            editablesPath: try editablesPath(),
-            resolvedVersionsFilePath: try resolvedVersionsFilePath(),
+            location: .init(
+                workingDirectory: buildPath,
+                editsDirectory: try editablesPath(),
+                resolvedVersionsFilePath: try resolvedVersionsFilePath()
+            ),
             cachePath: cachePath,
             netrcFilePath: try netrcFilePath(),
             mirrors: self.getMirrorsConfig().mirrors,
@@ -638,7 +640,7 @@ public class SwiftTool {
             // The `plugins` directory is inside the workspace's main data directory, and contains all temporary
             // files related to all plugins in the workspace.
             let buildEnvironment = try buildParameters().buildEnvironment
-            let dataDir = try self.getActiveWorkspace().dataPath
+            let dataDir = try self.getActiveWorkspace().location.workingDirectory
             let pluginsDir = dataDir.appending(component: "plugins")
 
             // The `cache` directory is in the plugins directory and is where the plugin script runner caches

Sources/SPMTestSupport/MockWorkspace.swift

@@ -158,9 +158,11 @@ public final class MockWorkspace {
 
         let workspace = try Workspace(
             fileSystem: self.fs,
-            dataPath: self.sandbox.appending(component: ".build"),
-            editablesPath: self.sandbox.appending(component: "edits"),
-            resolvedVersionsFilePath: self.sandbox.appending(component: "Package.resolved"),
+            location: .init (
+                workingDirectory: self.sandbox.appending(component: ".build"),
+                editsDirectory: self.sandbox.appending(component: "edits"),
+                resolvedVersionsFilePath: self.sandbox.appending(component: "Package.resolved")
+            ),
             cachePath: self.fs.swiftPMCacheDirectory,
             mirrors: self.config.mirrors,
             customToolsVersion: self.toolsVersion,