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

Author: sidepelican

BuildLogic/src/main/kotlin/build-logic.java-common-conventions.gradle.kts

@@ -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)
     )
 }
 

BuildLogic/src/main/kotlin/utilities/javaLibraryPaths.kt

@@ -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
-}
+}

Samples/SwiftJavaExtractFFMSampleApp/build.gradle.kts

@@ -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"
     )
@@ -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"
     )

Samples/SwiftJavaExtractJNISampleApp/build.gradle.kts

@@ -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"
     )
@@ -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"
     )
@@ -119,4 +119,4 @@ tasks.register("printGradleHome") {
         println("Gradle Version: ${gradle.gradleVersion}")
         println("Gradle User Home: ${gradle.gradleUserHomeDir}")
     }
-}
+}