_Subprocess: Update to a more recent version of vendored lib.

We have to keep a vendored lib _for now_ because we need to support 6.0
and upstream library has dropped that. We may eventually do so as well,
but currently we cannot require 6.1 yet.

Author: ktoso

Package.swift

@@ -195,6 +195,10 @@ let package = Package(
     .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
     .package(url: "https://github.com/apple/swift-system", from: "1.4.0"),
 
+//    // FIXME: swift-subprocess stopped supporting 6.0 when it moved into a package;
+//    //        we'll need to drop 6.0 as well, but currently blocked on doing so by swiftpm plugin pending design questions
+//    .package(url: "https://github.com/swiftlang/swift-subprocess.git", revision: "de15b67f7871c8a039ef7f4813eb39a8878f61a6"),
+
     // Benchmarking
     .package(url: "https://github.com/ordo-one/package-benchmark", .upToNextMajor(from: "1.4.0")),
   ],
@@ -363,6 +367,7 @@ let package = Package(
         "JavaTypes",
         "JavaKitShared",
         "JavaKitConfigurationShared",
+        // .product(name: "Subprocess", package: "swift-subprocess")
         "_Subprocess", // using process spawning
       ],
       swiftSettings: [
@@ -489,15 +494,15 @@ let package = Package(
 
     // Experimental Foundation Subprocess Copy
     .target(
-      name: "_CShims",
+      name: "_SubprocessCShims",
       swiftSettings: [
         .swiftLanguageMode(.v5)
       ]
     ),
     .target(
       name: "_Subprocess",
       dependencies: [
-        "_CShims",
+        "_SubprocessCShims",
         .product(name: "SystemPackage", package: "swift-system"),
       ],
       swiftSettings: [

Sources/SwiftJavaTool/Commands/ResolveCommand.swift

@@ -22,6 +22,9 @@ import SwiftJavaLib
 import JavaKitConfigurationShared
 import JavaKitShared
 import _Subprocess
+import System
+
+typealias Configuration = JavaKitConfigurationShared.Configuration
 
 extension SwiftJava {
   struct ResolveCommand: SwiftJavaBaseAsyncParsableCommand, HasCommonOptions, HasCommonJVMOptions {
@@ -137,37 +140,39 @@ extension SwiftJava.ResolveCommand {
 
     try! printGradleProject(directory: resolverDir, dependencies: dependencies)
 
-    let process = try! await Subprocess.run(
-      .at(.init(resolverDir.appendingPathComponent("gradlew").path)),
-      arguments: [
-        "--no-daemon",
-        "--rerun-tasks",
-        "\(printRuntimeClasspathTaskName)",
-      ],
-      workingDirectory: .init(platformString: resolverDir.path)
-    )
-
-    let outString = String(
-      data: process.standardOutput,
-      encoding: .utf8
-    )
-    let errString = String(
-      data: process.standardError,
-      encoding: .utf8
-    )
+    if #available(macOS 15, *) {
+      let process = try! await _Subprocess.run(
+        .path(FilePath(resolverDir.appendingPathComponent("gradlew").path)),
+        arguments: [
+          "--no-daemon",
+          "--rerun-tasks",
+          "\(printRuntimeClasspathTaskName)",
+        ],
+        workingDirectory: FilePath(resolverDir.path),
+        // TODO: we could move to stream processing the outputs
+        output: .string(limit: Int.max, encoding: UTF8.self), // Don't limit output, we know it will be reasonable size
+        error: .string(limit: Int.max, encoding: UTF8.self) // Don't limit output, we know it will be reasonable size
+      )
+
+      let outString = process.standardOutput ?? ""
+      let errString = process.standardError ?? ""
+
+      let classpathOutput: String
+      if let found = outString.split(separator: "\n").first(where: { $0.hasPrefix(self.SwiftJavaClasspathPrefix) }) {
+        classpathOutput = String(found)
+      } else if let found = errString.split(separator: "\n").first(where: { $0.hasPrefix(self.SwiftJavaClasspathPrefix) }) {
+        classpathOutput = String(found)
+      } else {
+        let suggestDisablingSandbox = "It may be that the Sandbox has prevented dependency fetching, please re-run with '--disable-sandbox'."
+        fatalError("Gradle output had no SWIFT_JAVA_CLASSPATH! \(suggestDisablingSandbox). \n" +
+          "Output was:<<<\(outString ?? "<empty>")>>>; Err was:<<<\(errString ?? "<empty>")>>>")
+      }
 
-    let classpathOutput: String
-    if let found = outString?.split(separator: "\n").first(where: { $0.hasPrefix(self.SwiftJavaClasspathPrefix) }) {
-      classpathOutput = String(found)
-    } else if let found = errString?.split(separator: "\n").first(where: { $0.hasPrefix(self.SwiftJavaClasspathPrefix) }) {
-      classpathOutput = String(found)
+      return String(classpathOutput.dropFirst(SwiftJavaClasspathPrefix.count))
     } else {
-      let suggestDisablingSandbox = "It may be that the Sandbox has prevented dependency fetching, please re-run with '--disable-sandbox'."
-      fatalError("Gradle output had no SWIFT_JAVA_CLASSPATH! \(suggestDisablingSandbox). \n" +
-        "Output was:<<<\(outString ?? "<empty>")>>>; Err was:<<<\(errString ?? "<empty>")>>>")
+      // Subprocess is unavailable
+      fatalError("Subprocess is unavailable yet required to execute `gradlew` subprocess. Please update to macOS 15+")
     }
-
-    return String(classpathOutput.dropFirst(SwiftJavaClasspathPrefix.count))
   }
 
   func printGradleProject(directory: URL, dependencies: [JavaDependencyDescriptor]) throws {