diff --git a/Package.resolved b/Package.resolved index c7b8fe2..649e16b 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "17ce26ba5c862ca674cd3ceeb43a9fe8a5c5251c5561de65e632a06d79916342", + "originHash" : "d30dadbb08ce17a04cba957d25e81d1d76b8dc0a7bdc84a591c7af3b8eb74b85", "pins" : [ { "identity" : "noora", @@ -78,8 +78,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swiftlang/swift-subprocess.git", "state" : { - "revision" : "ba5888ad7758cbcbe7abebac37860b1652af2d9c", - "version" : "0.3.0" + "revision" : "b3937ab85dd32f6e9435914599c1519074769c1a", + "version" : "1.0.0" } }, { diff --git a/Package.swift b/Package.swift index 9ba0510..e747daf 100644 --- a/Package.swift +++ b/Package.swift @@ -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-nio", from: "2.95.0"), .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") ], targets: [ diff --git a/Sources/TaskCLI/GenerateDocumentation Command.swift b/Sources/TaskCLI/GenerateDocumentation Command.swift index 28956e5..1b2b5ab 100644 --- a/Sources/TaskCLI/GenerateDocumentation Command.swift +++ b/Sources/TaskCLI/GenerateDocumentation Command.swift @@ -53,8 +53,8 @@ struct GenerateDocumentationCommand: AsyncParsableCommand { "swift:latest", "/bin/bash", "-c", script ], - output: .standardOutput, - error: .standardError + output: .currentStandardOutput, + error: .currentStandardError ) if !dockerRunResult.terminationStatus.isSuccess { noora.error("Documentation generation failed.") @@ -112,7 +112,7 @@ struct GenerateDocumentationCommand: AsyncParsableCommand { .name("swift"), arguments: ["package", "describe", "--type", "json"], output: .data(limit: 10_000), - error: .standardError + error: .currentStandardError ) struct PackageDescription: Codable { @@ -178,8 +178,8 @@ struct GenerateDocumentationCommand: AsyncParsableCommand { "package", "--package-path", directory.path(percentEncoded: false), "add-dependency", "--from", Self.doccPluginMinVersion, Self.doccPluginURL ], - output: .standardOutput, - error: .standardError + output: .currentStandardOutput, + error: .currentStandardError ) if !swiftRunResult.terminationStatus.isSuccess { throw GenerateDocumentationError.dependencyInjectionFailed diff --git a/Sources/TaskCLI/Test Command.swift b/Sources/TaskCLI/Test Command.swift index 151a5b4..b536325 100644 --- a/Sources/TaskCLI/Test Command.swift +++ b/Sources/TaskCLI/Test Command.swift @@ -32,8 +32,8 @@ struct TestCommand: AsyncParsableCommand { "-w", "/code", "swift:latest", "/bin/bash", "-c", "swift test --skip InotifyLimitTests; swift test --skip-build --filter InotifyLimitTests" ], - output: .standardOutput, - error: .standardError + output: .currentStandardOutput, + error: .currentStandardError ) if dockerRunResult.terminationStatus.isSuccess { noora.success("All tests completed successfully.")