Skip to content

Fix swift-java.config not being loaded from dependency module directories #542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktoso merged 3 commits into from
Jan 28, 2026
Merged

Fix swift-java.config not being loaded from dependency module directories #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14cc2af
Load config file according to package
sidepelican Jan 27, 2026
452e319
Read javaPackage from config
sidepelican Jan 27, 2026
2933b66
Remove unnecessary plugin dependency
sidepelican Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions Plugins/JExtractSwiftPlugin/JExtractSwiftPlugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ struct JExtractSwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
// which we are generating Swift wrappers for Java classes.
let configFile = URL(filePath: sourceDir).appending(path: "swift-java.config")
let configuration = try readConfiguration(sourceDir: "\(sourceDir)")

guard let javaPackage = configuration?.javaPackage else {
// throw SwiftJavaPluginError.missingConfiguration(sourceDir: "\(sourceDir)", key: "javaPackage")
log("Skipping jextract step, no 'javaPackage' configuration in \(getSwiftJavaConfigPath(target: target) ?? "")")
Copy link
Contributor Author

@sidepelican sidepelican Jan 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing javaPackage handling to the command as it already accounts for empty values.

swift-java/Sources/JExtractSwiftLib/Swift2Java.swift

Lines 40 to 42 in 8cf1829

if config.javaPackage == nil || config.javaPackage!.isEmpty {
translator.log.warning("Configured java package is '', consider specifying concrete package for generated sources.")
}

return []
}

// We use the the usual maven-style structure of "src/[generated|main|test]/java/..."
// that is common in JVM ecosystem
Expand All @@ -66,6 +60,7 @@ struct JExtractSwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {

var arguments: [String] = [
/*subcommand=*/"jextract",
"--config", configFile.path(percentEncoded: false),
"--swift-module", sourceModule.name,
"--input-swift", sourceDir,
"--output-java", outputJavaDirectory.path(percentEncoded: false),
Expand All @@ -88,10 +83,6 @@ struct JExtractSwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
}
arguments += dependentConfigFilesArguments

if !javaPackage.isEmpty {
arguments += ["--java-package", javaPackage]
}

let swiftFiles = sourceModule.sourceFiles.map { $0.url }.filter {
$0.pathExtension == "swift"
}
Expand Down
1 change: 0 additions & 1 deletion Samples/JavaKitSampleApp/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ let package = Package(
],
plugins: [
.plugin(name: "JavaCompilerPlugin", package: "swift-java"),
.plugin(name: "JExtractSwiftPlugin", package: "swift-java"),
.plugin(name: "SwiftJavaPlugin", package: "swift-java"),
]
),
Expand Down
Loading