fix all configs

Author: ktoso

.licenseignore

@@ -41,4 +41,5 @@ gradlew.bat
 **/gradlew.bat
 **/ci-validate.sh
 **/DO_NOT_EDIT.txt
-Plugins/**/_PluginsShared
+Plugins/**/_PluginsShared
+Plugins/**/0_PLEASE_SYMLINK*

Package.swift

@@ -174,7 +174,7 @@ let package = Package(
     .target(
       name: "JavaKit",
       dependencies: ["JavaRuntime", "JavaKitMacros", "JavaTypes"],
-      exclude: ["Java2Swift.config"],
+      exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
@@ -201,7 +201,7 @@ let package = Package(
     .target(
       name: "JavaKitCollection",
       dependencies: ["JavaKit"],
-      exclude: ["Java2Swift.config"],
+      exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
@@ -210,7 +210,7 @@ let package = Package(
     .target(
       name: "JavaKitFunction",
       dependencies: ["JavaKit"],
-      exclude: ["Java2Swift.config"],
+      exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
@@ -219,7 +219,7 @@ let package = Package(
     .target(
       name: "JavaKitJar",
       dependencies: ["JavaKit", "JavaKitCollection"],
-      exclude: ["Java2Swift.config"],
+      exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
@@ -228,7 +228,7 @@ let package = Package(
     .target(
       name: "JavaKitNetwork",
       dependencies: ["JavaKit", "JavaKitCollection"],
-      exclude: ["Java2Swift.config"],
+      exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
@@ -237,7 +237,7 @@ let package = Package(
     .target(
       name: "JavaKitReflection",
       dependencies: ["JavaKit", "JavaKitCollection"],
-      exclude: ["Java2Swift.config"],
+      exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])

Plugins/JExtractSwiftCommandPlugin/JExtractSwiftCommandPlugin.swift

@@ -1,4 +1,4 @@
-//===----------------------------------------------------------------------===//
+//---------------------------------------------===-------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -10,7 +10,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 //
-//===----------------------------------------------------------------------===//
+//---------------------------------------------===-------------------------===//
 
 import Foundation
 import PackagePlugin
@@ -32,11 +32,13 @@ final class JExtractSwiftCommandPlugin: SwiftJavaPluginProtocol, BuildToolPlugin
   var buildOutputs: Bool = true
 
   func createBuildCommands(context: PluginContext, target: any Target) async throws -> [Command] {
+    print("JEXTRACT COMMAND CREATE BUILD COMMANDS ================================")
     // FIXME: This is not a build plugin but SwiftPM forces us to impleme the protocol anyway? rdar://139556637
     return []
   }
 
   func performCommand(context: PluginContext, arguments: [String]) throws {
+    print("JEXTRACT COMMAND ================================")
     // Plugin can't have dependencies, so we have some naive argument parsing instead:
     self.verbose = arguments.contains("-v") || arguments.contains("--verbose")
 

Plugins/Java2SwiftPlugin/Java2SwiftPlugin.swift

@@ -1,4 +1,4 @@
-//===----------------------------------------------------------------------===//
+//---------------------------------------------===-------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -10,12 +10,12 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 //
-//===----------------------------------------------------------------------===//
+//---------------------------------------------===-------------------------===//
 
 import Foundation
 import PackagePlugin
 
-fileprivate let Java2SwiftConfigFileName = "Java2Swift.config"
+fileprivate let SwiftJavaConfigFileName = "swift-java.config"
 
 @main
 struct Java2SwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
@@ -24,16 +24,23 @@ struct Java2SwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
   var verbose: Bool = getEnvironmentBool("SWIFT_JAVA_VERBOSE")
 
   func createBuildCommands(context: PluginContext, target: Target) throws -> [Command] {
+    print("JAVA2Swift ================================")
+    print("JAVA2Swift ================================")
+    print("JAVA2Swift ================================")
+    print("JAVA2Swift ================================")
+    print("JAVA2Swift ================================")
+
     guard let sourceModule = target.sourceModule else { return [] }
 
+
     // Note: Target doesn't have a directoryURL counterpart to directory,
     // so we cannot eliminate this deprecation warning.
     let sourceDir = target.directory.string
 
     // The name of the configuration file JavaKit.config from the target for
     // which we are generating Swift wrappers for Java classes.
     let configFile = URL(filePath: sourceDir)
-      .appending(path: "Java2Swift.config")
+      .appending(path: SwiftJavaConfigFileName)
     let configData = try Data(contentsOf: configFile)
     let config = try JSONDecoder().decode(Configuration.self, from: configData)
 
@@ -45,7 +52,7 @@ struct Java2SwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
 
       // Look for a config file within this target.
       let dependencyConfigURL = dependencyURL
-        .appending(path: Java2SwiftConfigFileName)
+        .appending(path: SwiftJavaConfigFileName)
       let dependencyConfigString = dependencyConfigURL
         .path(percentEncoded: false)
 

Plugins/JavaCompilerPlugin/JavaCompilerPlugin.swift

@@ -18,6 +18,7 @@ import PackagePlugin
 @main
 struct JavaCompilerBuildToolPlugin: BuildToolPlugin {
   func createBuildCommands(context: PluginContext, target: Target) throws -> [Command] {
+    print("COMPILER PLUGIN ================================")
     guard let sourceModule = target.sourceModule else { return [] }
 
     // Collect all of the Java source files within this target's sources.

Plugins/PluginsShared/Configuration.swift

@@ -1,4 +1,4 @@
-//===----------------------------------------------------------------------===//
+//---------------------------------------------===-------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -10,7 +10,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 //
-//===----------------------------------------------------------------------===//
+//---------------------------------------------===-------------------------===//
 
 import Foundation
 

Plugins/PluginsShared/SwiftJavaPluginProtocol.swift

@@ -21,8 +21,8 @@ protocol SwiftJavaPluginProtocol {
 
 extension SwiftJavaPluginProtocol {
   func log(_ message: @autoclosure () -> String, terminator: String = "\n") {
-    if self.verbose {
-      print("[swift-java-command] \(message())", terminator: terminator)
-    }
+//    if self.verbose {
+      print("[\(pluginName)] \(message())", terminator: terminator)
+//    }
   }
 }

Plugins/SwiftJavaPlugin/JExtractSwiftPlugin.swift

@@ -22,6 +22,7 @@ struct JExtractSwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
   var verbose: Bool = getEnvironmentBool("SWIFT_JAVA_VERBOSE")
 
   func createBuildCommands(context: PluginContext, target: Target) throws -> [Command] {
+    print("JEXTRACT BUILD COMMANDS PLAIN PLUGIN ================================")
     let toolURL = try context.tool(named: "JExtractSwiftTool").url
 
     guard let sourceModule = target.sourceModule else { return [] }