[6.0] Cherry-pick recent NFC changes to reduce merge conflicts

CONTRIBUTORS.txt

@@ -291,7 +291,7 @@ needs to be listed here.
 - Quinn McHenry <[email protected]>
 - Rahul Malik <[email protected]>
 - Randy Becker <[email protected]>
-- Rauhul Varma <rauhul@users.noreply.github.com>
+- Rauhul Varma <rauhul@apple.com>
 - Renzo Crisóstomo <[email protected]>
 - Rich Ellis <[email protected]>
 - Rick Ballard <[email protected]>

Examples/package-info/Sources/package-info/example.swift

@@ -39,11 +39,11 @@ struct Example {
         print("Targets:", targets)
 
         // Package
-        let executables = package.targets.filter({ $0.type == .executable }).map({ $0.name })
+        let executables = package.modules.filter({ $0.type == .executable }).map({ $0.name })
         print("Executable targets:", executables)
 
         // PackageGraph
-        let numberOfFiles = graph.reachableTargets.reduce(0, { $0 + $1.sources.paths.count })
+        let numberOfFiles = graph.reachableModules.reduce(0, { $0 + $1.sources.paths.count })
         print("Total number of source files (including dependencies):", numberOfFiles)
     }
 }

Package.swift

@@ -169,7 +169,9 @@ let package = Package(
                 "SPMBuildCore"
             ],
             exclude: ["CMakeLists.txt"],
-            swiftSettings: [.enableExperimentalFeature("AccessLevelOnImport")]
+            swiftSettings: [
+                .enableExperimentalFeature("AccessLevelOnImport"),
+            ]
         ),
 
         // MARK: SwiftPM specific support libraries
@@ -188,6 +190,7 @@ let package = Package(
             exclude: ["CMakeLists.txt", "Vendor/README.md"],
             swiftSettings: [
                 .enableExperimentalFeature("StrictConcurrency"),
+                .enableExperimentalFeature("AccessLevelOnImport"),
             ]
         ),
 

Sources/Basics/Archiver/TarArchiver.swift

@@ -13,7 +13,6 @@
 import class Dispatch.DispatchQueue
 import struct Dispatch.DispatchTime
 import struct TSCBasic.FileSystemError
-import class TSCBasic.Process
 
 /// An `Archiver` that handles Tar archives using the command-line `tar` tool.
 public struct TarArchiver: Archiver {
@@ -58,7 +57,7 @@ public struct TarArchiver: Archiver {
                 throw FileSystemError(.notDirectory, destinationPath.underlying)
             }
 
-            let process = TSCBasic.Process(
+            let process = AsyncProcess(
                 arguments: [self.tarCommand, "zxf", archivePath.pathString, "-C", destinationPath.pathString]
             )
 
@@ -91,9 +90,10 @@ public struct TarArchiver: Archiver {
                 throw FileSystemError(.notDirectory, directory.underlying)
             }
 
-            let process = TSCBasic.Process(
+            let process = AsyncProcess(
                 arguments: [self.tarCommand, "acf", destinationPath.pathString, directory.basename],
-                workingDirectory: directory.parentDirectory.underlying
+                environment: .current,
+                workingDirectory: directory.parentDirectory
             )
 
             guard let registrationKey = self.cancellator.register(process) else {
@@ -121,7 +121,7 @@ public struct TarArchiver: Archiver {
                 throw FileSystemError(.noEntry, path.underlying)
             }
 
-            let process = TSCBasic.Process(arguments: [self.tarCommand, "tf", path.pathString])
+            let process = AsyncProcess(arguments: [self.tarCommand, "tf", path.pathString])
             guard let registrationKey = self.cancellator.register(process) else {
                 throw CancellationError.failedToRegisterProcess(process)
             }

Sources/Basics/Archiver/ZipArchiver.swift

@@ -12,7 +12,6 @@
 
 import Dispatch
 import struct TSCBasic.FileSystemError
-import class TSCBasic.Process
 
 /// An `Archiver` that handles ZIP archives using the command-line `zip` and `unzip` tools.
 public struct ZipArchiver: Archiver, Cancellable {
@@ -49,11 +48,9 @@ public struct ZipArchiver: Archiver, Cancellable {
             }
 
             #if os(Windows)
-            let process = TSCBasic
-                .Process(arguments: ["tar.exe", "xf", archivePath.pathString, "-C", destinationPath.pathString])
+            let process = AsyncProcess(arguments: ["tar.exe", "xf", archivePath.pathString, "-C", destinationPath.pathString])
             #else
-            let process = TSCBasic
-                .Process(arguments: ["unzip", archivePath.pathString, "-d", destinationPath.pathString])
+            let process = AsyncProcess(arguments: ["unzip", archivePath.pathString, "-d", destinationPath.pathString])
             #endif
             guard let registrationKey = self.cancellator.register(process) else {
                 throw CancellationError.failedToRegisterProcess(process)
@@ -85,10 +82,10 @@ public struct ZipArchiver: Archiver, Cancellable {
             }
 
             #if os(Windows)
-            let process = TSCBasic.Process(
+            let process = AsyncProcess(
                 // FIXME: are these the right arguments?
                 arguments: ["tar.exe", "-a", "-c", "-f", destinationPath.pathString, directory.basename],
-                workingDirectory: directory.parentDirectory.underlying
+                workingDirectory: directory.parentDirectory
             )
             #else
             // This is to work around `swift package-registry publish` tool failing on
@@ -97,7 +94,7 @@ public struct ZipArchiver: Archiver, Cancellable {
             // Instead of passing `workingDirectory` param to TSC.Process, which will trigger
             // SPM_posix_spawn_file_actions_addchdir_np_supported check, we shell out and
             // do `cd` explicitly before `zip`.
-            let process = TSCBasic.Process(
+            let process = AsyncProcess(
                 arguments: [
                     "/bin/sh",
                     "-c",
@@ -132,9 +129,9 @@ public struct ZipArchiver: Archiver, Cancellable {
             }
 
             #if os(Windows)
-            let process = TSCBasic.Process(arguments: ["tar.exe", "tf", path.pathString])
+            let process = AsyncProcess(arguments: ["tar.exe", "tf", path.pathString])
             #else
-            let process = TSCBasic.Process(arguments: ["unzip", "-t", path.pathString])
+            let process = AsyncProcess(arguments: ["unzip", "-t", path.pathString])
             #endif
             guard let registrationKey = self.cancellator.register(process) else {
                 throw CancellationError.failedToRegisterProcess(process)