swiftlang · ktoso · Aug 28, 2025 · Aug 28, 2025 · Aug 28, 2025
diff --git a/Benchmarks/Package.swift b/Benchmarks/Package.swift
@@ -51,7 +51,7 @@ let package = Package(
     .executableTarget(
       name: "JavaApiCallBenchmarks",
       dependencies: [
-        .product(name: "CJNI", package: "swift-java"),
+        .product(name: "CSwiftJavaJNI", package: "swift-java"),
         .product(name: "SwiftJava", package: "swift-java"),
         .product(name: "JavaNet", package: "swift-java"),
         .product(name: "Benchmark", package: "package-benchmark"),

diff --git a/Package.swift b/Package.swift
@@ -101,8 +101,8 @@ let package = Package(
     ),
 
     .library(
-      name: "CJNI",
-      targets: ["CJNI"]
+      name: "CSwiftJavaJNI",
+      targets: ["CSwiftJavaJNI"]
     ),
 
     .library(
@@ -237,7 +237,7 @@ let package = Package(
     .target(
       name: "SwiftJava",
       dependencies: [
-        "CJNI",
+        "CSwiftJavaJNI",
         "SwiftJavaMacros",
         "JavaTypes",
         "SwiftJavaConfigurationShared", // for Configuration reading at runtime
@@ -359,7 +359,7 @@ let package = Package(
     ),
 
     .target(
-      name: "CJNI",
+      name: "CSwiftJavaJNI",
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])

diff --git a/Samples/JavaDependencySampleApp/Package.swift b/Samples/JavaDependencySampleApp/Package.swift
@@ -65,7 +65,7 @@ let package = Package(
       name: "JavaDependencySample",
       dependencies: [
         .product(name: "SwiftJava", package: "swift-java"),
-        .product(name: "CJNI", package: "swift-java"),
+        .product(name: "CSwiftJavaJNI", package: "swift-java"),
         .product(name: "JavaUtilFunction", package: "swift-java"),
         "JavaCommonsCSV"
       ],

diff --git a/Samples/SwiftJavaExtractFFMSampleApp/Package.swift b/Samples/SwiftJavaExtractFFMSampleApp/Package.swift
@@ -64,7 +64,7 @@ let package = Package(
       name: "MySwiftLibrary",
       dependencies: [
         .product(name: "SwiftJava", package: "swift-java"),
-        .product(name: "CJNI", package: "swift-java"),
+        .product(name: "CSwiftJavaJNI", package: "swift-java"),
         .product(name: "SwiftKitSwift", package: "swift-java"),
       ],
       exclude: [

diff --git a/Samples/SwiftJavaExtractFFMSampleApp/Sources/MySwiftLibrary/jni/JNIImplementations.swift b/Samples/SwiftJavaExtractFFMSampleApp/Sources/MySwiftLibrary/jni/JNIImplementations.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("com.example.swift.HelloJava2Swift")
 open class HelloJava2Swift: JavaObject {

diff --git a/Samples/SwiftJavaExtractJNISampleApp/Package.swift b/Samples/SwiftJavaExtractJNISampleApp/Package.swift
@@ -61,7 +61,7 @@ let package = Package(
       name: "MySwiftLibrary",
       dependencies: [
         .product(name: "SwiftJava", package: "swift-java"),
-        .product(name: "CJNI", package: "swift-java"),
+        .product(name: "CSwiftJavaJNI", package: "swift-java"),
         .product(name: "SwiftKitSwift", package: "swift-java"),
       ],
       exclude: [

diff --git a/Sources/CJNI/include/module.modulemap b/Sources/CJNI/include/module.modulemap
diff --git a/Sources/CJNI/dummy.c → Sources/CSwiftJavaJNI/dummy.c b/Sources/CJNI/dummy.c → Sources/CSwiftJavaJNI/dummy.c
diff --git a/Sources/CJNI/include/CJNI.h → ...ces/CSwiftJavaJNI/include/CSwiftJavaJNI.h b/Sources/CJNI/include/CJNI.h → ...ces/CSwiftJavaJNI/include/CSwiftJavaJNI.h
@@ -12,9 +12,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef Swift_CJNI_h
-#define Swift_CJNI_h
+#ifndef CSwiftJavaJNI_h
+#define CSwiftJavaJNI_h
 
 #include <jni.h>
 
-#endif /* Swift_CJNI_h */
+#endif /* CSwiftJavaJNI_h */
diff --git a/Sources/CSwiftJavaJNI/include/module.modulemap b/Sources/CSwiftJavaJNI/include/module.modulemap
@@ -0,0 +1,4 @@
+module CSwiftJavaJNI {
+    umbrella header "CSwiftJavaJNI.h"
+    export *
+}
diff --git a/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift b/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift
@@ -409,7 +409,7 @@ extension JNISwift2JavaGenerator {
       // Generated by swift-java
 
       import SwiftJava
-      import CJNI
+      import CSwiftJavaJNI
 
       """
     )

diff --git a/Sources/JavaKitDependencyResolver/DependencyResolver.swift b/Sources/JavaKitDependencyResolver/DependencyResolver.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaInterface("org.swift.jni.dependencies.DependencyResolver")
 public struct DependencyResolver {

diff --git a/Sources/JavaStdlib/JavaIO/generated/BufferedInputStream.swift b/Sources/JavaStdlib/JavaIO/generated/BufferedInputStream.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.io.BufferedInputStream")
 open class BufferedInputStream: InputStream {

diff --git a/Sources/JavaStdlib/JavaIO/generated/Charset.swift b/Sources/JavaStdlib/JavaIO/generated/Charset.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.nio.charset.Charset")
 open class Charset: JavaObject {

diff --git a/Sources/JavaStdlib/JavaIO/generated/Closeable.swift b/Sources/JavaStdlib/JavaIO/generated/Closeable.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaInterface("java.io.Closeable")
 public struct Closeable {

diff --git a/Sources/JavaStdlib/JavaIO/generated/File.swift b/Sources/JavaStdlib/JavaIO/generated/File.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.io.File")
 open class File: JavaObject {

diff --git a/Sources/JavaStdlib/JavaIO/generated/FileDescriptor.swift b/Sources/JavaStdlib/JavaIO/generated/FileDescriptor.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.io.FileDescriptor")
 open class FileDescriptor: JavaObject {

diff --git a/Sources/JavaStdlib/JavaIO/generated/FileReader.swift b/Sources/JavaStdlib/JavaIO/generated/FileReader.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.io.FileReader")
 open class FileReader: InputStreamReader {

diff --git a/Sources/JavaStdlib/JavaIO/generated/Flushable.swift b/Sources/JavaStdlib/JavaIO/generated/Flushable.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaInterface("java.io.Flushable")
 public struct Flushable {

diff --git a/Sources/JavaStdlib/JavaIO/generated/InputStream.swift b/Sources/JavaStdlib/JavaIO/generated/InputStream.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.io.InputStream", implements: Closeable.self)
 open class InputStream: JavaObject {

diff --git a/Sources/JavaStdlib/JavaIO/generated/InputStreamReader.swift b/Sources/JavaStdlib/JavaIO/generated/InputStreamReader.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.io.InputStreamReader")
 open class InputStreamReader: Reader {

diff --git a/Sources/JavaStdlib/JavaIO/generated/OutputStream.swift b/Sources/JavaStdlib/JavaIO/generated/OutputStream.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.io.OutputStream", implements: Closeable.self, Flushable.self)
 open class OutputStream: JavaObject {

diff --git a/Sources/JavaStdlib/JavaIO/generated/Path.swift b/Sources/JavaStdlib/JavaIO/generated/Path.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaInterface("java.nio.file.Path")
 public struct Path {

diff --git a/Sources/JavaStdlib/JavaIO/generated/Readable.swift b/Sources/JavaStdlib/JavaIO/generated/Readable.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaInterface("java.lang.Readable")
 public struct Readable {

diff --git a/Sources/JavaStdlib/JavaIO/generated/Reader.swift b/Sources/JavaStdlib/JavaIO/generated/Reader.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.io.Reader", implements: Readable.self, Closeable.self)
 open class Reader: JavaObject {

diff --git a/Sources/JavaStdlib/JavaIO/generated/StringReader.swift b/Sources/JavaStdlib/JavaIO/generated/StringReader.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.io.StringReader")
 open class StringReader: Reader {

diff --git a/Sources/JavaStdlib/JavaIO/generated/WatchService.swift b/Sources/JavaStdlib/JavaIO/generated/WatchService.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaInterface("java.nio.file.WatchService", extends: Closeable.self)
 public struct WatchService {

diff --git a/Sources/JavaStdlib/JavaIO/generated/Writer.swift b/Sources/JavaStdlib/JavaIO/generated/Writer.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.io.Writer", implements: Appendable.self, Closeable.self, Flushable.self)
 open class Writer: JavaObject {

diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/AccessibleObject.swift b/Sources/JavaStdlib/JavaLangReflect/generated/AccessibleObject.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.lang.reflect.AccessibleObject")
 open class AccessibleObject: JavaObject {

diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/AnnotatedType.swift b/Sources/JavaStdlib/JavaLangReflect/generated/AnnotatedType.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaInterface("java.lang.reflect.AnnotatedType")
 public struct AnnotatedType {

diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/Annotation.swift b/Sources/JavaStdlib/JavaLangReflect/generated/Annotation.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaInterface("java.lang.annotation.Annotation")
 public struct Annotation {

diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/Constructor.swift b/Sources/JavaStdlib/JavaLangReflect/generated/Constructor.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.lang.reflect.Constructor")
 open class Constructor<T: AnyJavaObject>: Executable {

diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/Executable.swift b/Sources/JavaStdlib/JavaLangReflect/generated/Executable.swift
@@ -1,7 +1,7 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
 import JavaUtil
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.lang.reflect.Executable", implements: GenericDeclaration.self)
 open class Executable: AccessibleObject {

diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/Field.swift b/Sources/JavaStdlib/JavaLangReflect/generated/Field.swift
@@ -1,7 +1,7 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
 import JavaUtil
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.lang.reflect.Field")
 open class Field: AccessibleObject {

diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/GenericArrayType.swift b/Sources/JavaStdlib/JavaLangReflect/generated/GenericArrayType.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaInterface("java.lang.reflect.GenericArrayType", extends: Type.self)
 public struct GenericArrayType {

diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/GenericDeclaration.swift b/Sources/JavaStdlib/JavaLangReflect/generated/GenericDeclaration.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaInterface("java.lang.reflect.GenericDeclaration")
 public struct GenericDeclaration {

diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/Method.swift b/Sources/JavaStdlib/JavaLangReflect/generated/Method.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.lang.reflect.Method")
 open class Method: Executable {

diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/Parameter.swift b/Sources/JavaStdlib/JavaLangReflect/generated/Parameter.swift
@@ -1,7 +1,7 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
 import JavaUtil
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.lang.reflect.Parameter")
 open class Parameter: JavaObject {

diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/ParameterizedType.swift b/Sources/JavaStdlib/JavaLangReflect/generated/ParameterizedType.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaInterface("java.lang.reflect.ParameterizedType", extends: Type.self)
 public struct ParameterizedType {

diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/Type.swift b/Sources/JavaStdlib/JavaLangReflect/generated/Type.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaInterface("java.lang.reflect.Type")
 public struct Type {

diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/TypeVariable.swift b/Sources/JavaStdlib/JavaLangReflect/generated/TypeVariable.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaInterface("java.lang.reflect.TypeVariable", extends: Type.self)
 public struct TypeVariable<D: AnyJavaObject> {

diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/WildcardType.swift b/Sources/JavaStdlib/JavaLangReflect/generated/WildcardType.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaInterface("java.lang.reflect.WildcardType", extends: Type.self)
 public struct WildcardType {

diff --git a/Sources/JavaStdlib/JavaNet/generated/URI.swift b/Sources/JavaStdlib/JavaNet/generated/URI.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.net.URI")
 open class URI: JavaObject {

diff --git a/Sources/JavaStdlib/JavaNet/generated/URL.swift b/Sources/JavaStdlib/JavaNet/generated/URL.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.net.URL")
 open class URL: JavaObject {

diff --git a/Sources/JavaStdlib/JavaNet/generated/URLClassLoader.swift b/Sources/JavaStdlib/JavaNet/generated/URLClassLoader.swift
@@ -1,7 +1,7 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
 import JavaUtil
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.net.URLClassLoader")
 open class URLClassLoader: JavaObject {

diff --git a/Sources/JavaStdlib/JavaNet/generated/URLConnection.swift b/Sources/JavaStdlib/JavaNet/generated/URLConnection.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.net.URLConnection")
 public struct URLConnection {

diff --git a/Sources/JavaStdlib/JavaUtil/generated/ArrayDeque.swift b/Sources/JavaStdlib/JavaUtil/generated/ArrayDeque.swift
@@ -1,6 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("java.util.ArrayDeque")
 open class ArrayDeque<E: AnyJavaObject>: JavaObject {