@@ -170,25 +170,19 @@ extension SwiftPackageTool {
170
170
171
171
func run( _ swiftTool: SwiftTool ) throws {
172
172
let workspace = try swiftTool. getActiveWorkspace ( )
173
- let root = try swiftTool. getWorkspaceRoot ( )
174
173
175
- let rootManifests = try temp_await {
176
- workspace . loadRootManifests ( packages : root . packages , diagnostics : swiftTool . observabilityScope . makeDiagnosticsEngine ( ) , completion : $0 )
174
+ guard let packagePath = try swiftTool . getWorkspaceRoot ( ) . packages . first else {
175
+ throw StringError ( " unknown package " )
177
176
}
178
- guard let rootManifest = rootManifests. values. first else {
179
- throw StringError ( " invalid manifests at \( root. packages) " )
177
+
178
+ let package = try tsc_await {
179
+ workspace. loadRootPackage (
180
+ at: packagePath,
181
+ observabilityScope: swiftTool. observabilityScope,
182
+ completion: $0
183
+ )
180
184
}
181
185
182
- let builder = PackageBuilder (
183
- identity: . plain( rootManifest. name) ,
184
- manifest: rootManifest,
185
- productFilter: . everything,
186
- path: try swiftTool. getPackageRoot ( ) ,
187
- xcTestMinimumDeploymentTargets: MinimumDeploymentTarget . default. xcTestMinimumDeploymentTargets,
188
- fileSystem: localFileSystem,
189
- observabilityScope: swiftTool. observabilityScope
190
- )
191
- let package = try builder. construct ( )
192
186
describe ( package , in: type, on: swiftTool. outputStream)
193
187
}
194
188
}
@@ -243,28 +237,18 @@ extension SwiftPackageTool {
243
237
244
238
// Get the root package.
245
239
let workspace = try swiftTool. getActiveWorkspace ( )
246
- let root = try swiftTool. getWorkspaceRoot ( )
247
- let rootManifests = try temp_await {
248
- workspace. loadRootManifests (
249
- packages: root. packages,
250
- diagnostics: swiftTool. observabilityScope. makeDiagnosticsEngine ( ) ,
240
+
241
+ guard let packagePath = try swiftTool. getWorkspaceRoot ( ) . packages. first else {
242
+ throw StringError ( " unknown package " )
243
+ }
244
+
245
+ let package = try tsc_await {
246
+ workspace. loadRootPackage (
247
+ at: packagePath,
248
+ observabilityScope: swiftTool. observabilityScope,
251
249
completion: $0
252
250
)
253
251
}
254
- guard let rootManifest = rootManifests. values. first else {
255
- throw StringError ( " invalid manifests at \( root. packages) " )
256
- }
257
-
258
- let builder = PackageBuilder (
259
- identity: . plain( rootManifest. name) ,
260
- manifest: rootManifest,
261
- productFilter: . everything,
262
- path: try swiftTool. getPackageRoot ( ) ,
263
- xcTestMinimumDeploymentTargets: [ : ] , // Minimum deployment target does not matter for this operation.
264
- fileSystem: localFileSystem,
265
- observabilityScope: swiftTool. observabilityScope
266
- )
267
- let package = try builder. construct ( )
268
252
269
253
// Use the user provided flags or default to formatting mode.
270
254
let formatOptions = swiftFormatFlags. isEmpty
@@ -278,7 +262,7 @@ extension SwiftPackageTool {
278
262
}
279
263
} . map { $0. pathString }
280
264
281
- let args = [ swiftFormat. pathString] + formatOptions + [ rootManifest . path . pathString] + paths
265
+ let args = [ swiftFormat. pathString] + formatOptions + [ packagePath . pathString] + paths
282
266
print ( " Running: " , args. map { $0. spm_shellEscaped ( ) } . joined ( separator: " " ) )
283
267
284
268
let result = try Process . popen ( arguments: args)
0 commit comments