Bump swift-subprocess to 1.0

Info.plist

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleIdentifier</key>
+	<string>swift-java-pr.SwiftExtract.resources</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>swift-java_SwiftExtract</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+</dict>
+</plist>

Package.swift

@@ -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")),

Sources/StaticBuildConfigPluginExecutable/StaticBuildConfigPluginExecutable.swift

@@ -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

Sources/SwiftJavaTool/Commands/JavaCallbacksBuildCommand.swift

@@ -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(

Sources/SwiftJavaToolLib/JavaDependencyResolver.swift

@@ -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))

Tests/SwiftJavaToolLibTests/CompileJavaTool.swift

@@ -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)"
       )
@@ -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)"
       )
@@ -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)"
       )

dummy.json

@@ -0,0 +1,2 @@
+// The actual resources will be generated by the buildToolsPlugin. This file is necessary for SwiftPM to generate a module bundle.
+{}

static-build-config.json

@@ -0,0 +1 @@
+{"attributes":["propertyWrapper","resultBuilder","_opaqueReturnTypeOf","noDerivative","isolated","storageRestrictions","export","backDeployed","_local","exclusivity","inlinable","unchecked","dynamicCallable","inline","retroactive","transpose","available","_lifetime","objcMembers","globalActor","Sendable","_noMetadata","_addressable","concurrent","IBInspectable","nonobjc","_extern","NSManaged","IBAction","discardableResult","reparented","constInitialized","unsafe","abi","attached","IBSegueAction","UIApplicationMain","NSApplicationMain","frozen","lifetime","preconcurrency","IBDesignable","NSCopying","objc","IBOutlet","escaping","nonisolated","differentiable","const","reasync","main","nonexhaustive","dynamicMemberLookup","c","diagnose","requires_stored_property_inits","GKInspectable","warn_unqualified_access","autoclosure","_owned","usableFromInline","rethrows","convention","derivative"],"compilerVersion":{"components":[6,4,1]},"customConditions":[],"endianness":"little","features":["AsyncSequenceFailure","BuiltinStoreRaw","MarkerProtocol","InoutLifetimeDependence","BuiltinInterleave","NonexhaustiveAttribute","BuiltinBuildMainExecutor","BorrowInout","BuiltinContinuation","PrimaryAssociatedTypes2","GeneralizedIsSameMetaTypeBuiltin","ABIAttributeSE0479","ExtensionMacroAttr","TypedThrows","MoveOnly","EffectfulProp","SpecializeAttributeWithAvailability","CAttribute","BuiltinContinuationNonCopyableSuccess","BuiltinTaskCancellationShield","NewCxxMethodSafetyHeuristics","BuiltinCreateAsyncTaskInGroupWithExecutor","BuiltinAddTaskLocalValue","NonfrozenEnumExhaustivity","BodyMacros","AsyncAwait","NoAsyncAvailability","BuiltinUnprotectedAddressOf","BuiltinVectorsExternC","ExtensionMacros","BuiltinTaskGroupWithArgument","RawIdentifiers","IsolatedAny","ValueGenericsNameLookup","BuiltinCreateAsyncTaskOwnedTaskExecutor","RetroactiveAttribute","NonescapableAccessorOnTrivial","FreestandingExpressionMacros","MoveOnlyPartialConsumption","SendableCompletionHandlers","ObjCImplementation","BuiltinBuildComplexEqualityExecutor","BuiltinAddressOfRawLayout","MemorySafetyAttributes","NoncopyableGenerics2","ExpressionMacroDefaultArguments","Macros","NonescapableTypes","ParameterPacks","BuiltinAssumeAlignment","AttachedMacros","BorrowingSwitch","BuiltinHopToActor","ModuleSelector","Actors","BorrowingForLoop","FreestandingMacros","LayoutPrespecialization","AssociatedTypeAvailability","ImplicitSelfCapture","BuiltinCreateTaskGroupWithFlags","TildeSendable","ClosureLifetimes","AlwaysInheritActorContext","AsyncExecutionBehaviorAttributes","BuiltinUnprotectedStackAlloc","LifetimeDependenceMutableAccessors","IsolatedAny2","BuiltinBuildTaskExecutorRef","UnsafeInheritExecutor","BuiltinEmplaceTypedThrows","LexicalLifetimes","BuiltinExecutor","BuiltinConcurrencyStackNesting","ConformanceSuppression","BuiltinBuildExecutor","Sendable","BuiltinMarkDependence","NoncopyableGenerics","IsolatedConformances","BorrowAndMutateAccessors","BuiltinCreateAsyncTaskWithExecutor","InheritActorContext","BuiltinStackAlloc","InlineArrayTypeSugar","ValueGenerics","BuiltinCreateTask","BuiltinIntLiteralAccessors","BuiltinCreateAsyncDiscardingTaskInGroupWithExecutor","IsolatedDeinit","AssociatedTypeImplements","SendingArgsAndResults","BuiltinJob","BuiltinSelect","BitwiseCopyable","MoveOnlyResilientTypes","SuppressedAssociatedTypesWithDefaults","RethrowsProtocol","UnavailableFromAsync","ExcludePrivateFromMemberwiseInit","AddressOfProperty2","OptionalIsolatedParameters","InlineAlways","AnyAppleOSAvailability","BuiltinTaskRunInline","BuiltinCreateAsyncTaskInGroup","BitwiseCopyable2","SourceWarningControl","ConcurrentFunctions","BuiltinCreateAsyncDiscardingTaskInGroup","BorrowingSequence","GlobalActors","BuiltinCreateAsyncTaskName"],"languageMode":{"components":[5,10]},"targetArchitectures":["arm64"],"targetAtomicBitWidths":[128,64,32,16,8],"targetEnvironments":[],"targetOSs":["Linux"],"targetObjectFileFormats":["ELF"],"targetPointerAuthenticationSchemes":["_none"],"targetPointerBitWidth":64,"targetRuntimes":["_multithreaded","_Native"]}