rename CJNI module to avoid conflicts; call it CSwiftJavaJNI (swiftlang#377)

Author: ktoso

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"),

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)"])

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"
       ],

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: [

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 {

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: [

Sources/CJNI/include/module.modulemap

@@ -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 */

Sources/CJNI/dummy.c renamed to Sources/CSwiftJavaJNI/dummy.c

@@ -0,0 +1,4 @@
+module CSwiftJavaJNI {
+    umbrella header "CSwiftJavaJNI.h"
+    export *
+}