Reorganize and rename modules; Centralize around SwiftJava prefix and naming

.github/workflows/pull_request.yml

@@ -166,8 +166,8 @@ jobs:
           'JavaProbablyPrime',
           'JavaSieve',
           'SwiftAndJavaJarSampleLib',
-          'SwiftKitSampleApp',
-          'JExtractJNISampleApp',
+          'SwiftJavaExtractFFMSampleApp',
+          'SwiftJavaExtractJNISampleApp',
         ]
     container:
       image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
@@ -194,8 +194,8 @@ jobs:
           'JavaProbablyPrime',
           'JavaSieve',
           'SwiftAndJavaJarSampleLib',
-          'SwiftKitSampleApp',
-          'JExtractJNISampleApp',
+          'SwiftJavaExtractFFMSampleApp',
+          'SwiftJavaExtractJNISampleApp',
         ]
     steps:
       - uses: actions/checkout@v4

Benchmarks/Benchmarks/JavaApiCallBenchmarks/JavaApiCallBenchmarks.swift

@@ -14,8 +14,8 @@
 
 import Benchmark
 import Foundation
-import JavaKit
-import JavaKitNetwork
+import SwiftJava
+import JavaNet
 
 @MainActor let benchmarks = {
     var jvm: JavaVirtualMachine {

Benchmarks/Package.swift

@@ -51,9 +51,9 @@ let package = Package(
     .executableTarget(
       name: "JavaApiCallBenchmarks",
       dependencies: [
-        .product(name: "JavaRuntime", package: "swift-java"),
-        .product(name: "JavaKit", package: "swift-java"),
-        .product(name: "JavaKitNetwork", package: "swift-java"),
+        .product(name: "CJNI", package: "swift-java"),
+        .product(name: "SwiftJava", package: "swift-java"),
+        .product(name: "JavaNet", package: "swift-java"),
         .product(name: "Benchmark", package: "package-benchmark"),
       ],
       path: "Benchmarks/JavaApiCallBenchmarks",

Package.swift

@@ -94,45 +94,45 @@ let package = Package(
     .macOS(.v15)
   ],
   products: [
-    // ==== JavaKit (i.e. calling Java directly Swift utilities)
+    // ==== SwiftJava (i.e. calling Java directly Swift utilities)
     .library(
-      name: "JavaKit",
-      targets: ["JavaKit"]
+      name: "SwiftJava",
+      targets: ["SwiftJava"]
     ),
 
     .library(
-      name: "JavaRuntime",
-      targets: ["JavaRuntime"]
+      name: "CJNI",
+      targets: ["CJNI"]
     ),
 
     .library(
-      name: "JavaKitCollection",
-      targets: ["JavaKitCollection"]
+      name: "JavaUtil",
+      targets: ["JavaUtil"]
     ),
 
     .library(
-      name: "JavaKitFunction",
-      targets: ["JavaKitFunction"]
+      name: "JavaUtilFunction",
+      targets: ["JavaUtilFunction"]
     ),
 
     .library(
-      name: "JavaKitJar",
-      targets: ["JavaKitJar"]
+      name: "JavaUtilJar",
+      targets: ["JavaUtilJar"]
     ),
 
     .library(
-      name: "JavaKitNetwork",
-      targets: ["JavaKitNetwork"]
+      name: "JavaNet",
+      targets: ["JavaNet"]
     ),
 
     .library(
-      name: "JavaKitIO",
-      targets: ["JavaKitIO"]
+      name: "JavaIO",
+      targets: ["JavaIO"]
     ),
 
     .library(
-      name: "JavaKitReflection",
-      targets: ["JavaKitReflection"]
+      name: "JavaLangReflect",
+      targets: ["JavaLangReflect"]
     ),
 
     .library(
@@ -212,13 +212,13 @@ let package = Package(
     .target(
       name: "SwiftJavaDocumentation",
       dependencies: [
-        "JavaKit",
+        "SwiftJava",
         "SwiftKitSwift",
       ]
     ),
 
     .macro(
-      name: "JavaKitMacros",
+      name: "SwiftJavaMacros",
       dependencies: [
         .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
         .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
@@ -235,12 +235,12 @@ let package = Package(
     ),
 
     .target(
-      name: "JavaKit",
+      name: "SwiftJava",
       dependencies: [
-        "JavaRuntime",
-        "JavaKitMacros",
+        "CJNI",
+        "SwiftJavaMacros",
         "JavaTypes",
-        "JavaKitConfigurationShared", // for Configuration reading at runtime
+        "SwiftJavaConfigurationShared", // for Configuration reading at runtime
       ],
       exclude: ["swift-java.config"],
       swiftSettings: [
@@ -268,53 +268,59 @@ let package = Package(
       ]
     ),
     .target(
-      name: "JavaKitCollection",
-      dependencies: ["JavaKit"],
+      name: "JavaUtil",
+      dependencies: ["SwiftJava"],
+      path: "Sources/JavaStdlib/JavaUtil",
       exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
       ]
     ),
     .target(
-      name: "JavaKitFunction",
-      dependencies: ["JavaKit"],
+      name: "JavaUtilFunction",
+      dependencies: ["SwiftJava"],
+      path: "Sources/JavaStdlib/JavaUtilFunction",
       exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
       ]
     ),
     .target(
-      name: "JavaKitJar",
-      dependencies: ["JavaKit", "JavaKitCollection"],
+      name: "JavaUtilJar",
+      dependencies: ["SwiftJava", "JavaUtil"],
+      path: "Sources/JavaStdlib/JavaUtilJar",
       exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
       ]
     ),
     .target(
-      name: "JavaKitNetwork",
-      dependencies: ["JavaKit", "JavaKitCollection"],
+      name: "JavaNet",
+      dependencies: ["SwiftJava", "JavaUtil"],
+      path: "Sources/JavaStdlib/JavaNet",
       exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
       ]
     ),
     .target(
-      name: "JavaKitIO",
-      dependencies: ["JavaKit", "JavaKitCollection"],
+      name: "JavaIO",
+      dependencies: ["SwiftJava", "JavaUtil"],
+      path: "Sources/JavaStdlib/JavaIO",
       exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
       ]
     ),
     .target(
-      name: "JavaKitReflection",
-      dependencies: ["JavaKit", "JavaKitCollection"],
+      name: "JavaLangReflect",
+      dependencies: ["SwiftJava", "JavaUtil"],
+      path: "Sources/JavaStdlib/JavaLangReflect",
       exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
@@ -353,34 +359,34 @@ let package = Package(
     ),
 
     .target(
-      name: "JavaRuntime",
+      name: "CJNI",
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
       ]
     ),
 
     .target(
-      name: "JavaKitConfigurationShared"
+      name: "SwiftJavaConfigurationShared"
     ),
 
     .target(
-      name: "JavaKitShared"
+      name: "SwiftJavaShared"
     ),
 
     .target(
-      name: "SwiftJavaLib",
+      name: "SwiftJavaToolLib",
       dependencies: [
         .product(name: "SwiftBasicFormat", package: "swift-syntax"),
         .product(name: "SwiftSyntax", package: "swift-syntax"),
         .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
-        "JavaKit",
-        "JavaKitJar",
-        "JavaKitReflection",
-        "JavaKitNetwork",
+        "SwiftJava",
+        "JavaUtilJar",
+        "JavaLangReflect",
+        "JavaNet",
         "JavaTypes",
-        "JavaKitShared",
-        "JavaKitConfigurationShared",
+        "SwiftJavaShared",
+        "SwiftJavaConfigurationShared",
         // .product(name: "Subprocess", package: "swift-subprocess")
         "_Subprocess",
       ],
@@ -399,13 +405,13 @@ let package = Package(
         .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
         .product(name: "SystemPackage", package: "swift-system"),
-        "JavaKit",
-        "JavaKitJar",
-        "JavaKitNetwork",
-        "SwiftJavaLib",
+        "SwiftJava",
+        "JavaUtilJar",
+        "JavaNet",
+        "SwiftJavaToolLib",
         "JExtractSwiftLib",
-        "JavaKitShared",
-        "JavaKitConfigurationShared",
+        "SwiftJavaShared",
+        "SwiftJavaConfigurationShared",
       ],
       swiftSettings: [
         .swiftLanguageMode(.v5),
@@ -427,8 +433,8 @@ let package = Package(
         .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
         "JavaTypes",
-        "JavaKitShared",
-        "JavaKitConfigurationShared",
+        "SwiftJavaShared",
+        "SwiftJavaConfigurationShared",
       ],
       swiftSettings: [
         .swiftLanguageMode(.v5),
@@ -445,8 +451,11 @@ let package = Package(
     ),
 
     .testTarget(
-      name: "JavaKitTests",
-      dependencies: ["JavaKit", "JavaKitNetwork"],
+      name: "SwiftJavaTests",
+      dependencies: [
+        "SwiftJava", 
+        "JavaNet"
+      ],
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
@@ -455,16 +464,18 @@ let package = Package(
 
     .testTarget(
       name: "JavaTypesTests",
-      dependencies: ["JavaTypes"],
+      dependencies: [
+        "JavaTypes"
+      ],
       swiftSettings: [
         .swiftLanguageMode(.v5)
       ]
     ),
 
     .testTarget(
-      name: "JavaKitMacroTests",
+      name: "SwiftJavaMacrosTests",
       dependencies: [
-        "JavaKitMacros",
+        "SwiftJavaMacros",
         .product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"),
       ],
       swiftSettings: [
@@ -473,17 +484,19 @@ let package = Package(
     ),
 
     .testTarget(
-      name: "SwiftJavaTests",
-      dependencies: ["SwiftJavaLib"],
+      name: "SwiftJavaToolLibTests",
+      dependencies: [
+        "SwiftJavaToolLib"
+      ],
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
       ]
     ),
 
     .testTarget(
-      name: "JavaKitConfigurationSharedTests",
-      dependencies: ["JavaKitConfigurationShared"],
+      name: "SwiftJavaConfigurationSharedTests",
+      dependencies: ["SwiftJavaConfigurationShared"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])

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/SwiftJavaConfigurationShared

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

Plugins/SwiftJavaPlugin/SwiftJavaPlugin.swift

@@ -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)

README.md

@@ -184,7 +184,7 @@ To view the rendered docc documentation you can use the docc preview command:
 xcrun docc preview Sources/SwiftJavaDocumentation/Documentation.docc
 
 # OR JavaKit to view JavaKit documentation:
-# xcrun docc preview Sources/JavaKit/Documentation.docc
+# xcrun docc preview Sources/SwiftJNI/Documentation.docc
 
 # ========================================
 # Starting Local Preview Server