Support swift-subprocess 1.x

The exclusive `from: "0.3.0"` range blocked dependents that already
use swift-subprocess 1.0. Version 1.0 renamed the stdio outputs used
by the task CLI to `currentStandardOutput` and `currentStandardError`.
This commit is contained in:
T. R. Bernstein
2026-09-13 22:28:26 +02:00
parent 10943f9ce3
commit 8cedee6139
4 changed files with 11 additions and 11 deletions
+3 -3
View File
@@ -1,5 +1,5 @@
{ {
"originHash" : "17ce26ba5c862ca674cd3ceeb43a9fe8a5c5251c5561de65e632a06d79916342", "originHash" : "d30dadbb08ce17a04cba957d25e81d1d76b8dc0a7bdc84a591c7af3b8eb74b85",
"pins" : [ "pins" : [
{ {
"identity" : "noora", "identity" : "noora",
@@ -78,8 +78,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-subprocess.git", "location" : "https://github.com/swiftlang/swift-subprocess.git",
"state" : { "state" : {
"revision" : "ba5888ad7758cbcbe7abebac37860b1652af2d9c", "revision" : "b3937ab85dd32f6e9435914599c1519074769c1a",
"version" : "0.3.0" "version" : "1.0.0"
} }
}, },
{ {
+1 -1
View File
@@ -15,7 +15,7 @@ let package = Package(
.package(url: "https://github.com/apple/swift-log", from: "1.10.1"), .package(url: "https://github.com/apple/swift-log", from: "1.10.1"),
.package(url: "https://github.com/apple/swift-nio", from: "2.95.0"), .package(url: "https://github.com/apple/swift-nio", from: "2.95.0"),
.package(url: "https://github.com/apple/swift-system", from: "1.6.4"), .package(url: "https://github.com/apple/swift-system", from: "1.6.4"),
.package(url: "https://github.com/swiftlang/swift-subprocess.git", from: "0.3.0"), .package(url: "https://github.com/swiftlang/swift-subprocess.git", "0.3.0"..<"2.0.0"),
.package(url: "https://github.com/tuist/Noora", from: "0.55.1") .package(url: "https://github.com/tuist/Noora", from: "0.55.1")
], ],
targets: [ targets: [
@@ -53,8 +53,8 @@ struct GenerateDocumentationCommand: AsyncParsableCommand {
"swift:latest", "swift:latest",
"/bin/bash", "-c", script "/bin/bash", "-c", script
], ],
output: .standardOutput, output: .currentStandardOutput,
error: .standardError error: .currentStandardError
) )
if !dockerRunResult.terminationStatus.isSuccess { if !dockerRunResult.terminationStatus.isSuccess {
noora.error("Documentation generation failed.") noora.error("Documentation generation failed.")
@@ -112,7 +112,7 @@ struct GenerateDocumentationCommand: AsyncParsableCommand {
.name("swift"), .name("swift"),
arguments: ["package", "describe", "--type", "json"], arguments: ["package", "describe", "--type", "json"],
output: .data(limit: 10_000), output: .data(limit: 10_000),
error: .standardError error: .currentStandardError
) )
struct PackageDescription: Codable { struct PackageDescription: Codable {
@@ -178,8 +178,8 @@ struct GenerateDocumentationCommand: AsyncParsableCommand {
"package", "--package-path", directory.path(percentEncoded: false), "package", "--package-path", directory.path(percentEncoded: false),
"add-dependency", "--from", Self.doccPluginMinVersion, Self.doccPluginURL "add-dependency", "--from", Self.doccPluginMinVersion, Self.doccPluginURL
], ],
output: .standardOutput, output: .currentStandardOutput,
error: .standardError error: .currentStandardError
) )
if !swiftRunResult.terminationStatus.isSuccess { if !swiftRunResult.terminationStatus.isSuccess {
throw GenerateDocumentationError.dependencyInjectionFailed throw GenerateDocumentationError.dependencyInjectionFailed
+2 -2
View File
@@ -32,8 +32,8 @@ struct TestCommand: AsyncParsableCommand {
"-w", "/code", "swift:latest", "-w", "/code", "swift:latest",
"/bin/bash", "-c", "swift test --skip InotifyLimitTests; swift test --skip-build --filter InotifyLimitTests" "/bin/bash", "-c", "swift test --skip InotifyLimitTests; swift test --skip-build --filter InotifyLimitTests"
], ],
output: .standardOutput, output: .currentStandardOutput,
error: .standardError error: .currentStandardError
) )
if dockerRunResult.terminationStatus.isSuccess { if dockerRunResult.terminationStatus.isSuccess {
noora.success("All tests completed successfully.") noora.success("All tests completed successfully.")