From b074d83b212aafb16d0ae5bb253b7d1108bd3954 Mon Sep 17 00:00:00 2001 From: Iceman Date: Mon, 6 Apr 2026 16:20:05 +0900 Subject: [PATCH 1/2] Stop to scan repository root .build dir --- .../build-logic.java-common-conventions.gradle.kts | 4 +--- BuildLogic/src/main/kotlin/utilities/javaLibraryPaths.kt | 9 +++------ Samples/SwiftJavaExtractFFMSampleApp/build.gradle.kts | 4 ++-- Samples/SwiftJavaExtractJNISampleApp/build.gradle.kts | 6 +++--- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/BuildLogic/src/main/kotlin/build-logic.java-common-conventions.gradle.kts b/BuildLogic/src/main/kotlin/build-logic.java-common-conventions.gradle.kts index 1b1336f33..556ec7fb7 100644 --- a/BuildLogic/src/main/kotlin/build-logic.java-common-conventions.gradle.kts +++ b/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) ) } diff --git a/BuildLogic/src/main/kotlin/utilities/javaLibraryPaths.kt b/BuildLogic/src/main/kotlin/utilities/javaLibraryPaths.kt index 39cf9d110..943ae2434 100644 --- a/BuildLogic/src/main/kotlin/utilities/javaLibraryPaths.kt +++ b/BuildLogic/src/main/kotlin/utilities/javaLibraryPaths.kt @@ -44,13 +44,10 @@ fun Project.javaLibraryPaths(rootDir: File?): List { "${arch}-apple-macosx" } - val paths: List = listOf("release", "debug").flatMap { configuration -> - listOf( - "${base}.build/${triple}/$configuration/", - "${base}../../.build/${triple}/$configuration/", - ) + val paths: List = listOf("release", "debug").map { configuration -> + "${base}.build/${triple}/$configuration/" } val swiftRuntimePaths = swiftRuntimeLibraryPaths() return paths + swiftRuntimePaths -} \ No newline at end of file +} diff --git a/Samples/SwiftJavaExtractFFMSampleApp/build.gradle.kts b/Samples/SwiftJavaExtractFFMSampleApp/build.gradle.kts index cd685d067..871cdf054 100644 --- a/Samples/SwiftJavaExtractFFMSampleApp/build.gradle.kts +++ b/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(":"), // 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(":"), // Enable tracing downcalls (to Swift) "-Djextract.trace.downcalls=false" ) diff --git a/Samples/SwiftJavaExtractJNISampleApp/build.gradle.kts b/Samples/SwiftJavaExtractJNISampleApp/build.gradle.kts index 2df9e3772..f0373bb93 100644 --- a/Samples/SwiftJavaExtractJNISampleApp/build.gradle.kts +++ b/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(":"), // 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(":"), // 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}") } -} \ No newline at end of file +} From b710d9a8a1c3632116461e3cc4189747ebb5c5d1 Mon Sep 17 00:00:00 2001 From: Iceman Date: Mon, 6 Apr 2026 17:40:32 +0900 Subject: [PATCH 2/2] Use File.pathSeparator --- Samples/SwiftJavaExtractFFMSampleApp/build.gradle.kts | 4 ++-- Samples/SwiftJavaExtractJNISampleApp/build.gradle.kts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Samples/SwiftJavaExtractFFMSampleApp/build.gradle.kts b/Samples/SwiftJavaExtractFFMSampleApp/build.gradle.kts index 871cdf054..5fec886d2 100644 --- a/Samples/SwiftJavaExtractFFMSampleApp/build.gradle.kts +++ b/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(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(project.projectDir).joinToString(":"), + "-Djava.library.path=" + javaLibraryPaths(project.projectDir).joinToString(File.pathSeparator), // Enable tracing downcalls (to Swift) "-Djextract.trace.downcalls=false" ) diff --git a/Samples/SwiftJavaExtractJNISampleApp/build.gradle.kts b/Samples/SwiftJavaExtractJNISampleApp/build.gradle.kts index f0373bb93..48e2560e2 100644 --- a/Samples/SwiftJavaExtractJNISampleApp/build.gradle.kts +++ b/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(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(project.projectDir).joinToString(":"), + "-Djava.library.path=" + javaLibraryPaths(project.projectDir).joinToString(File.pathSeparator), // Enable tracing downcalls (to Swift) "-Djextract.trace.downcalls=false" )