From b1499c138686a2b68ff9f78ddb3507500f08d31a Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Sat, 30 May 2026 12:33:34 -0400 Subject: [PATCH 1/3] Fix Subprocess.run API updates --- 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..ecb161269 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", from: "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..bbbfba44d 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: .currentStandardOutput, + error: .currentStandardError, ) guard result.terminationStatus.isSuccess else { throw JavaCallbacksBuildError( From 00bbad8121b7b1b1c80e0dc7d7fe4a94c7260e42 Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Sat, 30 May 2026 12:44:29 -0400 Subject: [PATCH 2/3] Drop 6.1.3 from CI --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 9aba4b06c..226dbc4fc 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -147,7 +147,7 @@ jobs: strategy: fail-fast: false matrix: - swift_version: ['6.1.3', '6.3', 'nightly'] + swift_version: ['6.3', 'nightly'] os_version: ['jammy'] jdk_vendor: ['corretto'] container: From 510e2904ee920684fc0dd5247214b90b77d1b375 Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Sat, 30 May 2026 12:58:57 -0400 Subject: [PATCH 3/3] Set swift-subprocess dependency range to 0.5.0..<2.0.0 to automatically update to 1.0 once it is released --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index ecb161269..c2e7b7eef 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.5.0", traits: ["SubprocessFoundation"]), + .package(url: "https://github.com/swiftlang/swift-subprocess.git", "0.5.0"..<"2.0.0", traits: ["SubprocessFoundation"]), // Benchmarking .package(url: "https://github.com/ordo-one/package-benchmark", .upToNextMajor(from: "1.4.0")),