Skip to content

Bump swift-subprocess to 1.0 #937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rayman-zhao wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bump swift-subprocess to 1.0 #937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,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", "0.4.0"..<"0.5.0", traits: ["SubprocessFoundation"]),
.package(url: "https://github.com/swiftlang/swift-subprocess.git", "1.0.0"..<"2.0.0", traits: ["SubprocessFoundation"]),

// Benchmarking
.package(url: "https://github.com/ordo-one/package-benchmark", .upToNextMajor(from: "1.4.0")),
Expand Down
3 changes: 2 additions & 1 deletion Sources/StaticBuildConfigPluginExecutable/StaticBuildConfigPluginExecutable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ import SwiftIfConfig
output: .data(limit: 65536),
error: .string(limit: 65536)
)
if let error = result.standardError, !error.isEmpty {
let error = result.standardError
if !error.isEmpty {
fatalError(error)
}
return result.standardOutput
Expand Down
4 changes: 2 additions & 2 deletions Sources/SwiftJavaTool/Commands/JavaCallbacksBuildCommand.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,8 @@ private func runSubprocess(
.path(FilePath(executable)),
arguments: .init(arguments),
environment: environment,
output: FileDescriptorOutput.standardOutput,
error: FileDescriptorOutput.standardError,
output: FileDescriptorOutput.currentStandardOutput,
error: FileDescriptorOutput.currentStandardError,
)
guard result.terminationStatus.isSuccess else {
throw JavaCallbacksBuildError(
Expand Down
4 changes: 2 additions & 2 deletions Sources/SwiftJavaToolLib/JavaDependencyResolver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ public struct JavaDependencyResolver {
error: .string(limit: Int.max, encoding: UTF8.self)
)

let outString = process.standardOutput ?? ""
let errString = process.standardError ?? ""
let outString = process.standardOutput
let errString = process.standardError

if let found = outString.split(separator: "\n").first(where: { $0.hasPrefix(SwiftJavaClasspathPrefix) }) {
return String(found.dropFirst(SwiftJavaClasspathPrefix.count))
Expand Down
12 changes: 6 additions & 6 deletions Tests/SwiftJavaToolLibTests/CompileJavaTool.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ struct CompileJavaTool {
)

guard javacProcess.terminationStatus.isSuccess else {
let outString = javacProcess.standardOutput ?? ""
let errString = javacProcess.standardError ?? ""
let outString = javacProcess.standardOutput
let errString = javacProcess.standardError
fatalError(
"javac failed (\(javacProcess.terminationStatus));\nOUT: \(outString)\nERROR: \(errString)"
)
Expand Down Expand Up @@ -104,8 +104,8 @@ struct CompileJavaTool {
)

guard javacProcess.terminationStatus.isSuccess else {
let outString = javacProcess.standardOutput ?? ""
let errString = javacProcess.standardError ?? ""
let outString = javacProcess.standardOutput
let errString = javacProcess.standardError
fatalError(
"javac '\(sourceFile)' failed (\(javacProcess.terminationStatus));\nOUT: \(outString)\nERROR: \(errString)"
)
Expand All @@ -131,8 +131,8 @@ struct CompileJavaTool {
)

guard jarProcess.terminationStatus.isSuccess else {
let outString = jarProcess.standardOutput ?? ""
let errString = jarProcess.standardError ?? ""
let outString = jarProcess.standardOutput
let errString = jarProcess.standardError
fatalError(
"jar failed (\(jarProcess.terminationStatus));\nOUT: \(outString)\nERROR: \(errString)"
)
Expand Down
Loading