Merge main into jextract-closure-array-results: SwiftExtract moved to swift-binding-generator-core

swiftlang#957 moved SwiftExtract out of this repository. This
branch's analysis changes are now jextract-closures-jextracted-types on piercifani/swift-binding-generator-core, which Package.swift depends on.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: piercifani

CONTRIBUTING.md

@@ -106,6 +106,24 @@ In the case of formatting issues, `git add` the formatting changes and attempt t
 
 Some documentation is generated from source and checked in, so CI can catch it drifting out of date. If you changed `Configuration.swift` or a CLI command's flags/help text, run `scripts/generate-docs.sh` and commit the generated changes.
 
+### Developing against local dependency checkouts
+
+swift-java depends on [swift-java-jni-core](https://github.com/swiftlang/swift-java-jni-core) and [swift-binding-generator-core](https://github.com/swiftlang/swift-binding-generator-core) (home of the `SwiftExtract` library) from their `main` branches. To develop against local checkouts instead, clone the repositories next to your swift-java checkout and point the corresponding environment variables at them:
+
+```bash
+export PROJECT_ROOT= # the directory containing your checkouts
+cd $PROJECT_ROOT
+ls
+> swift-java
+> swift-java-jni-core
+> swift-binding-generator-core
+> # ...and all the others here
+
+export SWIFT_JAVA_JNI_CORE_PATH=$PROJECT_ROOT/swift-java-jni-core
+export SWIFT_BINDING_GENERATOR_CORE_PATH=$PROJECT_ROOT/swift-binding-generator-core
+swift build
+```
+
 ## How to contribute your work
 
 Please open a pull request at https://github.com/swiftlang/swift-java. Make sure the CI passes, and then wait for code review.

Package.swift

@@ -11,6 +11,14 @@ if let localPath = Context.environment["SWIFT_JAVA_JNI_CORE_PATH"] {
   swiftJavaJNICoreDep = .package(url: "https://github.com/swiftlang/swift-java-jni-core", branch: "main")
 }
 
+let swiftBindingGeneratorCoreDep: Package.Dependency
+if let localPath = Context.environment["SWIFT_BINDING_GENERATOR_CORE_PATH"] {
+  swiftBindingGeneratorCoreDep = .package(path: localPath)
+} else {
+  // The analysis part of this branch: the same branch of the core fork.
+  swiftBindingGeneratorCoreDep = .package(url: "https://github.com/piercifani/swift-binding-generator-core", branch: "jextract-closures-jextracted-types")
+}
+
 // Set SWIFTJAVA_DOCC_PLUGIN_INSTALL=1 to install the docc-plugin automatically,
 // or DOCC_PLUGIN_PATH=<path> to point at a local checkout.
 // This is a workaround because swift-subprocess includes the plugin explicitly,
@@ -59,11 +67,6 @@ let package = Package(
       targets: ["SwiftJavaConfigurationShared"]
     ),
 
-    .library(
-      name: "SwiftExtractConfigurationShared",
-      targets: ["SwiftExtractConfigurationShared"]
-    ),
-
     .library(
       name: "JavaUtil",
       targets: ["JavaUtil"]
@@ -129,11 +132,6 @@ let package = Package(
       targets: ["SwiftRuntimeFunctions"]
     ),
 
-    .library(
-      name: "SwiftExtract",
-      targets: ["SwiftExtract"]
-    ),
-
     .library(
       name: "CodePrinting",
       targets: ["CodePrinting"]
@@ -166,11 +164,14 @@ let package = Package(
   ],
   dependencies: [
     swiftJavaJNICoreDep,
+    swiftBindingGeneratorCoreDep,
     .package(url: "https://github.com/swiftlang/swift-syntax", from: "603.0.0"),
     .package(url: "https://github.com/apple/swift-argument-parser", from: "1.8.0"),
     .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
+    // primarily for ordered collections
+    // FIXME: swift-collections 1.7.0 raised its minimum toolchain to Swift 6.2; stay below it while we still support Swift 6.1
+    .package(url: "https://github.com/apple/swift-collections", "1.3.0"..<"1.7.0"),
     .package(url: "https://github.com/swiftlang/swift-subprocess.git", "0.4.0"..<"0.5.0", traits: ["SubprocessFoundation"]),
 
     // Benchmarking
@@ -304,14 +305,10 @@ let package = Package(
     .target(
       name: "SwiftJavaConfigurationShared",
       dependencies: [
-        "SwiftExtractConfigurationShared"
+        .product(name: "SwiftExtractConfigurationShared", package: "swift-binding-generator-core")
       ]
     ),
 
-    .target(
-      name: "SwiftExtractConfigurationShared"
-    ),
-
     .target(
       name: "SwiftJavaShared"
     ),
@@ -352,6 +349,7 @@ let package = Package(
         .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
         .product(name: "SystemPackage", package: "swift-system"),
+        .product(name: "SwiftExtract", package: "swift-binding-generator-core"),
         "SwiftJava",
         "JavaUtilJar",
         "JavaNet",
@@ -375,32 +373,6 @@ let package = Package(
       ]
     ),
 
-    .target(
-      name: "SwiftExtract",
-      dependencies: [
-        .product(name: "SwiftBasicFormat", package: "swift-syntax"),
-        .product(name: "SwiftIfConfig", package: "swift-syntax"),
-        .product(name: "SwiftLexicalLookup", package: "swift-syntax"),
-        .product(name: "SwiftParser", package: "swift-syntax"),
-        .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
-        "SwiftExtractConfigurationShared",
-      ],
-      path: "Sources/SwiftExtract",
-      resources: [
-        // Holds the `dummy.json` placeholder so SwiftPM emits a `Bundle.module`
-        // for this target. The real `static-build-config.json` is generated at
-        // build time by the `_StaticBuildConfigPlugin` build tool below.
-        .process("Resources")
-      ],
-      swiftSettings: [
-        .swiftLanguageMode(.v5)
-      ],
-      plugins: [
-        .plugin(name: "_StaticBuildConfigPlugin")
-      ]
-    ),
-
     .target(
       name: "JExtractSwiftLib",
       dependencies: [
@@ -412,7 +384,7 @@ let package = Package(
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
         .product(name: "OrderedCollections", package: "swift-collections"),
         .product(name: "SwiftJavaJNICore", package: "swift-java-jni-core"),
-        "SwiftExtract",
+        .product(name: "SwiftExtract", package: "swift-binding-generator-core"),
         "SwiftJavaShared",
         "SwiftJavaConfigurationShared",
         "CodePrinting",
@@ -423,14 +395,6 @@ let package = Package(
       ]
     ),
 
-    .executableTarget(
-      name: "StaticBuildConfigPluginExecutable",
-      dependencies: [
-        .product(name: "Subprocess", package: "swift-subprocess"),
-        .product(name: "SwiftIfConfig", package: "swift-syntax"),
-      ]
-    ),
-
     // Dev-time tool: regenerates the "Supported configuration options" table in
     // `Sources/SwiftJavaDocumentation/Documentation.docc/SwiftJavaConfigFile.md`
     // straight from the doc comments on `Configuration.swift` and the enums it
@@ -448,14 +412,6 @@ let package = Package(
       path: "Sources/GenerateConfigDocs"
     ),
 
-    .plugin(
-      name: "_StaticBuildConfigPlugin",
-      capability: .buildTool(),
-      dependencies: [
-        "StaticBuildConfigPluginExecutable"
-      ]
-    ),
-
     .plugin(
       name: "JExtractSwiftPlugin",
       capability: .buildTool(),
@@ -512,23 +468,14 @@ let package = Package(
       name: "JExtractSwiftTests",
       dependencies: [
         "JExtractSwiftLib",
-        "SwiftExtract",
+        .product(name: "SwiftExtract", package: "swift-binding-generator-core"),
         "CodePrinting",
       ],
       swiftSettings: [
         .swiftLanguageMode(.v5)
       ]
     ),
 
-    .testTarget(
-      name: "SwiftExtractTests",
-      dependencies: [
-        "SwiftExtract",
-        .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftParser", package: "swift-syntax"),
-      ]
-    ),
-
     .testTarget(
       name: "CodePrintingTests",
       dependencies: [

Plugins/PluginsShared/SwiftExtractConfigurationShared

@@ -0,0 +1,14 @@
+DO NOT EDIT THESE FILES IN THIS REPOSITORY.
+
+The files in this directory are vendored, byte-identical copies of:
+
+    https://github.com/swiftlang/swift-binding-generator-core
+    Sources/SwiftExtractConfigurationShared/
+
+They exist because SwiftPM package plugins cannot take sources from a package
+dependency, so the plugins in this repository compile these files directly.
+
+Make any changes in swift-binding-generator-core instead, and then copy the
+updated files here. The swift-java compatibility CI job in
+swift-binding-generator-core diffs these copies against its own sources and
+will flag any drift.

…onfigurationShared/AccessLevelMode.swift …onfigurationShared/AccessLevelMode.swiftSources/SwiftExtractConfigurationShared/AccessLevelMode.swift renamed to Plugins/PluginsShared/SwiftExtractConfigurationShared/AccessLevelMode.swift Sources/SwiftExtractConfigurationShared/AccessLevelMode.swift renamed to Plugins/PluginsShared/SwiftExtractConfigurationShared/AccessLevelMode.swift

@@ -97,6 +97,8 @@ In this mode the generated sources use JNI to call native code.
 This mode offers less performance and flexibility than FFM, but it is the most compatible: it works on older JVMs as well as on Android.
 Use it when FFM is not available, or when wide deployment compatibility is your priority. When performance is paramount, prefer FFM.
 
+For Android-specific guidance, see also the [Android documentation](Sources/SwiftJavaDocumentation/Documentation.docc/Android.md).
+
 Required language/runtime versions:
 - **Swift 6.2**, because of dependence on rich swift interface files
 - **JDK 17+**; the generated Java sources target the `javaSourceLevel` setting, which supports 17 through 25 (default 22)

Plugins/PluginsShared/SwiftExtractConfigurationShared/DO_NOT_EDIT.txt

@@ -105,3 +105,11 @@ public func outputCallbacks(
     optionalString: callbacks.withOptionalString(optionalString)
   )
 }
+
+public struct CallbackHolder {
+  public init(callback: any CallbackProtocol) {
+    self.callback = callback
+  }
+
+  public var callback: any CallbackProtocol
+}

…xtractConfigurationShared/LogLevel.swift …xtractConfigurationShared/LogLevel.swiftSources/SwiftExtractConfigurationShared/LogLevel.swift renamed to Plugins/PluginsShared/SwiftExtractConfigurationShared/LogLevel.swift Sources/SwiftExtractConfigurationShared/LogLevel.swift renamed to Plugins/PluginsShared/SwiftExtractConfigurationShared/LogLevel.swift

@@ -49,13 +49,29 @@ struct GenerateConfigDocs: ParsableCommand {
       .appendingPathComponent("Documentation.docc", isDirectory: true)
       .appendingPathComponent("SwiftJavaConfigFile.md", isDirectory: false)
 
+    // `SwiftExtractConfigurationShared` lives in the swift-binding-generator-core
+    // package since `SwiftExtract` was split out of this repo. Scan every location
+    // it may be found in.
     let scanDirs: [URL] = [
       repoRoot
         .appendingPathComponent("Sources", isDirectory: true)
         .appendingPathComponent("SwiftJavaConfigurationShared", isDirectory: true),
+      // Legacy in-repo location (pre-split layout).
       repoRoot
         .appendingPathComponent("Sources", isDirectory: true)
         .appendingPathComponent("SwiftExtractConfigurationShared", isDirectory: true),
+      // Resolved swift-binding-generator-core checkout.
+      repoRoot
+        .appendingPathComponent(".build", isDirectory: true)
+        .appendingPathComponent("checkouts", isDirectory: true)
+        .appendingPathComponent("swift-binding-generator-core", isDirectory: true)
+        .appendingPathComponent("Sources", isDirectory: true)
+        .appendingPathComponent("SwiftExtractConfigurationShared", isDirectory: true),
+      // Vendored copy shared with the build plugins.
+      repoRoot
+        .appendingPathComponent("Plugins", isDirectory: true)
+        .appendingPathComponent("PluginsShared", isDirectory: true)
+        .appendingPathComponent("SwiftExtractConfigurationShared", isDirectory: true),
     ]
 
     // Parse enums and structs referenced by Configuration.