Unconditionally use swift-system package

Frizlab · Frizlab · commit 32737a60132e · 2024-12-27T00:00:43.000+01:00
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -26,7 +26,7 @@ let executableName = isXcode ? "ProcessInvocationBridge" : "swift-process-invoca
 
 let package = Package(
 	name: "swift-process-invocation",
-	platforms: [.macOS(.v12)/* FilePath is unusable before macOS 12. */],
+	platforms: [.macOS(.v11)],
 	products: [
 		.library(name: "ProcessInvocation", targets: ["ProcessInvocation"]),
 		/* A launcher for forwarding fds when needed. */
@@ -36,6 +36,7 @@ let package = Package(
 		var res = [Package.Dependency]()
 		res.append(.package(url: "https://github.com/apple/swift-argument-parser.git",         from: "1.2.2"))
 		res.append(.package(url: "https://github.com/apple/swift-log.git",                     from: "1.5.2"))
+		res.append(.package(url: "https://github.com/apple/swift-system.git",                  from: "1.0.0")) /* We’re aware of the existence of System on macOS. After some thinking/research, we decided to agree with <https://forums.swift.org/t/50719/5>. */
 		res.append(.package(url: "https://github.com/Frizlab/UnwrapOrThrow.git",               from: "1.0.1"))
 		res.append(.package(url: "https://github.com/xcode-actions/clt-logger.git",            from: "1.0.0-beta.4"))
 		res.append(.package(url: "https://github.com/xcode-actions/stream-reader.git",         from: "3.6.0"))
@@ -54,6 +55,7 @@ let package = Package(
 			res.append(.product(name: "SignalHandling", package: "swift-signal-handling"))
 			res.append(.product(name: "StreamReader",   package: "stream-reader"))
 			res.append(.product(name: "UnwrapOrThrow",  package: "UnwrapOrThrow"))
+			res.append(.product(name: "SystemPackage",  package: "swift-system"))
 			res.append(.target(name: "CMacroExports"))
 			if useXtenderZ {
 				res.append(.product(name: "eXtenderZ-static", package: "eXtenderZ"))
@@ -73,6 +75,7 @@ let package = Package(
 			res.append(.product(name: "CLTLogger",      package: "clt-logger"))
 			res.append(.product(name: "Logging",        package: "swift-log"))
 			res.append(.product(name: "StreamReader",   package: "stream-reader"))
+			res.append(.product(name: "SystemPackage",  package: "swift-system"))
 			res.append(.target(name: "CMacroExports"))
 			if needsGNUSourceExports {
 				res.append(.target(name: "CGNUSourceExports"))
@@ -86,6 +89,7 @@ let package = Package(
 			res.append(.product(name: "CLTLogger",     package: "clt-logger"))
 			res.append(.product(name: "Logging",       package: "swift-log"))
 			res.append(.product(name: "StreamReader",  package: "stream-reader"))
+			res.append(.product(name: "SystemPackage",  package: "swift-system"))
 			if needsGNUSourceExports {
 				res.append(.target(name: "CGNUSourceExportsForTests"))
 			}
diff --git a/Sources/ManualTests/main.swift b/Sources/ManualTests/main.swift
@@ -1,14 +1,10 @@
 import Foundation
-#if canImport(SystemPackage)
-import SystemPackage
-#elseif canImport(System)
-import System
-#endif
 
 import CLTLogger
 import Logging
 import ProcessInvocation
 import StreamReader
+import SystemPackage
 
 /* Old remark (fixed not):
  *    Launch the manual test like so:
@@ -37,14 +33,8 @@ let logger = Logger(label: "com.xcode-actions.manual-process-invocation-tests")
 //}
 
 do {
-#if canImport(SystemPackage) || canImport(System)
 	let fd = try! FileDescriptor.open("/dev/null", .readOnly)
 	defer {_ = try? fd.close()}
-#else
-	let fh = FileHandle(forReadingAtPath: "/dev/null")!
-	let fd = FileDescriptor(rawValue: fh.fileDescriptor)
-	defer {_ = try? fh.close()}
-#endif
 	
 	/*let p = Process()
 	p.executableURL = URL(fileURLWithPath: "./toto")
diff --git a/Sources/ProcessInvocation/ Errors.swift b/Sources/ProcessInvocation/ Errors.swift
@@ -1,9 +1,6 @@
 import Foundation
-#if canImport(SystemPackage)
+
 import SystemPackage
-#elseif canImport(System)
-import System
-#endif
 
 
 
diff --git a/Sources/ProcessInvocation/FileDescriptor+GenericReadStream.swift b/Sources/ProcessInvocation/FileDescriptor+GenericReadStream.swift
@@ -0,0 +1,14 @@
+import Foundation
+
+import StreamReader
+import SystemPackage
+
+
+
+extension FileDescriptor : @retroactive GenericReadStream {
+	
+	public func read(_ buffer: UnsafeMutableRawPointer, maxLength len: Int) throws -> Int {
+		return try read(into: UnsafeMutableRawBufferPointer(start: buffer, count: len))
+	}
+	
+}
diff --git a/Sources/ProcessInvocation/InputRedirectMode.swift b/Sources/ProcessInvocation/InputRedirectMode.swift
@@ -1,11 +1,7 @@
 import Foundation
-#if canImport(SystemPackage)
-import SystemPackage
-#elseif canImport(System)
-import System
-#endif
 
 import StreamReader
+import SystemPackage
 
 
 
diff --git a/Sources/ProcessInvocation/LineWithSource.swift b/Sources/ProcessInvocation/LineWithSource.swift
@@ -1,10 +1,6 @@
 import Foundation
-#if canImport(SystemPackage)
-import SystemPackage
-#elseif canImport(System)
-import System
-#endif
 
+import SystemPackage
 import UnwrapOrThrow
 
 
diff --git a/Sources/ProcessInvocation/NoSystemDummies.swift b/Sources/ProcessInvocation/NoSystemDummies.swift
diff --git a/Sources/ProcessInvocation/OutputRedirectMode.swift b/Sources/ProcessInvocation/OutputRedirectMode.swift
@@ -1,9 +1,6 @@
 import Foundation
-#if canImport(SystemPackage)
+
 import SystemPackage
-#elseif canImport(System)
-import System
-#endif
 
 
 
diff --git a/Sources/ProcessInvocation/ProcessInvocation+Deprecated.swift b/Sources/ProcessInvocation/ProcessInvocation+Deprecated.swift
@@ -1,11 +1,7 @@
 import Foundation
-#if canImport(SystemPackage)
-import SystemPackage
-#elseif canImport(System)
-import System
-#endif
 
 import SignalHandling
+import SystemPackage
 
 
 
diff --git a/Sources/ProcessInvocation/ProcessInvocation+Pipe.swift b/Sources/ProcessInvocation/ProcessInvocation+Pipe.swift
@@ -1,11 +1,7 @@
 import Foundation
-#if canImport(SystemPackage)
-import SystemPackage
-#elseif canImport(System)
-import System
-#endif
 
 import StreamReader
+import SystemPackage
 
 
 
diff --git a/Sources/ProcessInvocation/ProcessInvocation.swift b/Sources/ProcessInvocation/ProcessInvocation.swift
@@ -1,16 +1,12 @@
 import Foundation
-#if canImport(SystemPackage)
-import SystemPackage
-#elseif canImport(System)
-import System
-#endif
 
 #if canImport(eXtenderZ)
 import CNSTaskHelptender
 import eXtenderZ
 #endif
 import SignalHandling
 import StreamReader
+import SystemPackage
 
 #if !canImport(Darwin)
 import CGNUSourceExports
diff --git a/Sources/ProcessInvocationBridge/NoSystemDummies.swift b/Sources/ProcessInvocationBridge/NoSystemDummies.swift
diff --git a/Sources/ProcessInvocationBridge/ProcessInvocationBridge.swift b/Sources/ProcessInvocationBridge/ProcessInvocationBridge.swift
@@ -1,14 +1,10 @@
 import Foundation
-#if canImport(SystemPackage)
-import SystemPackage
-#elseif canImport(System)
-import System
-#endif
 
 import ArgumentParser
 import CLTLogger
 import CMacroExports
 import Logging
+import SystemPackage
 
 #if !canImport(Darwin)
 import CGNUSourceExports
diff --git a/Tests/ProcessInvocationTests/ProcessInvocationTests.swift b/Tests/ProcessInvocationTests/ProcessInvocationTests.swift
@@ -1,14 +1,10 @@
 import Foundation
-#if canImport(SystemPackage)
-import SystemPackage
-#elseif canImport(System)
-import System
-#endif
 import XCTest
 
 import CLTLogger
 import Logging
 import StreamReader
+import SystemPackage
 
 #if canImport(CGNUSourceExportsForTests)
 import CGNUSourceExportsForTests
diff --git a/Tests/ProcessInvocationTests/Utils.swift b/Tests/ProcessInvocationTests/Utils.swift
@@ -1,15 +1,11 @@
 /* From officectl. */
 
 import Foundation
-#if canImport(SystemPackage)
-import SystemPackage
-#elseif canImport(System)
-import System
-#endif
 import XCTest
 
 import CLTLogger
 import Logging
+import SystemPackage
 
 
 
