separate swiftkit into two modules

Author: madsodgaard

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

@@ -33,9 +33,9 @@ repositories {
 
 testing {
     suites {
-        val test by getting(JvmTestSuite::class) {
-            useJUnitJupiter("5.10.3")
-        }
+//        val test by getting(JvmTestSuite::class) {
+//            useJUnitJupiter("5.10.3")
+//        }
     }
 }
 

Samples/JExtractJNISampleApp/build.gradle

@@ -148,7 +148,7 @@ tasks.clean {
 }
 
 dependencies {
-    implementation(project(':SwiftKit'))
+    implementation(project(':SwiftKitCore'))
 
     testImplementation(platform("org.junit:junit-bom:5.10.0"))
     testImplementation("org.junit.jupiter:junit-jupiter")

Samples/JExtractJNISampleApp/src/main/java/com/example/swift/HelloJava2SwiftJNI.java

@@ -18,7 +18,7 @@
 
 // Import javakit/swiftkit support libraries
 
-import org.swift.swiftkit.SwiftKit;
+import org.swift.swiftkitffm.SwiftKit;
 
 public class HelloJava2SwiftJNI {
 

Samples/SwiftAndJavaJarSampleLib/build.gradle

@@ -43,7 +43,7 @@ java {
 }
 
 dependencies {
-    implementation(project(':SwiftKit'))
+    implementation(project(':SwiftKitFFM'))
 
     testImplementation(platform("org.junit:junit-bom:5.10.0"))
     testImplementation("org.junit.jupiter:junit-jupiter")

Samples/SwiftAndJavaJarSampleLib/src/jmh/java/org/swift/swiftkit/JavaToSwiftBenchmark.java

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

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

@@ -16,15 +16,9 @@
 
 // Import swift-extract generated sources
 
-import com.example.swift.MySwiftLibrary;
-import com.example.swift.MySwiftClass;
-
 // Import javakit/swiftkit support libraries
-import org.swift.swiftkit.SwiftArena;
-import org.swift.swiftkit.SwiftKit;
-import org.swift.swiftkit.SwiftValueWitnessTable;
-
-import java.util.Arrays;
+import org.swift.swiftkitffm.SwiftArena;
+import org.swift.swiftkitffm.SwiftKit;
 
 public class HelloJava2Swift {
 

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

@@ -16,8 +16,8 @@
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.swift.swiftkit.SwiftArena;
-import org.swift.swiftkit.SwiftKit;
+import org.swift.swiftkitffm.SwiftArena;
+import org.swift.swiftkitffm.SwiftKit;
 
 import java.io.File;
 import java.util.stream.Stream;

Samples/SwiftAndJavaJarSampleLib/src/test/java/com/example/swift/MySwiftLibraryTest.java

@@ -14,14 +14,10 @@
 
 package com.example.swift;
 
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.swift.swiftkit.SwiftKit;
 
-import java.util.Arrays;
 import java.util.concurrent.CountDownLatch;
-import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.*;
 

Samples/SwiftAndJavaJarSampleLib/src/test/java/org/swift/swiftkit/MySwiftClassTest.java renamed to Samples/SwiftAndJavaJarSampleLib/src/test/java/org/swift/swiftkitffm/MySwiftClassTest.java

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package org.swift.swiftkit;
+package org.swift.swiftkitffm;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

Samples/SwiftAndJavaJarSampleLib/src/test/java/org/swift/swiftkit/SwiftArenaTest.java renamed to Samples/SwiftAndJavaJarSampleLib/src/test/java/org/swift/swiftkitffm/SwiftArenaTest.java

@@ -12,20 +12,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-package org.swift.swiftkit;
+package org.swift.swiftkitffm;
 
 import com.example.swift.MySwiftClass;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
-import org.swift.swiftkit.util.PlatformUtils;
-
-import java.util.Arrays;
-import java.util.stream.Collectors;
+import org.swift.swiftkitffm.util.PlatformUtils;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.swift.swiftkit.SwiftKit.*;
-import static org.swift.swiftkit.SwiftKit.retainCount;
+import static org.swift.swiftkitffm.SwiftKit.*;
+import static org.swift.swiftkitffm.SwiftKit.retainCount;
 
 public class SwiftArenaTest {