fixing classpaths and library paths...

Author: ktoso

Package.swift

@@ -86,7 +86,7 @@ let javaIncludePath = "\(javaHome)/include"
 let package = Package(
   name: "SwiftJava",
   platforms: [
-    .macOS(.v13)
+    .macOS(.v15)
   ],
   products: [
     // ==== JavaKit (i.e. calling Java directly Swift utilities)

Samples/JavaDependencySampleApp/ci-validate.sh

@@ -8,7 +8,7 @@ swift run --disable-sandbox
 
 # explicitly invoke resolve without explicit path or dependency
 # the dependencies should be uses from the --swift-module
-.build/plugins/tools/debug/SwiftJavaTool-tool resolve \
+swift run swift-java resolve \
   Sources/JavaCommonsCSV/swift-java.config \
   --swift-module JavaCommonsCSV \
   --output-directory .build/plugins/outputs/javadependencysampleapp/JavaCommonsCSV/destination/SwiftJavaPlugin/

Samples/SwiftAndJavaJarSampleLib/ci-validate.sh

@@ -5,26 +5,52 @@ set -x
 
 ./gradlew jar
 
+export SWIFT_VERSION="$(swift -version | awk '/Swift version/ { print $3 }')"
+
 # we make sure to build and run with JDK 24 because the runtime needs latest JDK, unlike Gradle which needed 21.
-export PATH="${PATH}:/usr/lib/jvm/jdk-24/bin"
+if [ "$(uname -s)" = 'Darwin' ]
+then
+  export OS='osx'
+elif [ "$(uname -s)" = 'Linux' ]
+then
+  export OS='linux'
+  export PATH="${PATH}:/usr/lib/jvm/jdk-24/bin" # we need to make sure to use the latest JDK to actually compile/run the executable
+fi
 
 # check if we can compile a plain Example file that uses the generated Java bindings that should be in the generated jar
-MYLIB_CLASSPATH="$(ls bin/default/build/libs/*.jar)"
-javac -cp "${MYLIB_CLASSPATH}" Example.java
+# The classpath MUST end with a * if it contains jar files, and must not if it directly contains class files.
+SWIFTKIT_CLASSPATH="$(pwd)/../../SwiftKit/build/libs/*"
+MYLIB_CLASSPATH="$(pwd)/build/libs/*"
+CLASSPATH="$(pwd)/:${SWIFTKIT_CLASSPATH}:${MYLIB_CLASSPATH}"
+echo "CLASSPATH       = ${CLASSPATH}"
+
+javac -cp "${CLASSPATH}" Example.java
 
 if [ "$(uname -s)" = 'Linux' ]
 then
   SWIFT_LIB_PATHS=/usr/lib/swift/linux
   SWIFT_LIB_PATHS="${SWIFT_LIB_PATHS}:$(find . | grep libMySwiftLibrary.so$ | sort | head -n1 | xargs dirname)"
+
+  # if we are on linux, find the Swiftly or System-wide installed libraries dir
+  SWIFT_CORE_LIB=$(find "$HOME"/.local -name "libswiftCore.so" 2>/dev/null | grep "$SWIFT_VERSION" | head -n1)
+  if [ -n "$SWIFT_CORE_LIB" ]; then
+    SWIFT_LIB_PATHS="${SWIFT_LIB_PATHS}:$(dirname "$SWIFT_CORE_LIB")"
+  else
+    # maybe there is one installed system-wide in /usr/lib?
+    SWIFT_CORE_LIB2=$(find /usr/lib -name "libswiftCore.so" 2>/dev/null | grep "$SWIFT_VERSION" | head -n1)
+    if [ -n "$SWIFT_CORE_LIB2" ]; then
+      SWIFT_LIB_PATHS="${SWIFT_LIB_PATHS}:$(dirname "$SWIFT_CORE_LIB2")"
+    fi
+  fi
 elif [ "$(uname -s)" = 'Darwin' ]
 then
   SWIFT_LIB_PATHS=$(find "$(swiftly use --print-location)" | grep dylib$ | grep libswiftCore | grep macos | xargs dirname)
-  SWIFT_LIB_PATHS="${SWIFT_LIB_PATHS}:$(find . | grep libMySwiftLibrary.dylib$ | sort | head -n1 | xargs dirname)"
+  SWIFT_LIB_PATHS="${SWIFT_LIB_PATHS}:$(pwd)/$(find . | grep libMySwiftLibrary.dylib$ | sort | head -n1 | xargs dirname)"
 fi
+echo "SWIFT_LIB_PATHS = ${SWIFT_LIB_PATHS}"
 
 # Can we run the example?
-SWIFTKIT_CLASSPATH="$(ls ../../SwiftKit/build/libs/*.jar)"
 java --enable-native-access=ALL-UNNAMED \
      -Djava.library.path="${SWIFT_LIB_PATHS}" \
-     -cp ".:${MYLIB_CLASSPATH}:${SWIFTKIT_CLASSPATH}" \
+     -cp "${CLASSPATH}" \
      Example

Samples/SwiftKitSampleApp/Package.swift

@@ -43,7 +43,7 @@ let javaIncludePath = "\(javaHome)/include"
 let package = Package(
   name: "SwiftKitSampleApp",
   platforms: [
-    .macOS(.v10_15)
+    .macOS(.v15)
   ],
   products: [
     .library(