Add more missing availability annotations and clean up ifdefs

Author: jakepetroules

Sources/TSCBasic/HashAlgorithms.swift

@@ -174,7 +174,7 @@ public struct SHA256: HashAlgorithm {
 }
 
 /// Wraps CryptoKit.SHA256 to provide a HashAlgorithm conformance to it.
-@available(macOS 10.15, iOS 13, *)
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
 public struct CryptoKitSHA256: HashAlgorithm {
     public init() {
     }

Sources/TSCBasic/Process.swift

@@ -465,7 +465,7 @@ public final class Process {
 
         try _process?.run()
         return stdinPipe.fileHandleForWriting
-    #else
+    #elseif (!canImport(Darwin) || os(macOS))
         // Initialize the spawn attributes.
       #if canImport(Darwin) || os(Android) || os(OpenBSD)
         var attributes: posix_spawnattr_t? = nil
@@ -481,7 +481,7 @@ public final class Process {
         posix_spawnattr_setsigmask(&attributes, &noSignals)
 
         // Reset all signals to default behavior.
-      #if os(macOS)
+      #if canImport(Darwin)
         var mostSignals = sigset_t()
         sigfillset(&mostSignals)
         sigdelset(&mostSignals, SIGKILL)
@@ -521,7 +521,7 @@ public final class Process {
         defer { posix_spawn_file_actions_destroy(&fileActions) }
 
         if let workingDirectory = workingDirectory?.pathString {
-          #if os(macOS)
+          #if canImport(Darwin)
             // The only way to set a workingDirectory is using an availability-gated initializer, so we don't need
             // to handle the case where the posix_spawn_file_actions_addchdir_np method is unavailable. This check only
             // exists here to make the compiler happy.
@@ -669,6 +669,8 @@ public final class Process {
         }
 
         return stdinStream
+    #else
+        preconditionFailure("Process spawning is not available")
     #endif // POSIX implementation
     }
 
@@ -849,7 +851,7 @@ extension Process: Hashable {
 // MARK: - Private helpers
 
 #if !os(Windows)
-#if os(macOS)
+#if canImport(Darwin)
 private typealias swiftpm_posix_spawn_file_actions_t = posix_spawn_file_actions_t?
 #else
 private typealias swiftpm_posix_spawn_file_actions_t = posix_spawn_file_actions_t

Sources/TSCBasic/misc.swift

@@ -33,7 +33,7 @@ public func exec(path: String, args: [String]) throws -> Never {
     else {
         throw SystemError.exec(errno, path: path, args: args)
     }
-  #else
+  #elseif (!canImport(Darwin) || os(macOS))
     guard execv(path, cArgs.cArray) != -1 else {
         throw SystemError.exec(errno, path: path, args: args)
     }

Sources/TSCTestSupport/FileSystemExtensions.swift

@@ -13,7 +13,7 @@ import func XCTest.XCTFail
 import TSCBasic
 import TSCUtility
 
-#if os(macOS)
+#if canImport(Darwin)
 import class Foundation.Bundle
 #endif
 

Sources/TSCTestSupport/Product.swift

@@ -14,7 +14,7 @@ import class Foundation.ProcessInfo
 import TSCBasic
 import TSCUtility
 
-#if os(macOS)
+#if canImport(Darwin)
 import class Foundation.Bundle
 #endif
 
@@ -33,7 +33,7 @@ public protocol Product {
 extension Product {
     /// Path to currently built binary.
     public var path: AbsolutePath {
-      #if os(macOS)
+      #if canImport(Darwin)
         for bundle in Bundle.allBundles where bundle.bundlePath.hasSuffix(".xctest") {
             return AbsolutePath(bundle.bundlePath).parentDirectory.appending(self.exec)
         }

Sources/TSCTestSupport/XCTAssertHelpers.swift

@@ -13,7 +13,7 @@ import XCTest
 import TSCBasic
 import TSCUtility
 
-#if os(macOS)
+#if canImport(Darwin)
 import class Foundation.Bundle
 #endif
 

Sources/TSCTestSupport/XCTestCasePerf.swift

@@ -18,7 +18,7 @@ import TSCBasic
 /// This is useful because we always want to be able to compile the perf tests
 /// even if they are not run locally.
 open class XCTestCasePerf: XCTestCase {
-  #if os(macOS)
+  #if canImport(Darwin)
     override open class var defaultTestSuite: XCTestSuite {
         if ProcessEnv.vars.keys.contains("TSC_ENABLE_PERF_TESTS") {
             return super.defaultTestSuite

Sources/TSCTestSupport/misc.swift

@@ -15,7 +15,7 @@ import class Foundation.Thread
 import TSCBasic
 import TSCUtility
 
-#if os(macOS)
+#if canImport(Darwin)
 import class Foundation.Bundle
 #endif
 

Sources/TSCUtility/FSWatch.swift

@@ -100,7 +100,7 @@ private protocol _FileWatcher {
     func stop()
 }
 
-#if os(OpenBSD) || os(iOS)
+#if os(OpenBSD) || (!os(macOS) && canImport(Darwin))
 extension FSWatch._WatcherDelegate: NoOpWatcherDelegate {}
 extension NoOpWatcher: _FileWatcher{}
 #elseif os(Windows)
@@ -118,7 +118,7 @@ extension FSEventStream: _FileWatcher{}
 
 // MARK:- inotify
 
-#if os(OpenBSD) || os(iOS)
+#if os(OpenBSD) || (!os(macOS) && canImport(Darwin))
 
 public protocol NoOpWatcherDelegate {
     func pathsDidReceiveEvent(_ paths: [AbsolutePath])

Sources/TSCUtility/Platform.swift

@@ -85,7 +85,7 @@ public enum Platform: Equatable {
             // Compute the directories.
             directories.append(AbsolutePath("/private/var/tmp"))
             (try? TSCBasic.determineTempDirectory()).map{ directories.append($0) }
-            #if os(macOS)
+            #if canImport(Darwin)
             getConfstr(_CS_DARWIN_USER_TEMP_DIR).map({ directories.append($0) })
             getConfstr(_CS_DARWIN_USER_CACHE_DIR).map({ directories.append($0) })
             #endif
@@ -95,7 +95,7 @@ public enum Platform: Equatable {
     }
 
 
-    #if os(macOS)
+    #if canImport(Darwin)
     /// Returns the value of given path variable using `getconf` utility.
     ///
     /// - Note: This method returns `nil` if the value is an invalid path.