rename Java2SwiftLib to SwiftJavaLib

Author: ktoso

Package.swift

@@ -92,8 +92,8 @@ let package = Package(
     ),
 
     .executable(
-      name: "Java2Swift",
-      targets: ["Java2Swift"]
+      name: "swift-java",
+      targets: ["SwiftJavaTool"]
     ),
 
     // ==== Plugin for building Java code
@@ -274,7 +274,7 @@ let package = Package(
       name: "Java2SwiftPlugin",
       capability: .buildTool(),
       dependencies: [
-        "Java2Swift"
+        "SwiftJavaTool"
       ]
     ),
 
@@ -312,7 +312,7 @@ let package = Package(
     ),
 
     .target(
-      name: "Java2SwiftLib",
+      name: "SwiftJavaLib",
       dependencies: [
         .product(name: "SwiftBasicFormat", package: "swift-syntax"),
         .product(name: "SwiftSyntax", package: "swift-syntax"),
@@ -334,7 +334,7 @@ let package = Package(
     ),
 
     .executableTarget(
-      name: "Java2Swift",
+      name: "SwiftJavaTool",
       dependencies: [
         .product(name: "SwiftBasicFormat", package: "swift-syntax"),
         .product(name: "SwiftSyntax", package: "swift-syntax"),
@@ -343,7 +343,7 @@ let package = Package(
         "JavaKit",
         "JavaKitJar",
         "JavaKitNetwork",
-        "Java2SwiftLib",
+        "SwiftJavaLib",
         "JavaKitShared",
       ],
 
@@ -427,8 +427,8 @@ let package = Package(
     ),
 
     .testTarget(
-      name: "Java2SwiftTests",
-      dependencies: ["Java2SwiftLib"],
+      name: "SwiftJavaTests",
+      dependencies: ["SwiftJavaLib"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])

Sources/Java2SwiftLib/JavaClassTranslator.swift renamed to Sources/SwiftJavaLib/JavaClassTranslator.swift

@@ -14,10 +14,10 @@
 
 import Foundation
 import ArgumentParser
-import Java2SwiftLib
+import SwiftJavaLib
 import JavaKit
 import JavaKitJar
-import Java2SwiftLib
+import SwiftJavaLib
 import JavaKitConfigurationShared
 
 extension String {

Sources/Java2SwiftLib/JavaTranslator+Configuration.swift renamed to Sources/SwiftJavaLib/JavaTranslator+Configuration.swift

@@ -14,13 +14,12 @@
 
 import Foundation
 import ArgumentParser
-import Java2SwiftLib
+import SwiftJavaLib
 import JavaKit
 import JavaKitJar
-import Java2SwiftLib
 import JavaKitConfigurationShared
 
-extension JavaToSwift {
+extension SwiftJava {
 
   // TODO: make this perhaps "emit type mappings"
   mutating func emitConfiguration(

Sources/Java2SwiftLib/JavaTranslator+Validation.swift renamed to Sources/SwiftJavaLib/JavaTranslator+Validation.swift

@@ -13,16 +13,16 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import Java2SwiftLib
+import SwiftJavaLib
 import JavaKit
 import Foundation
 import JavaKitJar
-import Java2SwiftLib
+import SwiftJavaLib
 import JavaKitConfigurationShared
 import JavaKitShared
 import _Subprocess
 
-extension JavaToSwift {
+extension SwiftJava {
 
   var SwiftJavaClasspathPrefix: String { "SWIFT_JAVA_CLASSPATH:" }
 

Sources/Java2SwiftLib/JavaTranslator.swift renamed to Sources/SwiftJavaLib/JavaTranslator.swift

@@ -14,13 +14,13 @@
 
 import Foundation
 import ArgumentParser
-import Java2SwiftLib
+import SwiftJavaLib
 import JavaKit
 import JavaKitJar
-import Java2SwiftLib
+import SwiftJavaLib
 import JavaKitConfigurationShared
 
-extension JavaToSwift {
+extension SwiftJava {
   mutating func generateWrappers(
     config: Configuration,
     classpath: String,

Sources/Java2SwiftLib/MethodVariance.swift renamed to Sources/SwiftJavaLib/MethodVariance.swift

@@ -14,7 +14,7 @@
 
 import ArgumentParser
 import Foundation
-import Java2SwiftLib
+import SwiftJavaLib
 import JavaKit
 import JavaKitJar
 import JavaKitNetwork
@@ -26,8 +26,8 @@ import JavaKitShared
 
 /// Command-line utility to drive the export of Java classes into Swift types.
 @main
-struct JavaToSwift: AsyncParsableCommand {
-  static var _commandName: String { "Java2Swift" }
+struct SwiftJava: AsyncParsableCommand {
+  static var _commandName: String { "swift-java" }
 
   @Option(help: "The name of the Swift module into which the resulting Swift types will be generated.")
   var moduleName: String?
@@ -382,7 +382,7 @@ struct JavaToSwift: AsyncParsableCommand {
   }
 }
 
-extension JavaToSwift {
+extension SwiftJava {
   /// Get base configuration, depending on if we are to 'amend' or 'overwrite' the existing configuration.
   package func getBaseConfigurationForWrite() throws -> (Bool, Configuration) {
     guard let actualOutputDirectory = self.actualOutputDirectory else {

Sources/Java2SwiftLib/OptionalKind.swift renamed to Sources/SwiftJavaLib/OptionalKind.swift

@@ -14,7 +14,7 @@
 
 @_spi(Testing)
 import JavaKit
-import Java2SwiftLib
+import SwiftJavaLib
 import XCTest // NOTE: Workaround for https://github.com/swiftlang/swift-java/issues/43
 
 /// Handy reference to the JVM abstraction.

Sources/Java2SwiftLib/StringExtras.swift renamed to Sources/SwiftJavaLib/StringExtras.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Java2SwiftLib
+import SwiftJavaLib
 import XCTest
 
 final class JavaTranslatorValidationTests: XCTestCase {