Skip to content

Commit 2985f64

Browse files
committed
Fix iOS/tvOS/watchOS build by adding missing availability annotations
1 parent e6cdd33 commit 2985f64

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

Sources/TSCBasic/Process.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@ extension Process {
976976
/// - environment: The environment to pass to subprocess. By default the current process environment
977977
/// will be inherited.
978978
/// - loggingHandler: Handler for logging messages
979-
@available(macOS 10.15, *)
979+
@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
980980
static public func popen(
981981
arguments: [String],
982982
environment: [String: String] = ProcessEnv.vars,
@@ -999,7 +999,7 @@ extension Process {
999999
/// - environment: The environment to pass to subprocess. By default the current process environment
10001000
/// will be inherited.
10011001
/// - loggingHandler: Handler for logging messages
1002-
@available(macOS 10.15, *)
1002+
@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
10031003
static public func popen(
10041004
args: String...,
10051005
environment: [String: String] = ProcessEnv.vars,
@@ -1016,7 +1016,7 @@ extension Process {
10161016
/// will be inherited.
10171017
/// - loggingHandler: Handler for logging messages
10181018
/// - Returns: The process output (stdout + stderr).
1019-
@available(macOS 10.15, *)
1019+
@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
10201020
@discardableResult
10211021
static public func checkNonZeroExit(
10221022
arguments: [String],
@@ -1039,7 +1039,7 @@ extension Process {
10391039
/// will be inherited.
10401040
/// - loggingHandler: Handler for logging messages
10411041
/// - Returns: The process output (stdout + stderr).
1042-
@available(macOS 10.15, *)
1042+
@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
10431043
@discardableResult
10441044
static public func checkNonZeroExit(
10451045
args: String...,

Tests/TSCBasicTests/ProcessTests.swift

+5
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ class ProcessTests: XCTestCase {
8989
}
9090
}
9191

92+
@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
9293
func testPopenAsync() async throws {
9394
#if os(Windows)
9495
let args = ["where.exe", "where"]
@@ -122,6 +123,7 @@ class ProcessTests: XCTestCase {
122123
}
123124
}
124125

126+
@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
125127
func testCheckNonZeroExitAsync() async throws {
126128
do {
127129
let output = try await Process.checkNonZeroExit(args: "echo", "hello")
@@ -344,6 +346,7 @@ class ProcessTests: XCTestCase {
344346
}
345347
}
346348

349+
@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
347350
func testStdoutStdErrAsync() async throws {
348351
// A simple script to check that stdout and stderr are captured separatly.
349352
do {
@@ -490,6 +493,7 @@ fileprivate extension Process {
490493
return try checkNonZeroExit(args: script(scriptName), environment: environment, loggingHandler: loggingHandler)
491494
}
492495

496+
@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
493497
static func checkNonZeroExit(
494498
scriptName: String,
495499
environment: [String: String] = ProcessEnv.vars,
@@ -510,6 +514,7 @@ fileprivate extension Process {
510514
return try popen(arguments: [script(scriptName)], environment: Self.env(), loggingHandler: loggingHandler)
511515
}
512516

517+
@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
513518
@discardableResult
514519
static func popen(
515520
scriptName: String,

0 commit comments

Comments
 (0)