Further separate library code from example code

ktoso · ktoso · commit 28906259efe2 · 2024-10-07T19:24:29.000+09:00
diff --git a/BuildLogic/build.gradle.kts b/BuildLogic/build.gradle.kts
diff --git a/BuildLogic/settings.gradle.kts b/BuildLogic/settings.gradle.kts
diff --git a/Makefile b/Makefile
@@ -40,13 +40,13 @@ endif
 
 all: generate-all
 
-$(BUILD_DIR)/debug/libJavaKit.$(LIB_SUFFIX) $(BUILD_DIR)/debug/libJavaKitExample.$(LIB_SUFFIX) $(BUILD_DIR)/debug/Java2Swift:
+$(BUILD_DIR)/debug/libJavaKit.$(LIB_SUFFIX) $(BUILD_DIR)/debug/libExampleSwiftLibrary.$(LIB_SUFFIX) $(BUILD_DIR)/debug/Java2Swift:
 	swift build
 
 ./JavaSwiftKitDemo/build/classes/java/main/com/example/swift/HelloSubclass.class: JavaSwiftKitDemo/src/main/java/com/example/swift
 	./gradlew build
 
-run: $(BUILD_DIR)/debug/libJavaKit.$(LIB_SUFFIX) $(BUILD_DIR)/debug/libJavaKitExample.$(LIB_SUFFIX) JavaSwiftKitDemo/src/main/java/com/example/swift
+run: $(BUILD_DIR)/debug/libJavaKit.$(LIB_SUFFIX) $(BUILD_DIR)/debug/libExampleSwiftLibrary.$(LIB_SUFFIX) JavaSwiftKitDemo/src/main/java/com/example/swift
 	java -cp JavaSwiftKitDemo/build/classes/java/main -Djava.library.path=$(BUILD_DIR)/debug/ com.example.swift.HelloSwift
 
 Java2Swift: $(BUILD_DIR)/debug/Java2Swift
@@ -70,20 +70,18 @@ generate-JavaKitNetwork: Java2Swift generate-JavaKit
 generate-all: generate-JavaKit generate-JavaKitReflection generate-JavaKitJar generate-JavaKitNetwork \
 			  jextract-swift
 clean:
-	rm -rf .build
-	rm -rf
+	rm -rf .build; \
+	rm -rf SwiftKitExample/src/generated/java/*
 
 format:
-	swift format --recursive . -i \
-	rm -rf SwiftKitExample/src/generated/java
+	swift format --recursive . -i
 
 #################################################
 ### "SwiftKit" is the "call swift from java"  ###
 #################################################
 
 JEXTRACT_BUILD_DIR="$(BUILD_DIR)/jextract"
 
-# Parameter: Swift source file
 define make_swiftinterface
     $(eval $@_MODULE = $(1))
     $(eval $@_FILENAME = $(2))
@@ -101,16 +99,20 @@ jextract-swift: generate-JExtract-interface-files
 
 generate-JExtract-interface-files: $(BUILD_DIR)/debug/libJavaKit.$(LIB_SUFFIX)
 	echo "Generate .swiftinterface files..."
-	@$(call make_swiftinterface, "JavaKitExample", "MySwiftLibrary")
-	@$(call make_swiftinterface, "JavaKitExample", "SwiftKit")
+	@$(call make_swiftinterface, "ExampleSwiftLibrary", "MySwiftLibrary")
+	@$(call make_swiftinterface, "SwiftKitSwift", "SwiftKit")
 
 jextract-run: jextract-swift generate-JExtract-interface-files
 	swift run jextract-swift  \
 		--package-name com.example.swift.generated \
-		--swift-module SwiftKitExample \
+		--swift-module ExampleSwiftLibrary \
 		--output-directory SwiftKitExample/src/generated/java \
-		$(BUILD_DIR)/jextract/ExampleSwiftLibrary/MySwiftLibrary.swiftinterface \
-		$(BUILD_DIR)/jextract/ExampleSwiftLibrary/SwiftKit.swiftinterface
+		$(BUILD_DIR)/jextract/ExampleSwiftLibrary/MySwiftLibrary.swiftinterface; \
+	swift run jextract-swift \
+		--package-name org.swift.swiftkit.generated \
+		--swift-module SwiftKitSwift \
+		--output-directory SwiftKitExample/src/generated/java \
+		$(BUILD_DIR)/jextract/SwiftKitSwift/SwiftKit.swiftinterface
 
 
 jextract-run-java: jextract-swift generate-JExtract-interface-files
diff --git a/Package.swift b/Package.swift
@@ -18,7 +18,7 @@ func findJavaHome() -> String {
   // This is a workaround for envs (some IDEs) which have trouble with
   // picking up env variables during the build process
   let path = "\(FileManager.default.homeDirectoryForCurrentUser.path()).java_home"
-  if let home = try? String(contentsOfFile: path) {
+  if let home = try? String(contentsOfFile: path, encoding: .utf8) {
     if let lastChar = home.last, lastChar.isNewline {
       return String(home.dropLast())
     }
diff --git a/SwiftJavaKitExample/README.md b/SwiftJavaKitExample/README.md
diff --git a/SwiftJavaKitExample/build.gradle.kts b/SwiftJavaKitExample/build.gradle.kts
diff --git a/SwiftKitExample/src/main/java/com/example/CallMe.java b/SwiftKitExample/src/main/java/com/example/CallMe.java
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package org.example;
+package com.example;
 
 import org.swift.swiftkit.SwiftKit;
 
diff --git a/SwiftKitExample/src/main/java/com/example/HelloJava2Swift.java b/SwiftKitExample/src/main/java/com/example/HelloJava2Swift.java
@@ -12,10 +12,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-package org.example;
+package com.example;
 
 // Import swift-extract generated sources
-import com.example.swift.generated.JavaKitExample;
+import com.example.swift.generated.ExampleSwiftLibrary;
 import com.example.swift.generated.MySwiftClass;
 
 // Import javakit/swiftkit support libraries
@@ -46,13 +46,13 @@ public static void main(String[] args) {
             System.out.println("ok.");
         }
 
-        tests();
+        examples();
     }
 
-    static void tests() {
-        JavaKitExample.helloWorld();
+    static void examples() {
+        ExampleSwiftLibrary.helloWorld();
 
-        JavaKitExample.globalTakeInt(1337);
+        ExampleSwiftLibrary.globalTakeInt(1337);
 
         MySwiftClass obj = new MySwiftClass(2222, 7777);
 
diff --git a/SwiftKitExample/src/main/java/com/example/swift/ManualJavaKitExample.java b/SwiftKitExample/src/main/java/com/example/swift/ManualJavaKitExample.java
@@ -12,9 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package org.example.swift;
-
-import com.example.swift.generated.JavaKitExample;
+package com.example.swift;
 
 import java.lang.invoke.*;
 import java.lang.foreign.*;
diff --git a/SwiftKitExample/src/main/java/com/example/swift/ManualMySwiftClass.java b/SwiftKitExample/src/main/java/com/example/swift/ManualMySwiftClass.java
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package org.example.swift;
+package com.example.swift;
 
 // ==== Extra convenience APIs -------------------------------------------------------------------------------------
 // TODO: Think about offering these or not, perhaps only as an option?
diff --git a/SwiftKitExample/src/main/java/com/example/swift/Manual_MySwiftClass.java b/SwiftKitExample/src/main/java/com/example/swift/Manual_MySwiftClass.java
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package org.example.swift;
+package com.example.swift;
 
 import java.lang.foreign.*;
 import java.lang.invoke.MethodHandle;
diff --git a/SwiftKitExample/src/test/java/com/example/swift/generated/GeneratedJavaKitExampleModuleTest.java b/SwiftKitExample/src/test/java/com/example/swift/generated/GeneratedJavaKitExampleModuleTest.java
@@ -24,36 +24,23 @@ public class GeneratedJavaKitExampleModuleTest {
     @BeforeAll
     static void beforeAll() {
         System.loadLibrary("swiftCore");
-        System.loadLibrary("JavaKitExample");
+        System.loadLibrary("ExampleSwiftLibrary");
 
         System.setProperty("jextract.trace.downcalls", "true");
     }
 
     @Test
     void call_helloWorld() {
-        JavaKitExample.helloWorld();
+        ExampleSwiftLibrary.helloWorld();
 
-        assertNotNull(JavaKitExample.helloWorld$address());
+        assertNotNull(ExampleSwiftLibrary.helloWorld$address());
     }
 
     @Test
     void call_globalTakeInt() {
-        JavaKitExample.globalTakeInt(12);
+        ExampleSwiftLibrary.globalTakeInt(12);
 
-        assertNotNull(JavaKitExample.globalTakeInt$address());
+        assertNotNull(ExampleSwiftLibrary.globalTakeInt$address());
     }
 
-//    @Test
-//    void call_globalCallJavaCallback() {
-//        var num = 0;
-//
-//        JavaKitExample.globalCallJavaCallback(new Runnable() {
-//            @Override
-//            public void run() {
-//                num += 1;
-//            }
-//        });
-//
-//        assertEquals(1, num);
-//    }
 }
diff --git a/SwiftKitExample/src/test/java/com/example/swift/generated/MySwiftClassTest.java b/SwiftKitExample/src/test/java/com/example/swift/generated/MySwiftClassTest.java
@@ -14,12 +14,7 @@
 
 package com.example.swift.generated;
 
-import org.example.swift.ManualMySwiftClass;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.swift.swiftkit.SwiftKit;
-
-import java.lang.foreign.Arena;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -31,43 +26,11 @@ static void beforeAll() {
         System.out.printf("java.library.path = %s\n", System.getProperty("java.library.path"));
 
         System.loadLibrary("swiftCore");
-        System.loadLibrary("JavaKitExample");
+        System.loadLibrary("ExampleSwiftLibrary");
 
         System.setProperty("jextract.trace.downcalls", "true");
     }
 
-    @Test
-    void call_helloWorld() {
-        JavaKitExample.helloWorld();
-
-        assertNotNull(JavaKitExample.helloWorld$address());
-    }
-
-    @Test
-    void call_retain_retainCount_release() {
-        var obj = new MySwiftClass(1, 2);
-
-        assertEquals(1, SwiftKit.retainCount(obj.$memorySegment()));
-        // TODO: test directly on SwiftHeapObject inheriting obj
-
-        SwiftKit.retain(obj.$memorySegment());
-        assertEquals(2, SwiftKit.retainCount(obj.$memorySegment()));
-
-        SwiftKit.release(obj.$memorySegment());
-        assertEquals(1, SwiftKit.retainCount(obj.$memorySegment()));
-    }
-
-    @Test
-    void use_MySwiftClass_repr_init_arena() {
-        int lenValue = 1111;
-        int capValue = 2222;
+    // TODO: test member methods on MySwiftClass
 
-        try (Arena arena = Arena.ofConfined()) {
-            ManualMySwiftClass obj = ManualMySwiftClass.init(arena, lenValue, capValue);
-
-
-//            assertEquals(lenValue, obj.len());
-//            assertEquals(capValue, obj.cap());
-        }
-    }
 }
diff --git a/SwiftKitExample/src/test/java/org/swift/swiftkit/MySwiftClassTest.java b/SwiftKitExample/src/test/java/org/swift/swiftkit/MySwiftClassTest.java
@@ -12,32 +12,41 @@
 //
 //===----------------------------------------------------------------------===//
 
-package org.example.swift;
+package org.swift.swiftkit;
 
 import com.example.swift.generated.MySwiftClass;
-import org.junit.jupiter.api.*;
-
-import static org.junit.jupiter.api.Assertions.*;
+import com.example.swift.ManualMySwiftClass;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.lang.foreign.Arena;
-import java.lang.foreign.MemorySegment;
 
-public class JavaKitTest {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class MySwiftClassTest {
+
     @BeforeAll
     static void beforeAll() {
         System.out.printf("java.library.path = %s\n", System.getProperty("java.library.path"));
 
         System.loadLibrary("swiftCore");
-        System.loadLibrary("JavaKitExample");
+        System.loadLibrary("ExampleSwiftLibrary");
 
         System.setProperty("jextract.trace.downcalls", "true");
     }
 
-//    @Test
-//    void call_helloWorld() {
-//        MySwiftClass.helloWorld();
-//
-//        assertNotNull(helloWorld$address());
-//    }
+    @Test
+    void call_retain_retainCount_release() {
+        var obj = new MySwiftClass(1, 2);
 
+        assertEquals(1, SwiftKit.retainCount(obj.$memorySegment()));
+        // TODO: test directly on SwiftHeapObject inheriting obj
+
+        SwiftKit.retain(obj.$memorySegment());
+        assertEquals(2, SwiftKit.retainCount(obj.$memorySegment()));
+
+        SwiftKit.release(obj.$memorySegment());
+        assertEquals(1, SwiftKit.retainCount(obj.$memorySegment()));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ func findJavaHome() -> String {`
`18`	`18`	`// This is a workaround for envs (some IDEs) which have trouble with`
`19`	`19`	`// picking up env variables during the build process`
`20`	`20`	`let path = "\(FileManager.default.homeDirectoryForCurrentUser.path()).java_home"`
`21`		`- if let home = try? String(contentsOfFile: path) {`
	`21`	`+ if let home = try? String(contentsOfFile: path, encoding: .utf8) {`
`22`	`22`	`if let lastChar = home.last, lastChar.isNewline {`
`23`	`23`	`return String(home.dropLast())`
`24`	`24`	`}`