From e73c59019fa4d4b6bfc9daa31fe5959e5a067d3a Mon Sep 17 00:00:00 2001 From: Konrad Malawski Date: Mon, 1 Jun 2026 21:31:14 +0900 Subject: [PATCH] Fix source break in swift-subprocess For now sticking to supporting 6.1 still by locking subprocess to 0.4 --- Package.swift | 2 +- .../SwiftJavaTool/Commands/JavaCallbacksBuildCommand.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index e009119d4..800a9a0ca 100644 --- a/Package.swift +++ b/Package.swift @@ -140,7 +140,7 @@ let package = Package( .package(url: "https://github.com/apple/swift-system", from: "1.4.0"), .package(url: "https://github.com/apple/swift-log", from: "1.2.0"), .package(url: "https://github.com/apple/swift-collections", from: "1.3.0"), // primarily for ordered collections - .package(url: "https://github.com/swiftlang/swift-subprocess.git", from: "0.4.0", traits: ["SubprocessFoundation"]), + .package(url: "https://github.com/swiftlang/swift-subprocess.git", "0.4.0"..<"0.5.0", traits: ["SubprocessFoundation"]), // Benchmarking .package(url: "https://github.com/ordo-one/package-benchmark", .upToNextMajor(from: "1.4.0")), diff --git a/Sources/SwiftJavaTool/Commands/JavaCallbacksBuildCommand.swift b/Sources/SwiftJavaTool/Commands/JavaCallbacksBuildCommand.swift index 3d737f047..1182e3c08 100644 --- a/Sources/SwiftJavaTool/Commands/JavaCallbacksBuildCommand.swift +++ b/Sources/SwiftJavaTool/Commands/JavaCallbacksBuildCommand.swift @@ -269,8 +269,8 @@ private func runSubprocess( .path(FilePath(executable)), arguments: .init(arguments), environment: environment, - output: .standardOutput, - error: .standardError, + output: FileDescriptorOutput.standardOutput, + error: FileDescriptorOutput.standardError, ) guard result.terminationStatus.isSuccess else { throw JavaCallbacksBuildError(