small cleanups

Author: madsodgaard

.github/workflows/pull_request.yml

@@ -31,10 +31,14 @@ jobs:
       - uses: actions/checkout@v4
       - name: Prepare CI Environment
         uses: ./.github/actions/prepare_env
-      - name: Gradle :SwiftKit:build
-        run: ./gradlew build -x test
-      - name: Gradle :SwiftKit:check
-        run: ./gradlew :SwiftKit:check --info
+      - name: Gradle :SwiftKitCore:build
+        run: ./gradlew :SwiftKitCore:build -x test
+      - name: Gradle :SwiftKitCore:check
+        run: ./gradlew :SwiftKitCore:check --info
+      - name: Gradle :SwiftKitFFM:build
+        run: ./gradlew :SwiftKitFFM:build -x test
+      - name: Gradle :SwiftKitFFM:check
+        run: ./gradlew :SwiftKitFFM:check --info
 
   test-java-macos:
     name: Test (Java) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
@@ -51,10 +55,14 @@ jobs:
       - uses: actions/checkout@v4
       - name: Prepare CI Environment
         uses: ./.github/actions/prepare_env
-      - name: Gradle :SwiftKit:build
-        run: ./gradlew build -x test
-      - name: Gradle :SwiftKit:check
-        run: ./gradlew :SwiftKit:check --debug
+      - name: Gradle :SwiftKitCore:build
+        run: ./gradlew :SwiftKitCore:build -x test
+      - name: Gradle :SwiftKitCore:check
+        run: ./gradlew :SwiftKitCore:check --debug
+      - name: Gradle :SwiftKitFFM:build
+        run: ./gradlew :SwiftKitFFM:build -x test
+      - name: Gradle :SwiftKitFFM:check
+        run: ./gradlew :SwiftKitFFM:check --debug
 
   benchmark-java:
     name: Benchmark (JMH) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})

Samples/SwiftAndJavaJarSampleLib/src/jmh/java/org/swift/swiftkit/JavaToSwiftBenchmark.java renamed to Samples/SwiftAndJavaJarSampleLib/src/jmh/java/org/swift/swiftkit/ffm/JavaToSwiftBenchmark.java

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package org.swift.swiftkitffm;
+package org.swift.swiftkit.ffm;
 
 import java.util.concurrent.TimeUnit;
 

Samples/SwiftAndJavaJarSampleLib/src/main/java/com/example/swift/HelloJava2Swift.java

@@ -17,9 +17,9 @@
 // Import swift-extract generated sources
 
 // Import javakit/swiftkit support libraries
+import org.swift.swiftkit.core.SwiftLibraries;
 import org.swift.swiftkit.ffm.AllocatingSwiftArena;
 import org.swift.swiftkit.ffm.SwiftRuntime;
-import org.swift.swiftkit.core.SwiftLibraries;
 
 public class HelloJava2Swift {
 

SwiftKitCore/src/main/java/org/swift/swiftkit/core/SwiftArena.java

@@ -22,24 +22,16 @@
  * associated owner thread such as {@link ClosableSwiftArena#close()}.
  */
 public interface SwiftArena  {
-
-//    static ClosableSwiftArena ofConfined() {
-//        return new ConfinedSwiftMemorySession(Thread.currentThread());
-//    }
-
     /**
      * Register a Swift object.
      * Its memory should be considered managed by this arena, and be destroyed when the arena is closed.
      */
     void register(SwiftInstance instance);
-
 }
 
 /**
  * Represents a list of resources that need a cleanup, e.g. allocated classes/structs.
  */
 interface SwiftResourceList {
-
     void runCleanup();
-
 }