From 606fbaa4bbdefdc463cbc5d4963b5eab45f846b9 Mon Sep 17 00:00:00 2001
From: pelekon <13712101+pelekon@users.noreply.github.com>
Date: Sun, 19 Oct 2025 13:42:01 +0200
Subject: [PATCH 1/2] Fix JExtractGenerationMode not being used by
 JExtractCommand.

---
 Sources/SwiftJavaTool/Commands/JExtractCommand.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Sources/SwiftJavaTool/Commands/JExtractCommand.swift b/Sources/SwiftJavaTool/Commands/JExtractCommand.swift
index ec7c0aeb..7ecb3dee 100644
--- a/Sources/SwiftJavaTool/Commands/JExtractCommand.swift
+++ b/Sources/SwiftJavaTool/Commands/JExtractCommand.swift
@@ -86,6 +86,7 @@ extension SwiftJava.JExtractCommand {
     if let javaPackage {
       config.javaPackage = javaPackage
     }
+    config.mode = mode
     config.swiftModule = self.effectiveSwiftModule
     config.outputJavaDirectory = outputJava
     config.outputSwiftDirectory = outputSwift

From 6b92d329ba9c6ca709d3a3273fae57aa218e1f53 Mon Sep 17 00:00:00 2001
From: pelekon <13712101+pelekon@users.noreply.github.com>
Date: Tue, 21 Oct 2025 21:17:15 +0200
Subject: [PATCH 2/2] Fix Samples tests.

---
 Sources/SwiftJavaTool/Commands/JExtractCommand.swift | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Sources/SwiftJavaTool/Commands/JExtractCommand.swift b/Sources/SwiftJavaTool/Commands/JExtractCommand.swift
index 7ecb3dee..c730cbf6 100644
--- a/Sources/SwiftJavaTool/Commands/JExtractCommand.swift
+++ b/Sources/SwiftJavaTool/Commands/JExtractCommand.swift
@@ -40,7 +40,7 @@ extension SwiftJava {
     @OptionGroup var commonOptions: SwiftJava.CommonOptions
 
     @Option(help: "The mode of generation to use for the output files. Used with jextract mode.")
-    var mode: JExtractGenerationMode = .ffm
+    var mode: JExtractGenerationMode?
 
     @Option(help: "The name of the Swift module into which the resulting Swift types will be generated.")
     var swiftModule: String
@@ -86,7 +86,11 @@ extension SwiftJava.JExtractCommand {
     if let javaPackage {
       config.javaPackage = javaPackage
     }
-    config.mode = mode
+    if let mode {
+      config.mode = mode
+    } else if config.mode == nil {
+      config.mode = .ffm
+    }
     config.swiftModule = self.effectiveSwiftModule
     config.outputJavaDirectory = outputJava
     config.outputSwiftDirectory = outputSwift