Resolve & jextract subcommands and further dis-entangle commands (swiftlang#276)

Author: ktoso

.github/actions/prepare_env/action.yml

@@ -7,13 +7,13 @@ runs:
     - name: Install System Dependencies
       run: apt-get -qq update && apt-get -qq install -y make curl wget libjemalloc2 libjemalloc-dev
       shell: bash
-    - name: Cache JDK
+    - name: Cache JDKs
       id: cache-jdk
       uses: actions/cache@v4
       continue-on-error: true
       with:
-        path: /usr/lib/jvm/default-jdk/
-        key: ${{ runner.os }}-jdk-${{ matrix.jdk_vendor }}-${{ hashFiles('/usr/lib/jvm/default-jdk/*') }}
+        path: /usr/lib/jvm/
+        key: ${{ runner.os }}-jdk-${{ matrix.jdk_vendor }}-${{ hashFiles('/usr/lib/jvm/*') }}
         restore-keys: |
           ${{ runner.os }}-jdk-
     - name: Install JDK

.github/workflows/pull_request.yml

@@ -20,8 +20,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        # swift_version: ['nightly-main']
-        swift_version: ['6.0.2']
+        swift_version: ['6.1.2']
         os_version: ['jammy']
         jdk_vendor: ['Corretto']
     container:
@@ -36,7 +35,7 @@ jobs:
       - name: Gradle :SwiftKit:build
         run: ./gradlew build -x test
       - name: Gradle :SwiftKit:check
-        run: ./gradlew :SwiftKit:check --info
+        run: ./gradlew :SwiftKit:check --debug
       - name: Gradle compile JMH benchmarks
         run: ./gradlew compileJmh --info
 
@@ -46,8 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # swift_version: ['nightly-main']
-        swift_version: ['6.0.2']
+        swift_version: ['6.1.2']
         os_version: ['jammy']
         jdk_vendor: ['Corretto']
     container:
@@ -70,8 +68,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # swift_version: ['nightly-main']
-        swift_version: ['6.0.2']
+        swift_version: ['6.1.2']
         os_version: ['jammy']
         jdk_vendor: ['Corretto']
     container:
@@ -90,8 +87,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # swift_version: ['nightly-main']
-        swift_version: ['6.0.2']
+        swift_version: ['6.1.2']
         os_version: ['jammy']
         jdk_vendor: ['Corretto']
     container:
@@ -110,8 +106,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # swift_version: ['nightly-main']
-        swift_version: ['6.0.2']
+        swift_version: ['6.1.2']
         os_version: ['jammy']
         jdk_vendor: ['Corretto']
     container:
@@ -130,8 +125,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # swift_version: ['nightly-main']
-        swift_version: ['6.0.2']
+        swift_version: ['6.1.2']
         os_version: ['jammy']
         jdk_vendor: ['Corretto']
     container:
@@ -150,8 +144,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # swift_version: ['nightly-main']
-        swift_version: ['6.0.2']
+        swift_version: ['6.1.2']
         os_version: ['jammy']
         jdk_vendor: ['Corretto']
     container:
@@ -170,8 +163,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # swift_version: ['nightly-main']
-        swift_version: ['6.0.2']
+        swift_version: ['6.1.2']
         os_version: ['jammy']
         jdk_vendor: ['Corretto']
     container:

.gitignore

@@ -1,3 +1,6 @@
+.swift-version
+.sdkmanrc
+
 .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

BuildLogic/src/main/kotlin/build-logic.java-common-conventions.gradle.kts

@@ -23,7 +23,7 @@ plugins {
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(22)
+        languageVersion = JavaLanguageVersion.of(24)
     }
 }
 

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(.v15)
   ],
   products: [
     // ==== JavaKit (i.e. calling Java directly Swift utilities)
@@ -174,12 +175,6 @@ let package = Package(
         "JExtractSwiftPlugin"
       ]
     ),
-    .plugin(
-      name: "JExtractSwiftCommandPlugin",
-      targets: [
-        "JExtractSwiftCommandPlugin"
-      ]
-    ),
 
     // ==== Examples
 
@@ -195,6 +190,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 +362,8 @@ let package = Package(
         "JavaTypes",
         "JavaKitShared",
         "JavaKitConfigurationShared",
-        "_Subprocess", // using process spawning
+        // .product(name: "Subprocess", package: "swift-subprocess")
+        "_Subprocess",
       ],
       swiftSettings: [
         .swiftLanguageMode(.v5),
@@ -379,6 +379,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 +388,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"),
       ]
     ),
 
@@ -419,16 +423,6 @@ let package = Package(
         "SwiftJavaTool"
       ]
     ),
-    .plugin(
-      name: "JExtractSwiftCommandPlugin",
-      capability: .command(
-        intent: .custom(verb: "jextract", description: "Extract Java accessors from Swift module"),
-        permissions: [
-        ]),
-      dependencies: [
-        "SwiftJavaTool"
-      ]
-    ),
 
     .testTarget(
       name: "JavaKitTests",
@@ -467,6 +461,15 @@ let package = Package(
       ]
     ),
 
+    .testTarget(
+      name: "JavaKitConfigurationSharedTests",
+      dependencies: ["JavaKitConfigurationShared"],
+      swiftSettings: [
+        .swiftLanguageMode(.v5),
+        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
+      ]
+    ),
+
     .testTarget(
       name: "JExtractSwiftTests",
       dependencies: [
@@ -480,19 +483,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"),
       ]
     ),
   ]