Handle system package better

Author: Frizlab

Package.resolved

@@ -5,23 +5,34 @@ import PackageDescription
 let package = Package(
 	name: "swift-signal-handling",
 	platforms: [
-		.macOS(.v10_15)
+		.macOS(.v11),
+		.tvOS(.v14),
+		.iOS(.v14),
+		.watchOS(.v7)
 	],
 	products: [
 		.library(name: "SignalHandling", targets: ["SignalHandling"])
 	],
-	dependencies: [
-		.package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.0.0"),
-		.package(url: "https://github.com/apple/swift-log.git", from: "1.4.2"),
-		.package(url: "https://github.com/apple/swift-system.git", from: "1.0.0"),
-		.package(url: "https://github.com/swift-server/swift-backtrace.git", from: "1.3.1"),
-		.package(url: "https://github.com/xcode-actions/clt-logger.git", from: "0.3.0")
-	],
+	dependencies: {
+		var res = [Package.Dependency]()
+		res.append(.package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.0.0"))
+		res.append(.package(url: "https://github.com/apple/swift-log.git", from: "1.4.2"))
+		res.append(.package(url: "https://github.com/swift-server/swift-backtrace.git", from: "1.3.1"))
+		res.append(.package(url: "https://github.com/xcode-actions/clt-logger.git", from: "0.4.0"))
+#if !canImport(System)
+		res.append(.package(url: "https://github.com/apple/swift-system.git", from: "1.0.0"))
+#endif
+		return res
+	}(),
 	targets: [
-		.target(name: "SignalHandling", dependencies: [
-			.product(name: "Logging", package: "swift-log"),
-			.product(name: "SystemPackage", package: "swift-system")
-		]),
+		.target(name: "SignalHandling", dependencies: {
+			var res = [Target.Dependency]()
+			res.append(.product(name: "Logging", package: "swift-log"))
+#if !canImport(System)
+			res.append(.product(name: "SystemPackage", package: "swift-system"))
+#endif
+			return res
+		}()),
 
 		.target(name: "signal-handling-tests-helper", dependencies: [
 			.product(name: "ArgumentParser", package: "swift-argument-parser"),
@@ -30,11 +41,15 @@ let package = Package(
 			.product(name: "Logging",        package: "swift-log"),
 			.target(name: "SignalHandling")
 		]),
-		.testTarget(name: "SignalHandlingTests", dependencies: [
-			.target(name: "signal-handling-tests-helper"),
-			.product(name: "CLTLogger",     package: "clt-logger"),
-			.product(name: "Logging",       package: "swift-log"),
-			.product(name: "SystemPackage", package: "swift-system")
-		]),
+		.testTarget(name: "SignalHandlingTests", dependencies: {
+			var res = [Target.Dependency]()
+			res.append(.target(name: "signal-handling-tests-helper"))
+			res.append(.product(name: "CLTLogger",     package: "clt-logger"))
+			res.append(.product(name: "Logging",       package: "swift-log"))
+#if !canImport(System)
+			res.append(.product(name: "SystemPackage", package: "swift-system"))
+#endif
+			return res
+		}())
 	]
 )

Package.swift

@@ -1,6 +1,9 @@
 import Foundation
-
+#if canImport(System)
+import System
+#else
 import SystemPackage
+#endif
 
 
 

Sources/SignalHandling/CStructsInSwift/Sigaction.swift

@@ -1,6 +1,9 @@
 import Foundation
-
+#if canImport(System)
+import System
+#else
 import SystemPackage
+#endif
 
 
 

Sources/SignalHandling/DelayedSigaction/SigactionDelayer_Block.swift

@@ -1,7 +1,11 @@
 import Foundation
+#if canImport(System)
+import System
+#else
+import SystemPackage
+#endif
 
 import Logging
-import SystemPackage
 
 
 

Sources/SignalHandling/DelayedSigaction/SigactionDelayer_Unsig.swift

@@ -1,6 +1,9 @@
 import Foundation
-
+#if canImport(System)
+import System
+#else
 import SystemPackage
+#endif
 
 
 

Sources/SignalHandling/SignalHandlingError.swift

@@ -1,9 +1,13 @@
 import Foundation
+#if canImport(System)
+import System
+#else
+import SystemPackage
+#endif
 
 import ArgumentParser
 import CLTLogger
 import Logging
-import SystemPackage
 
 import SignalHandling
 

Sources/signal-handling-tests-helper/DelaySignalBlock.swift

@@ -1,9 +1,13 @@
 import Foundation
+#if canImport(System)
+import System
+#else
+import SystemPackage
+#endif
 
 import ArgumentParser
 import CLTLogger
 import Logging
-import SystemPackage
 
 import SignalHandling
 

Sources/signal-handling-tests-helper/DelaySignalUnsigaction.swift

@@ -3,6 +3,7 @@ import XCTest
 
 
 
+#if !os(tvOS) && !os(iOS) && !os(watchOS)
 final class NSConditionLockTest : XCTestCase {
 
 	func testNSConditionLock() throws {
@@ -26,3 +27,4 @@ final class NSConditionLockTest : XCTestCase {
 	}
 
 }
+#endif

Tests/SignalHandlingTests/LockTest.swift

@@ -8,7 +8,7 @@ import Logging
 
 
 
-@available(OSX 10.15.4, *)
+#if !os(tvOS) && !os(iOS) && !os(watchOS)
 final class SignalHandlingTests : XCTestCase {
 
 	override class func setUp() {
@@ -73,3 +73,4 @@ final class SignalHandlingTests : XCTestCase {
 	}
 
 }
+#endif