Skip to content

Allow configuring the library name to be loaded in swift-java.config #682

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 2 commits into from
Apr 7, 2026
+9 −3
Merged

Allow configuring the library name to be loaded in swift-java.config #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c0104e
Allow configuring the library name to be loaded in swift-java.config
ktoso Apr 7, 2026
579a232
typo fix
ktoso Apr 7, 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
2 changes: 1 addition & 1 deletion Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ extension FFMSwift2JavaGenerator {
func printClassConstants(printer: inout CodePrinter) {
printer.print(
"""
static final String LIB_NAME = "\(swiftModuleName)";
static final String LIB_NAME = "\(config.nativeLibraryName ?? swiftModuleName)";
static final Arena LIBRARY_ARENA = Arena.ofAuto();
"""
)
Expand Down
4 changes: 2 additions & 2 deletions Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ extension JNISwift2JavaGenerator {
printModuleClass(&printer) { printer in
printer.print(
"""
static final String LIB_NAME = "\(swiftModuleName)";
static final String LIB_NAME = "\(config.nativeLibraryName ?? swiftModuleName)";

static {
System.loadLibrary(SwiftLibraries.LIB_NAME_SWIFT_JAVA);
Expand Down Expand Up @@ -189,7 +189,7 @@ extension JNISwift2JavaGenerator {
printNominal(&printer, decl) { printer in
printer.print(
"""
static final String LIB_NAME = "\(swiftModuleName)";
static final String LIB_NAME = "\(config.nativeLibraryName ?? swiftModuleName)";

@SuppressWarnings("unused")
private static final boolean INITIALIZED_LIBS = initializeLibs();
Expand Down
6 changes: 6 additions & 0 deletions Sources/SwiftJavaConfigurationShared/Configuration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ public struct Configuration: Codable {

public var swiftModule: String?

/// The name of the native library to load at runtime via `System.loadLibrary()`.
/// Defaults to the Swift module name when not set. Use this when the dynamic
/// library product has a different name than the module being exported
/// (e.g. the module is `MyLibrary` but the dylib is `MyLibrarySwiftJava` or something else).
public var nativeLibraryName: String?

public var inputSwiftDirectory: String?

public var outputSwiftDirectory: String?
Expand Down
Loading