lib paths: workaround for swiftly installed 6.0.2 lib path

Author: ktoso

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

@@ -69,6 +69,12 @@ fun javaLibraryPaths(dir: File): List<String> {
         } else {
             // assume macOS
             "/usr/lib/swift/"
+        },
+        if (isLinux) {
+            System.getProperty("user.home") + "/.local/share/swiftly/toolchains/6.0.2/usr/lib/swift/linux"
+        } else {
+            // assume macOS
+            "/usr/lib/swift/"
         }
     )
 }

Samples/SwiftKitSampleApp/src/test/java/com/example/swift/MySwiftClassTest.java

@@ -16,15 +16,37 @@
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.swift.swiftkit.SwiftKit;
+
+import java.io.File;
+import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 public class MySwiftClassTest {
 
+    void checkPaths(Throwable throwable) {
+        var paths = SwiftKit.getJavaLibraryPath().split(":");
+        for (var path : paths) {
+            System.out.println("CHECKING PATH: " + path);
+            Stream.of(new File(path).listFiles())
+                    .filter(file -> !file.isDirectory())
+                    .forEach((file) -> {
+                        System.out.println("  - " + file.getPath());
+                    });
+        }
+
+        throw new RuntimeException(throwable);
+    }
+
     @Test
     void test_MySwiftClass_voidMethod() {
-        MySwiftClass o = new MySwiftClass(12, 42);
-        o.voidMethod();
+        try {
+            MySwiftClass o = new MySwiftClass(12, 42);
+            o.voidMethod();
+        } catch (Throwable throwable) {
+            checkPaths(throwable);
+        }
     }
 
     @Test

Sources/JExtractSwift/Swift2JavaTranslator+Printing.swift

@@ -323,7 +323,7 @@ extension Swift2JavaTranslator {
         private static SymbolLookup getSymbolLookup() {
             // Ensure Swift and our Lib are loaded during static initialization of the class.
             System.loadLibrary("swiftCore");
-            System.loadLibrary("swiftKitSwift");
+            System.loadLibrary("SwiftKitSwift");
             System.loadLibrary(LIB_NAME);
 
             if (PlatformUtils.isMacOS()) {

buildSrc/src/main/groovy/org/swift/swiftkit/gradle/BuildUtils.groovy

@@ -40,13 +40,17 @@ final class BuildUtils {
                         "${base}../../.build/${osArch}-apple-macosx/debug/"),
         ]
         def releasePaths = debugPaths.collect { it.replaceAll("debug", "release") }
-        def systemPaths = [
-                // system paths
+        def systemPaths =
                 isLinux ?
-                        "/usr/lib/swift/linux" :
-                        // assume macOS
-                        "/usr/lib/swift/"
-        ]
+                        [
+                                "/usr/lib/swift/linux",
+                                // TODO: should we be Swiftly aware and then use the currently used path?
+                                System.getProperty("user.home") + "/.local/share/swiftly/toolchains/6.0.2/usr/lib/swift/linux"
+                        ] :
+                        [
+                                // assume macOS
+                                "/usr/lib/swift/"
+                        ]
 
         return releasePaths + debugPaths + systemPaths
     }