Merge branch 'main' into main

Author: ktoso

.github/workflows/pull_request.yml

@@ -153,16 +153,18 @@ jobs:
         uses: ./.github/actions/prepare_env
       - name: Swift Build
         run: swift build --build-tests --disable-sandbox --disable-experimental-prebuilts  # FIXME: until prebuilt swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
-      - name: Swift Test
-        run: swift test --disable-experimental-prebuilts  # FIXME: until prebuilt swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
+      - name: Swift Test (XCTest)
+        run: swift test --disable-experimental-swift-testing --disable-experimental-prebuilts  # FIXME: until prebuilt swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
+      - name: Swift Test (swift-testing)
+        run: swift test --disable-xctest --disable-experimental-prebuilts  # FIXME: until prebuilt swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
 
   test-swift-macos:
     name: Test (Swift) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
     runs-on: [self-hosted, macos, sequoia, ARM64]
     strategy:
       fail-fast: false
       matrix:
-        swift_version: ['6.2']
+        swift_version: ['6.2.3']
         os_version: ['macos']
         jdk_vendor: ['corretto']
     env:
@@ -171,10 +173,16 @@ jobs:
       - uses: actions/checkout@v4
       - name: Prepare CI Environment
         uses: ./.github/actions/prepare_env
+      - name: Install Swiftly
+        run: ./.github/scripts/install_swiftly.sh
+        env:
+          SWIFT_VERSION: "${{ matrix.swift_version }}"
       - name: Swift Build
         run: "swift build --build-tests --disable-sandbox"
-      - name: Swift Test
-        run: "swift test"
+      - name: Swift Test (swift-testing)
+        run: swift test --disable-xctest
+      - name: Swift Test (XCTest)
+        run: swift test --disable-experimental-swift-testing
 
   build-swift-android:
     name: Sample SwiftJavaExtractJNISampleApp (Android) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} android:${{matrix.sdk_triple}})

.gitignore

@@ -2,6 +2,7 @@
 .sdkmanrc
 
 .DS_Store
+.metals
 .build
 .idea
 .vscode

Benchmarks/Package.swift

@@ -1,9 +1,7 @@
 // swift-tools-version: 6.0
 
 import PackageDescription
-
-import class Foundation.FileManager
-import class Foundation.ProcessInfo
+import Foundation
 
 // Note: the JAVA_HOME environment variable must be set to point to where
 // Java is installed, e.g.,
@@ -24,8 +22,56 @@ func findJavaHome() -> String {
     return home
   }
 
+  if let home = getJavaHomeFromSDKMAN() {
+    return home
+  }
+
+  if let home = getJavaHomeFromPath() {
+    return home
+  }
+
   fatalError("Please set the JAVA_HOME environment variable to point to where Java is installed.")
 }
+
+func getJavaHomeFromSDKMAN() -> String? {
+  let home = FileManager.default.homeDirectoryForCurrentUser
+    .appendingPathComponent(".sdkman/candidates/java/current")
+
+  let javaBin = home.appendingPathComponent("bin/java").path
+  if FileManager.default.isExecutableFile(atPath: javaBin) {
+    return home.path
+  }
+  return nil
+}
+
+func getJavaHomeFromPath() -> String? {
+  let task = Process()
+  task.executableURL = URL(fileURLWithPath: "/usr/bin/which")
+  task.arguments = ["java"]
+
+  let pipe = Pipe()
+  task.standardOutput = pipe
+
+  do {
+    try task.run()
+    task.waitUntilExit()
+    guard task.terminationStatus == 0 else { return nil }
+
+    let data = pipe.fileHandleForReading.readDataToEndOfFile()
+    guard let javaPath = String(data: data, encoding: .utf8)?
+      .trimmingCharacters(in: .whitespacesAndNewlines),
+      !javaPath.isEmpty
+    else { return nil }
+
+    let resolved = URL(fileURLWithPath: javaPath).resolvingSymlinksInPath()
+    return resolved
+      .deletingLastPathComponent()
+      .deletingLastPathComponent()
+      .path
+  } catch {
+    return nil
+  }
+}
 let javaHome = findJavaHome()
 
 let javaIncludePath = "\(javaHome)/include"

Package.swift

@@ -34,6 +34,14 @@ func findJavaHome() -> String {
     return home
   }
 
+  if let home = getJavaHomeFromSDKMAN() {
+    return home
+  }
+
+  if let home = getJavaHomeFromPath() {
+    return home
+  }
+
 
   if ProcessInfo.processInfo.environment["SPI_PROCESSING"] == "1" && ProcessInfo.processInfo.environment["SPI_BUILD"] == nil {
     // Just ignore that we're missing a JAVA_HOME when building in Swift Package Index during general processing where no Java is needed. However, do _not_ suppress the error during SPI's compatibility build stage where Java is required.
@@ -80,6 +88,46 @@ func getJavaHomeFromLibexecJavaHome() -> String? {
     }
 }
 
+func getJavaHomeFromSDKMAN() -> String? {
+  let home = FileManager.default.homeDirectoryForCurrentUser
+    .appendingPathComponent(".sdkman/candidates/java/current")
+
+  let javaBin = home.appendingPathComponent("bin/java").path
+  if FileManager.default.isExecutableFile(atPath: javaBin) {
+    return home.path
+  }
+  return nil
+}
+
+func getJavaHomeFromPath() -> String? {
+  let task = Process()
+  task.executableURL = URL(fileURLWithPath: "/usr/bin/which")
+  task.arguments = ["java"]
+
+  let pipe = Pipe()
+  task.standardOutput = pipe
+
+  do {
+    try task.run()
+    task.waitUntilExit()
+    guard task.terminationStatus == 0 else { return nil }
+
+    let data = pipe.fileHandleForReading.readDataToEndOfFile()
+    guard let javaPath = String(data: data, encoding: .utf8)?
+      .trimmingCharacters(in: .whitespacesAndNewlines),
+      !javaPath.isEmpty
+    else { return nil }
+
+    let resolved = URL(fileURLWithPath: javaPath).resolvingSymlinksInPath()
+    return resolved
+      .deletingLastPathComponent()
+      .deletingLastPathComponent()
+      .path
+  } catch {
+    return nil
+  }
+}
+
 let javaHome = findJavaHome()
 
 let javaIncludePath = "\(javaHome)/include"
@@ -100,6 +148,7 @@ let package = Package(
     // ==== SwiftJava (i.e. calling Java directly Swift utilities)
     .library(
       name: "SwiftJava",
+      type: .dynamic,
       targets: ["SwiftJava"]
     ),
 
@@ -210,10 +259,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", .upToNextMinor(from: "1.3.0")), // primarily for ordered collections
-
-//    // 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"),
+    .package(url: "https://github.com/swiftlang/swift-subprocess.git", from: "0.2.1", traits: ["SubprocessFoundation"]),
 
     // Benchmarking
     .package(url: "https://github.com/ordo-one/package-benchmark", .upToNextMajor(from: "1.4.0")),
@@ -386,6 +432,9 @@ let package = Package(
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"], .when(platforms: [.macOS, .linux, .windows]))
+      ],
+      linkerSettings: [
+        .linkedLibrary("log", .when(platforms: [.android]))
       ]
     ),
 
@@ -412,8 +461,7 @@ let package = Package(
         "JavaTypes",
         "SwiftJavaShared",
         "SwiftJavaConfigurationShared",
-        // .product(name: "Subprocess", package: "swift-subprocess")
-        "_Subprocess",
+        .product(name: "Subprocess", package: "swift-subprocess")
       ],
       swiftSettings: [
         .swiftLanguageMode(.v5),
@@ -457,6 +505,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: "OrderedCollections", package: "swift-collections"),
         "JavaTypes",
         "SwiftJavaShared",
         "SwiftJavaConfigurationShared",
@@ -537,28 +586,6 @@ let package = Package(
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
       ]
-    ),
-    
-    // Experimental Foundation Subprocess Copy
-    .target(
-      name: "_SubprocessCShims",
-      swiftSettings: [
-        .swiftLanguageMode(.v5)
-      ]
-    ),
-    .target(
-      name: "_Subprocess",
-      dependencies: [
-        "_SubprocessCShims",
-        .product(name: "SystemPackage", package: "swift-system"),
-      ],
-      swiftSettings: [
-        .swiftLanguageMode(.v5),
-        .define(
-          "SYSTEM_PACKAGE_DARWIN",
-          .when(platforms: [.macOS, .macCatalyst, .iOS, .watchOS, .tvOS, .visionOS])),
-        .define("SYSTEM_PACKAGE"),
-      ]
-    ),
+    )
   ]
 )