rename SwiftKitSwift

Author: madsodgaard

Package.swift

@@ -169,9 +169,9 @@ let package = Package(
 
     // Support library written in Swift for SwiftKit "Java"
     .library(
-      name: "SwiftKitSwift",
+      name: "SwiftJavaRuntimeSupport",
       type: .dynamic,
-      targets: ["SwiftKitSwift"]
+      targets: ["SwiftJavaRuntimeSupport"]
     ),
 
     .library(
@@ -213,7 +213,7 @@ let package = Package(
       name: "SwiftJavaDocumentation",
       dependencies: [
         "SwiftJava",
-        "SwiftKitSwift",
+        "SwiftJavaRuntimeSupport",
       ]
     ),
 
@@ -351,7 +351,7 @@ let package = Package(
       ]
     ),
     .target(
-      name: "SwiftKitSwift",
+      name: "SwiftJavaRuntimeSupport",
       dependencies: [],
       swiftSettings: [
         .swiftLanguageMode(.v5),

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+SwiftThunkPrinting.swift

@@ -108,7 +108,7 @@ extension FFMSwift2JavaGenerator {
       """
       // Generated by swift-java
 
-      import SwiftKitSwift
+      import SwiftJavaRuntimeSupport
 
       """)
 
@@ -136,7 +136,7 @@ extension FFMSwift2JavaGenerator {
       """
       // Generated by swift-java
 
-      import SwiftKitSwift
+      import SwiftJavaRuntimeSupport
 
       """
     )

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator.swift

@@ -189,7 +189,7 @@ extension FFMSwift2JavaGenerator {
         private static final boolean INITIALIZED_LIBS = initializeLibs();
         static boolean initializeLibs() {
             System.loadLibrary(SwiftLibraries.LIB_NAME_SWIFT_CORE);
-            System.loadLibrary(SwiftLibraries.LIB_NAME_SWIFTKITSWIFT);
+            System.loadLibrary(SwiftLibraries.LIB_NAME_SWIFT_JAVA_RUNTIME_SUPPORT);
             System.loadLibrary(LIB_NAME);
             return true;
         }
@@ -339,7 +339,7 @@ extension FFMSwift2JavaGenerator {
         private static SymbolLookup getSymbolLookup() {
             if (SwiftLibraries.AUTO_LOAD_LIBS) {
                 System.loadLibrary(SwiftLibraries.LIB_NAME_SWIFT_CORE);
-                System.loadLibrary(SwiftLibraries.LIB_NAME_SWIFTKITSWIFT);
+                System.loadLibrary(SwiftLibraries.LIB_NAME_SWIFT_JAVA_RUNTIME_SUPPORT);
                 System.loadLibrary(LIB_NAME);
             }
 

Sources/SwiftJava/Helpers/_Semaphore.swift

@@ -30,7 +30,7 @@ import wasi_pthread
 #endif
 
 public final class _Semaphore: @unchecked Sendable {
-  #if canImport(Darwin)
+  #if canImport(Dispatch)
   private let sem: DispatchSemaphore
   #elseif (compiler(<6.1) && !os(WASI)) || (compiler(>=6.1) && _runtime(_multithreaded))
   private let sem: UnsafeMutablePointer<sem_t> = UnsafeMutablePointer.allocate(capacity: 1)

Sources/SwiftKitSwift/SwiftKit.swift renamed to Sources/SwiftJavaRuntimeSupport/SwiftRuntimeFunctions.swift

@@ -73,18 +73,18 @@ tasks.test {
     }
 }
 
-// SwiftKit depends on SwiftKitSwift (Swift library that this Java library calls into)
+// SwiftKit depends on SwiftJavaRuntimeSupport (Swift library that this Java library calls into)
 
 def compileSwift = tasks.register("compileSwift", Exec) {
-    description "Compile the swift-java SwiftKitSwift dynamic library that SwiftKit (Java) calls into"
+    description "Compile the swift-java SwiftJavaRuntimeSupport dynamic library that SwiftKit (Java) calls into"
 
     inputs.file(new File(rootDir, "Package.swift"))
     inputs.dir(new File(rootDir, "Sources/")) // a bit generous, but better safe than sorry, and include all Swift source changes
     outputs.dir(new File(rootDir, ".build"))
 
     workingDir = rootDir
     commandLine "swift"
-    args("build", "--target", "SwiftKitSwift")
+    args("build", "--target", "SwiftJavaRuntimeSupport")
 }
 tasks.build {
     dependsOn("compileSwift")

SwiftKitCore/build.gradle

@@ -27,7 +27,7 @@ public final class SwiftLibraries {
     // Library names of core Swift and SwiftKit
     public static final String LIB_NAME_SWIFT_CORE = "swiftCore";
     public static final String LIB_NAME_SWIFT_CONCURRENCY = "swift_Concurrency";
-    public static final String LIB_NAME_SWIFTKITSWIFT = "SwiftKitSwift";
+    public static final String LIB_NAME_SWIFT_JAVA_RUNTIME_SUPPORT = "SwiftJavaRuntimeSupport";
 
     /** 
      * Allows for configuration if jextracted types should automatically attempt to load swiftCore and the library type is from.
@@ -42,10 +42,10 @@ public final class SwiftLibraries {
     @SuppressWarnings("unused")
     private static final boolean INITIALIZED_LIBS = loadLibraries(false);
 
-    public static boolean loadLibraries(boolean loadSwiftKit) {
-        System.loadLibrary(LIB_NAME_SWIFTKITSWIFT);
-        if (loadSwiftKit) {
-            System.loadLibrary(LIB_NAME_SWIFTKITSWIFT);
+    public static boolean loadLibraries(boolean loadSwiftJavaRuntimeSupport) {
+        System.loadLibrary(LIB_NAME_SWIFT_JAVA_RUNTIME_SUPPORT);
+        if (loadSwiftJavaRuntimeSupport) {
+            System.loadLibrary(LIB_NAME_SWIFT_JAVA_RUNTIME_SUPPORT);
         }
         return true;
     }

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

@@ -75,18 +75,18 @@ tasks.withType(JavaCompile).configureEach {
     options.compilerArgs.add("-Xlint:preview")
 }
 
-// SwiftKit depends on SwiftKitSwift (Swift library that this Java library calls into)
+// SwiftKit depends on SwiftJavaRuntimeSupport (Swift library that this Java library calls into)
 
 def compileSwift = tasks.register("compileSwift", Exec) {
-    description "Compile the swift-java SwiftKitSwift dynamic library that SwiftKit (Java) calls into"
+    description "Compile the swift-java SwiftJavaRuntimeSupport dynamic library that SwiftKit (Java) calls into"
 
     inputs.file(new File(rootDir, "Package.swift"))
     inputs.dir(new File(rootDir, "Sources/")) // a bit generous, but better safe than sorry, and include all Swift source changes
     outputs.dir(new File(rootDir, ".build"))
 
     workingDir = rootDir
     commandLine "swift"
-    args("build", "--target", "SwiftKitSwift")
+    args("build", "--target", "SwiftJavaRuntimeSupport")
 }
 tasks.build {
     dependsOn("compileSwift")

SwiftKitFFM/build.gradle

@@ -33,7 +33,7 @@
 public class SwiftRuntime {
 
     public static final String STDLIB_DYLIB_NAME = "swiftCore";
-    public static final String SWIFTKITSWIFT_DYLIB_NAME = "SwiftKitSwift";
+    public static final String SWIFT_JAVA_RUNTIME_SUPPORT_DYLIB_NAME = "SwiftJavaRuntimeSupport";
 
     private static final String STDLIB_MACOS_DYLIB_PATH = "/usr/lib/swift/libswiftCore.dylib";
 
@@ -42,10 +42,10 @@ public class SwiftRuntime {
     @SuppressWarnings("unused")
     private static final boolean INITIALIZED_LIBS = loadLibraries(false);
 
-    public static boolean loadLibraries(boolean loadSwiftKit) {
+    public static boolean loadLibraries(boolean loadSwiftJavaRuntimeSupport) {
         System.loadLibrary(STDLIB_DYLIB_NAME);
-        if (loadSwiftKit) {
-            System.loadLibrary(SWIFTKITSWIFT_DYLIB_NAME);
+        if (loadSwiftJavaRuntimeSupport) {
+            System.loadLibrary(SWIFT_JAVA_RUNTIME_SUPPORT_DYLIB_NAME);
         }
         return true;
     }
@@ -487,4 +487,4 @@ boolean isEnabled() {
         }
         throw new IllegalArgumentException("Not handled log group: " + this);
     }
-}
+}