lots of fixing around how we deal with config and library loading

Author: ktoso

.github/scripts/validate_samples.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # shellcheck disable=SC2034
-declare -r GREEN='\033[0;31m'
+declare -r GREEN='\033[0;32m'
 declare -r BOLD='\033[1m'
 declare -r RESET='\033[0m'
 
@@ -15,22 +15,23 @@ for samplePackage in ${SAMPLE_PACKAGES} ; do
   echo ""
   echo ""
   echo "========================================================================"
-  printf "Validate sample: '${BOLD}%s${RESET}' using: " "$sampleDir"
+  printf "Validate sample '${BOLD}%s${RESET}' using: " "$sampleDir"
   cd "$sampleDir" || exit
   if [[ $(find . -name ${CI_VALIDATE_SCRIPT} -maxdepth 1) ]]; then
     echo -e "Custom ${BOLD}${CI_VALIDATE_SCRIPT}${RESET} script..."
     ./${CI_VALIDATE_SCRIPT} || exit
   elif [[ $(find . -name 'build.gradle*' -maxdepth 1) ]]; then
     echo -e "${BOLD}Gradle${RESET} build..."
-    ./gradlew build --info || exit
+    ./gradlew build || ./gradlew build --info # re-run to get better failure output
   else
     echo -e "${BOLD}SwiftPM${RESET} build..."
     swift build || exit
   fi
 
+  echo -e "Validated sample '${BOLD}${sampleDir}${RESET}': ${BOLD}passed${RESET}."
   cd - || exit
 done
 
-
+echo
 printf "Done validating samples: "
-echo "${GREEN}done${RESET}."
+echo -e "${GREEN}done${RESET}."

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

@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import java.util.*
+import java.io.*
 
 plugins {
     java
@@ -44,23 +45,23 @@ tasks.withType(JavaCompile::class).forEach {
 
 
 // FIXME: cannot share definition with 'buildSrc' so we duplicated the impl here
-fun javaLibraryPaths(): List<String> {
+fun javaLibraryPaths(dir: File): List<String> {
     val osName = System.getProperty("os.name")
     val osArch = System.getProperty("os.arch")
     val isLinux = osName.lowercase(Locale.getDefault()).contains("linux")
 
     return listOf(
         if (isLinux) {
             if (osArch.equals("x86_64") || osArch.equals("amd64")) {
-                "$rootDir/.build/x86_64-unknown-linux-gnu/debug/"
+                "$dir/.build/x86_64-unknown-linux-gnu/debug/"
             } else {
-                "$rootDir/.build/$osArch-unknown-linux-gnu/debug/"
+                "$dir/.build/$osArch-unknown-linux-gnu/debug/"
             }
         } else {
             if (osArch.equals("aarch64")) {
-                "$rootDir/.build/arm64-apple-macosx/debug/"
+                "$dir/.build/arm64-apple-macosx/debug/"
             } else {
-                "$rootDir/.build/$osArch-apple-macosx/debug/"
+                "$dir/.build/$osArch-apple-macosx/debug/"
             }
         },
         if (isLinux) {
@@ -79,7 +80,9 @@ 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().joinToString(File.pathSeparator)
+        "-Djava.library.path=" +
+                (javaLibraryPaths(rootDir) + javaLibraryPaths(project.projectDir))
+                    .joinToString(File.pathSeparator)
     )
 }
 

Plugins/JExtractSwiftCommandPlugin/JExtractSwiftCommandPlugin.swift

@@ -57,11 +57,13 @@ final class JExtractSwiftCommandPlugin: BuildToolPlugin, CommandPlugin {
       }
 
       do {
-        print("[swift-java] Extracting Java wrappers from target: '\(target.name)'...")
+        print("[swift-java-command] Extracting Java wrappers from target: '\(target.name)'...")
         try performCommand(context: context, target: target, arguments: arguments)
       } catch {
-        print("[swift-java] error: Failed to extract from target '\(target.name)': \(error)")
+        print("[swift-java-command] error: Failed to extract from target '\(target.name)': \(error)")
       }
+
+      print("[swift-java-command] Done.")
     }
   }
 
@@ -105,7 +107,7 @@ final class JExtractSwiftCommandPlugin: BuildToolPlugin, CommandPlugin {
     arguments.append(sourceDir)
 
     try runExtract(context: context, target: target, arguments: arguments)
-    
+
     if self.buildOutputs {
       // Building the *products* since we need to build the dylib that contains our newly generated sources,
       // so just building the target again would not be enough. We build all products which we affected using

Plugins/JExtractSwiftPlugin/JExtractSwiftPlugin.swift

@@ -34,8 +34,6 @@ struct JExtractSwiftBuildToolPlugin: BuildToolPlugin {
       .appending(path: "generated")
       .appending(path: "java")
     let outputDirectorySwift = context.pluginWorkDirectoryURL
-      .appending(path: "src")
-      .appending(path: "generated")
       .appending(path: "Sources")
 
     var arguments: [String] = [

Samples/JExtractPluginSampleApp/JExtractPluginSampleLibModule+SwiftJava.swiftdeps~

@@ -113,7 +113,7 @@ application {
         // Include the library paths where our dylibs are that we want to load and call
         "-Djava.library.path=" +
                 (BuildUtils.javaLibraryPaths(rootDir) +
-                 BuildUtils.javaLibraryPaths(layout.projectDirectory.asFile)).join(":"),
+                 BuildUtils.javaLibraryPaths(project.projectDir)).join(":"),
 
         // Enable tracing downcalls (to Swift)
         "-Djextract.trace.downcalls=true"

Samples/JExtractPluginSampleApp/MyCoolSwiftClass+SwiftJava.swiftdeps~

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+swift run JavaProbablyPrime 1337

Samples/JExtractPluginSampleApp/build.gradle

@@ -62,6 +62,9 @@ let package = Package(
       dependencies: [
         .product(name: "SwiftKitSwift", package: "swift-java"),
       ],
+      exclude: [
+        "swift-java.config",
+      ],
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])