Skip to content

Narrow down java.library.path to prevent loading stale dylibs #673

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 6, 2026
Merged

Narrow down java.library.path to prevent loading stale dylibs #673

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
b074d83
Stop to scan repository root .build dir
sidepelican Apr 6, 2026
b710d9a
Use File.pathSeparator
sidepelican Apr 6, 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
4 changes: 1 addition & 3 deletions BuildLogic/src/main/kotlin/build-logic.java-common-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,7 @@ tasks.test {
"--enable-native-access=ALL-UNNAMED",

// Include the library paths where our dylibs are that we want to load and call
"-Djava.library.path=" +
(javaLibraryPaths(rootDir) + javaLibraryPaths(project.projectDir))
.joinToString(File.pathSeparator)
"-Djava.library.path=" + javaLibraryPaths(project.projectDir).joinToString(File.pathSeparator)
)
}

Expand Down
9 changes: 3 additions & 6 deletions BuildLogic/src/main/kotlin/utilities/javaLibraryPaths.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,10 @@ fun Project.javaLibraryPaths(rootDir: File?): List<String> {
"${arch}-apple-macosx"
}

val paths: List<String> = listOf("release", "debug").flatMap { configuration ->
listOf(
"${base}.build/${triple}/$configuration/",
"${base}../../.build/${triple}/$configuration/",
)
val paths: List<String> = listOf("release", "debug").map { configuration ->
"${base}.build/${triple}/$configuration/"
}
val swiftRuntimePaths = swiftRuntimeLibraryPaths()

return paths + swiftRuntimePaths
}
}
4 changes: 2 additions & 2 deletions Samples/SwiftJavaExtractFFMSampleApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ application {
applicationDefaultJvmArgs = listOf(
"--enable-native-access=ALL-UNNAMED",
// Include the library paths where our dylibs are that we want to load and call
"-Djava.library.path=" + (javaLibraryPaths(rootDir) + javaLibraryPaths(project.projectDir)).joinToString(":"),
"-Djava.library.path=" + javaLibraryPaths(project.projectDir).joinToString(File.pathSeparator),
// Enable tracing downcalls (to Swift)
"-Djextract.trace.downcalls=true"
)
Expand All @@ -95,7 +95,7 @@ jmh {

jvmArgsAppend = listOf(
"--enable-native-access=ALL-UNNAMED",
"-Djava.library.path=" + (javaLibraryPaths(rootDir) + javaLibraryPaths(project.projectDir)).joinToString(":"),
"-Djava.library.path=" + javaLibraryPaths(project.projectDir).joinToString(File.pathSeparator),
// Enable tracing downcalls (to Swift)
"-Djextract.trace.downcalls=false"
)
Expand Down
6 changes: 3 additions & 3 deletions Samples/SwiftJavaExtractJNISampleApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ application {
applicationDefaultJvmArgs = listOf(
"--enable-native-access=ALL-UNNAMED",
// Include the library paths where our dylibs are that we want to load and call
"-Djava.library.path=" + (javaLibraryPaths(rootDir) + javaLibraryPaths(project.projectDir)).joinToString(":"),
"-Djava.library.path=" + javaLibraryPaths(project.projectDir).joinToString(File.pathSeparator),
// Enable tracing downcalls (to Swift)
"-Djextract.trace.downcalls=true"
)
Expand All @@ -107,7 +107,7 @@ jmh {

jvmArgsAppend = listOf(
"--enable-native-access=ALL-UNNAMED",
"-Djava.library.path=" + (javaLibraryPaths(rootDir) + javaLibraryPaths(project.projectDir)).joinToString(":"),
"-Djava.library.path=" + javaLibraryPaths(project.projectDir).joinToString(File.pathSeparator),
// Enable tracing downcalls (to Swift)
"-Djextract.trace.downcalls=false"
)
Expand All @@ -119,4 +119,4 @@ tasks.register("printGradleHome") {
println("Gradle Version: ${gradle.gradleVersion}")
println("Gradle User Home: ${gradle.gradleUserHomeDir}")
}
}
}
Loading