Rename: JavaRuntime -> CJNI to follow usual C target naming convention

Author: ktoso

Benchmarks/Package.swift

@@ -51,7 +51,7 @@ let package = Package(
     .executableTarget(
       name: "JavaApiCallBenchmarks",
       dependencies: [
-        .product(name: "JavaRuntime", package: "swift-java"),
+        .product(name: "CJNI", package: "swift-java"),
         .product(name: "SwiftJNI", 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: "JavaRuntime",
-      targets: ["JavaRuntime"]
+      name: "CJNI",
+      targets: ["CJNI"]
     ),
 
     .library(
@@ -237,7 +237,7 @@ let package = Package(
     .target(
       name: "SwiftJNI",
       dependencies: [
-        "JavaRuntime",
+        "CJNI",
         "SwiftJNIMacros",
         "JavaTypes",
         "SwiftJavaConfigurationShared", // for Configuration reading at runtime
@@ -359,7 +359,7 @@ let package = Package(
     ),
 
     .target(
-      name: "JavaRuntime",
+      name: "CJNI",
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
@@ -371,7 +371,7 @@ let package = Package(
     ),
 
     .target(
-      name: "JavaKitShared"
+      name: "SwiftJavaShared"
     ),
 
     .target(
@@ -385,7 +385,7 @@ let package = Package(
         "JavaLangReflect",
         "JavaNet",
         "JavaTypes",
-        "JavaKitShared",
+        "SwiftJavaShared",
         "SwiftJavaConfigurationShared",
         // .product(name: "Subprocess", package: "swift-subprocess")
         "_Subprocess",
@@ -410,7 +410,7 @@ let package = Package(
         "JavaNet",
         "SwiftJavaLib",
         "JExtractSwiftLib",
-        "JavaKitShared",
+        "SwiftJavaShared",
         "SwiftJavaConfigurationShared",
       ],
       swiftSettings: [
@@ -433,7 +433,7 @@ let package = Package(
         .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
         "JavaTypes",
-        "JavaKitShared",
+        "SwiftJavaShared",
         "SwiftJavaConfigurationShared",
       ],
       swiftSettings: [
@@ -451,7 +451,7 @@ let package = Package(
     ),
 
     .testTarget(
-      name: "JavaKitTests",
+      name: "SwiftJNITests",
       dependencies: ["SwiftJNI", "JavaNet"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
@@ -468,7 +468,7 @@ let package = Package(
     ),
 
     .testTarget(
-      name: "JavaKitMacroTests",
+      name: "SwiftJNIMacroTests",
       dependencies: [
         "SwiftJNIMacros",
         .product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"),

Plugins/JExtractSwiftPlugin/JExtractSwiftPlugin.swift

@@ -43,7 +43,7 @@ struct JExtractSwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
 
     let sourceDir = target.directory.string
 
-    // The name of the configuration file JavaKit.config from the target for
+    // The name of the configuration file SwiftJava.config from the target for
     // which we are generating Swift wrappers for Java classes.
     let configFile = URL(filePath: sourceDir).appending(path: "swift-java.config")
     let configuration = try readConfiguration(sourceDir: "\(sourceDir)")

Plugins/JavaCompilerPlugin/JavaCompilerPlugin.swift

@@ -32,7 +32,7 @@ struct JavaCompilerBuildToolPlugin: BuildToolPlugin {
     // so we cannot eliminate this deprecation warning.
     let sourceDir = target.directory.string
 
-    // The name of the configuration file JavaKit.config from the target for
+    // The name of the configuration file SwiftJava.config from the target for
     // which we are generating Swift wrappers for Java classes.
     let configFile = URL(filePath: sourceDir).appending(path: "swift-java.config")
     let config: Configuration?

Plugins/PluginsShared/JavaKitConfigurationShared

@@ -0,0 +1 @@
+../../Sources/SwiftJavaConfigurationShared

Plugins/PluginsShared/SwiftJavaConfigurationShared

@@ -34,7 +34,7 @@ struct SwiftJavaBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
     // so we cannot eliminate this deprecation warning.
     let sourceDir = target.directory.string
 
-    // The name of the configuration file JavaKit.config from the target for
+    // The name of the configuration file SwiftJava.config from the target for
     // which we are generating Swift wrappers for Java classes.
     let configFile = URL(filePath: sourceDir)
       .appending(path: SwiftJavaConfigFileName)

Plugins/SwiftJavaPlugin/SwiftJavaPlugin.swift

@@ -61,7 +61,7 @@ let package = Package(
       name: "MySwiftLibrary",
       dependencies: [
         .product(name: "SwiftJNI", package: "swift-java"),
-        .product(name: "JavaRuntime", package: "swift-java"),
+        .product(name: "CJNI", package: "swift-java"),
         .product(name: "SwiftKitSwift", package: "swift-java"),
       ],
       exclude: [

Samples/JExtractJNISampleApp/Package.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import JavaKit
+import SwiftJNI
 
 public func optionalBool(input: Optional<Bool>) -> Bool? {
   return input

Samples/JExtractJNISampleApp/Sources/MySwiftLibrary/Optionals.swift

@@ -65,7 +65,7 @@ let package = Package(
       name: "JavaDependencySample",
       dependencies: [
         .product(name: "SwiftJNI", package: "swift-java"),
-        .product(name: "JavaRuntime", package: "swift-java"),
+        .product(name: "CJNI", package: "swift-java"),
         .product(name: "JavaUtilFunction", package: "swift-java"),
         "JavaCommonsCSV"
       ],