WIP: Introduce resolve subcommand and further dis-entangle commands

.gitignore

@@ -1,3 +1,5 @@
+.swift-version
+
 .DS_Store
 .build
 .idea

.licenseignore

@@ -47,5 +47,6 @@ Plugins/**/_PluginsShared
 Plugins/**/0_PLEASE_SYMLINK*
 Plugins/PluginsShared/JavaKitConfigurationShared
 Samples/JavaDependencySampleApp/gradle
-Sources/_Subprocess/_nio_locks.swift
+Sources/_Subprocess/**
+Sources/_SubprocessCShims/**
 Samples/gradle

.unacceptablelanguageignore

@@ -2,16 +2,5 @@ Sources/SwiftJavaBootstrapJavaTool/SwiftJavaBootstrapJavaTool.swift
 Sources/_Subprocess/Platforms/Subprocess+Darwin.swift
 Sources/_Subprocess/Platforms/Subprocess+Linux.swift
 Sources/_Subprocess/Platforms/Subprocess+Unix.swift
-Sources/_Subprocess/Platforms/Subprocess+Unix.swift
-Sources/_Subprocess/Platforms/Subprocess+Unix.swift
-Sources/_Subprocess/Platforms/Subprocess+Unix.swift
-Sources/_Subprocess/Platforms/Subprocess+Unix.swift
-Sources/_Subprocess/Platforms/Subprocess+Unix.swift
-Sources/_Subprocess/Subprocess+Teardown.swift
-Sources/_Subprocess/Subprocess+Teardown.swift
-Sources/_Subprocess/Subprocess+Teardown.swift
-Sources/_Subprocess/Subprocess+Teardown.swift
-Sources/_Subprocess/Subprocess+Teardown.swift
-Sources/_Subprocess/Subprocess+Teardown.swift
-Sources/_Subprocess/Subprocess+Teardown.swift
+Sources/_Subprocess/Teardown.swift
 Sources/_Subprocess/Subprocess.swift

Package.swift

@@ -11,6 +11,7 @@ import Foundation
 //   Library/Java/JavaVirtualMachines/openjdk-21.jdk/Contents/Home.
 func findJavaHome() -> String {
   if let home = ProcessInfo.processInfo.environment["JAVA_HOME"] {
+    print("JAVA_HOME = \(home)")
     return home
   }
 
@@ -85,7 +86,7 @@ let javaIncludePath = "\(javaHome)/include"
 let package = Package(
   name: "SwiftJava",
   platforms: [
-    .macOS(.v10_15)
+    .macOS(.v13)
   ],
   products: [
     // ==== JavaKit (i.e. calling Java directly Swift utilities)
@@ -195,6 +196,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,7 +368,8 @@ let package = Package(
         "JavaTypes",
         "JavaKitShared",
         "JavaKitConfigurationShared",
-        "_Subprocess", // using process spawning
+        // .product(name: "Subprocess", package: "swift-subprocess")
+        "_Subprocess",
       ],
       swiftSettings: [
         .swiftLanguageMode(.v5),
@@ -379,6 +385,7 @@ let package = Package(
         .product(name: "SwiftSyntax", package: "swift-syntax"),
         .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
+        .product(name: "SystemPackage", package: "swift-system"),
         "JavaKit",
         "JavaKitJar",
         "JavaKitNetwork",
@@ -387,11 +394,14 @@ let package = Package(
         "JavaKitShared",
         "JavaKitConfigurationShared",
       ],
-
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"]),
         .enableUpcomingFeature("BareSlashRegexLiterals"),
+        .define(
+          "SYSTEM_PACKAGE_DARWIN",
+          .when(platforms: [.macOS, .macCatalyst, .iOS, .watchOS, .tvOS, .visionOS])),
+        .define("SYSTEM_PACKAGE"),
       ]
     ),
 
@@ -467,6 +477,15 @@ let package = Package(
       ]
     ),
 
+    .testTarget(
+      name: "JavaKitConfigurationSharedTests",
+      dependencies: ["JavaKitConfigurationShared"],
+      swiftSettings: [
+        .swiftLanguageMode(.v5),
+        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
+      ]
+    ),
+
     .testTarget(
       name: "JExtractSwiftTests",
       dependencies: [
@@ -480,19 +499,23 @@ 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: [
-        .swiftLanguageMode(.v5)
+        .swiftLanguageMode(.v5),
+        .define(
+          "SYSTEM_PACKAGE_DARWIN",
+          .when(platforms: [.macOS, .macCatalyst, .iOS, .watchOS, .tvOS, .visionOS])),
+        .define("SYSTEM_PACKAGE"),
       ]
     ),
   ]

Plugins/JExtractSwiftCommandPlugin/JExtractSwiftCommandPlugin.swift

@@ -82,7 +82,7 @@ final class JExtractSwiftCommandPlugin: SwiftJavaPluginProtocol, BuildToolPlugin
     ]
     // arguments.append(sourceDir) // TODO: we could do this shape maybe? to have the dirs last?
     if let package = configuration?.javaPackage, !package.isEmpty {
-      ["--java-package", package]
+      arguments += ["--java-package", package]
     }
 
     return arguments

Plugins/PluginsShared/SwiftJavaPluginProtocol.swift

@@ -21,8 +21,6 @@ protocol SwiftJavaPluginProtocol {
 
 extension SwiftJavaPluginProtocol {
   func log(_ message: @autoclosure () -> String, terminator: String = "\n") {
-//    if self.verbose {
-      print("[\(pluginName)] \(message())", terminator: terminator)
-//    }
+    print("[\(pluginName)] \(message())", terminator: terminator)
   }
 }

Plugins/SwiftJavaPlugin/SwiftJavaPlugin.swift

@@ -88,24 +88,12 @@ struct SwiftJavaBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
     }
 
     var arguments: [String] = []
-    arguments += argumentsModuleName(sourceModule: sourceModule)
+    arguments += argumentsSwiftModule(sourceModule: sourceModule)
     arguments += argumentsOutputDirectory(context: context)
-
-    arguments += dependentConfigFiles.flatMap { moduleAndConfigFile in
-      let (moduleName, configFile) = moduleAndConfigFile
-      return [
-        "--depends-on",
-        "\(moduleName)=\(configFile.path(percentEncoded: false))"
-      ]
-    }
-    arguments.append(configFile.path(percentEncoded: false))
+    arguments += argumentsDependedOnConfigs(dependentConfigFiles)
 
-//    guard let classes = config.classes else {
-//      log("Config at \(configFile) did not have 'classes' configured, skipping java2swift step.")
-//      return []
-//    }
     let classes = config.classes ?? [:]
-    print("Classes to wrap: \(classes.map(\.key))")
+    print("[swift-java-plugin] Classes to wrap (\(classes.count)): \(classes.map(\.key))")
 
     /// Determine the set of Swift files that will be emitted by the Java2Swift tool.
     // TODO: this is not precise and won't work with more advanced Java files, e.g. lambdas etc.
@@ -165,12 +153,9 @@ struct SwiftJavaBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
         .buildCommand(
           displayName: displayName,
           executable: executable,
-          arguments: [
-            // FIXME: change to 'resolve' subcommand
-            "--fetch", configFile.path(percentEncoded: false),
-            "--swift-module", sourceModule.name,
-            "--output-directory", outputDirectory(context: context, generated: false).path(percentEncoded: false)
-          ],
+          arguments: ["resolve"]
+            + argumentsOutputDirectory(context: context, generated: false)
+            + argumentsSwiftModule(sourceModule: sourceModule),
           environment: [:],
           inputFiles: [configFile],
           outputFiles: fetchDependenciesOutputFiles
@@ -181,39 +166,63 @@ struct SwiftJavaBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
     }
 
     if !outputSwiftFiles.isEmpty {
+      arguments += [ configFile.path(percentEncoded: false) ]
+
       let displayName = "Wrapping \(classes.count) Java classes in Swift target '\(sourceModule.name)'"
       log("Prepared: \(displayName)")
       commands += [
         .buildCommand(
           displayName: displayName,
           executable: executable,
-          arguments: arguments,
+          arguments: ["wrap-java"]
+            + arguments,
           inputFiles: compiledClassFiles + fetchDependenciesOutputFiles + [ configFile ],
           outputFiles: outputSwiftFiles
         )
       ]
-    } else {
-      log("No Swift output files, skip wrapping")
+    }
+
+    if commands.isEmpty {
+      log("No swift-java commands for module '\(sourceModule.name)'")
     }
 
     return commands
   }
 }
 
 extension SwiftJavaBuildToolPlugin {
-  func argumentsModuleName(sourceModule: Target) -> [String] {
+  func argumentsSwiftModule(sourceModule: Target) -> [String] {
     return [
       "--swift-module", sourceModule.name
     ]
   }
-
+
+  // FIXME: remove this and the deprecated property inside SwiftJava, this is a workaround
+  //        since we cannot have the same option in common options and in the top level
+  //        command from which we get into sub commands. The top command will NOT have this option.
+  func argumentsSwiftModuleDeprecated(sourceModule: Target) -> [String] {
+    return [
+      "--swift-module-deprecated", sourceModule.name
+    ]
+  }
+
   func argumentsOutputDirectory(context: PluginContext, generated: Bool = true) -> [String] {
     return [
       "--output-directory",
       outputDirectory(context: context, generated: generated).path(percentEncoded: false)
     ]
   }
-
+
+  func argumentsDependedOnConfigs(_ dependentConfigFiles: [(String, URL)]) -> [String] {
+    dependentConfigFiles.flatMap { moduleAndConfigFile in
+      let (moduleName, configFile) = moduleAndConfigFile
+      return [
+        "--depends-on",
+        "\(moduleName)=\(configFile.path(percentEncoded: false))"
+      ]
+    }
+  }
+
   func outputDirectory(context: PluginContext, generated: Bool = true) -> URL {
     let dir = context.pluginWorkDirectoryURL
     if generated {

Samples/JavaDependencySampleApp/ci-validate.sh

@@ -3,4 +3,12 @@
 set -e
 set -x
 
+# invoke resolve as part of a build run
 swift run --disable-sandbox
+
+# explicitly invoke resolve without explicit path or dependency
+# the dependencies should be uses from the --swift-module
+.build/plugins/tools/debug/SwiftJavaTool-tool resolve \
+  Sources/JavaCommonsCSV/swift-java.config \
+  --swift-module JavaCommonsCSV \
+  --output-directory .build/plugins/outputs/javadependencysampleapp/JavaCommonsCSV/destination/SwiftJavaPlugin/

Sources/JavaKitConfigurationShared/Configuration.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+// Copyright (c) 2024-2025 Apple Inc. and the Swift.org project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -46,11 +46,7 @@ public struct Configuration: Codable {
   public var classpath: String? = nil
 
   public var classpathEntries: [String] {
-    guard let classpath else {
-      return []
-    }
-
-    return classpath.split(separator: ":").map(String.init)
+    return classpath?.split(separator: ":").map(String.init) ?? []
   }
 
   /// The Java classes that should be translated to Swift. The keys are
@@ -80,6 +76,12 @@ public struct JavaDependencyDescriptor: Hashable, Codable {
   public var artifactID: String
   public var version: String
 
+  public init(groupID: String, artifactID: String, version: String) {
+    self.groupID = groupID
+    self.artifactID = artifactID
+    self.version = version
+  }
+
   public init(from decoder: any Decoder) throws {
     let container = try decoder.singleValueContainer()
     let string = try container.decode(String.self)
@@ -154,15 +156,15 @@ public func findSwiftJavaClasspaths(in basePath: String = FileManager.default.cu
   let baseURL = URL(fileURLWithPath: basePath)
   var classpathEntries: [String] = []
 
-  print("[debug][swift-java] Searching for *.swift-java.classpath files in: \(baseURL)")
+  print("[debug][swift-java] Searching for *.swift-java.classpath files in: \(baseURL.absoluteString)")
   guard let enumerator = fileManager.enumerator(at: baseURL, includingPropertiesForKeys: []) else {
     print("[warning][swift-java] Failed to get enumerator for \(baseURL)")
     return []
   }
 
   for case let fileURL as URL in enumerator {
     if fileURL.lastPathComponent.hasSuffix(".swift-java.classpath") {
-      print("[debug][swift-java] Constructing classpath with entries from: \(fileURL.relativePath)")
+      print("[debug][swift-java] Constructing classpath with entries from: \(fileURL.path)")
       if let contents = try? String(contentsOf: fileURL) {
         let entries = contents.split(separator: ":").map(String.init)
         for entry in entries {

Sources/JavaKitConfigurationShared/GradleDependencyParsing.swift

@@ -0,0 +1,48 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+import Foundation
+
+// Regex is not sendable yet so we can't cache it in a let
+fileprivate var GradleDependencyDescriptorRegex: Regex<(Substring, Substring, Substring, Substring)> {
+  try! Regex(#"^([^:]+):([^:]+):(\d[^:]+)$"#) // TODO: improve the regex to be more precise
+}
+
+// note: can't use `package` access level since it would break in usage in plugins in `_PluginsShared`.
+public func parseDependencyDescriptor(_ descriptor: String) -> JavaDependencyDescriptor? {
+  guard let match = try? GradleDependencyDescriptorRegex.firstMatch(in: descriptor) else {
+    return nil
+  }
+
+  let groupID = String(match.1)
+  let artifactID = String(match.2)
+  let version = String(match.3)
+
+  return JavaDependencyDescriptor(groupID: groupID, artifactID: artifactID, version: version)
+}
+
+// note: can't use `package` access level since it would break in usage in plugins in `_PluginsShared`.
+public func parseDependencyDescriptors(_ string: String) -> [JavaDependencyDescriptor] {
+  let descriptors = string.components(separatedBy: ",")
+  var parsedDependencies: [JavaDependencyDescriptor] = []
+  parsedDependencies.reserveCapacity(descriptors.count)
+
+  for descriptor in descriptors {
+    if let dependency = parseDependencyDescriptor(descriptor) {
+      parsedDependencies.append(dependency)
+    }
+  }
+
+  return parsedDependencies
+}