Rename @JavaImplements to @JavaImplementation to actually match SE-0436

Author: DougGregor

Samples/JavaKitSampleApp/Sources/JavaKitExample/JavaKitExample.swift

@@ -18,7 +18,7 @@ enum SwiftWrappedError: Error {
   case message(String)
 }
 
-@JavaImplements("com.example.swift.HelloSwift")
+@JavaImplementation("com.example.swift.HelloSwift")
 extension HelloSwift: HelloSwiftNativeMethods {
   @JavaMethod
   func sayHello(_ i: Int32, _ j: Int32) -> Int32 {

Sources/JavaKit/Macros.swift

@@ -156,7 +156,7 @@ public macro JavaStaticMethod() = #externalMacro(module: "JavaKitMacros", type:
 /// the method can be implemented in Swift with the following:
 ///
 /// ```swift
-/// @JavaImplements
+/// @JavaImplementation
 /// extension Hello {
 ///   @JavaMethod
 ///   func sayHello(i: Int32, _ j: Int32) -> Int32 {
@@ -165,4 +165,4 @@ public macro JavaStaticMethod() = #externalMacro(module: "JavaKitMacros", type:
 /// }
 /// ```
 @attached(peer)
-public macro JavaImplements(_ fullClassName: String) = #externalMacro(module: "JavaKitMacros", type: "JavaImplementsMacro")
+public macro JavaImplementation(_ fullClassName: String) = #externalMacro(module: "JavaKitMacros", type: "JavaImplementationMacro")

Sources/JavaKitMacros/GenerationMode.swift

@@ -26,7 +26,7 @@ enum GenerationMode {
 
   /// This macro is describing an extension that is implementing the native
   /// methods of a Java class.
-  case JavaImplements
+  case javaImplementation
 
   /// Determine the mode for Java class generation based on an attribute.
   init?(attribute: AttributeSyntax) {
@@ -37,8 +37,8 @@ enum GenerationMode {
     case "ExportToJavaClass":
       self = .exportToJava
 
-    case "JavaImplements":
-      self = .JavaImplements
+    case "JavaImplementation":
+      self = .javaImplementation
 
     default:
       return nil

Sources/JavaKitMacros/ImplementsJavaMacro.swift

@@ -16,16 +16,16 @@ import SwiftSyntax
 import SwiftSyntaxBuilder
 import SwiftSyntaxMacros
 
-enum JavaImplementsMacro {}
+enum JavaImplementationMacro {}
 
-extension JavaImplementsMacro: PeerMacro {
+extension JavaImplementationMacro: PeerMacro {
   static func expansion(
     of node: AttributeSyntax,
     providingPeersOf declaration: some DeclSyntaxProtocol,
     in context: some MacroExpansionContext
   ) throws -> [DeclSyntax] {
     guard let extensionDecl = declaration.as(ExtensionDeclSyntax.self) else {
-      throw MacroErrors.JavaImplementsRequiresExtension
+      throw MacroErrors.javaImplementationRequiresExtension
     }
 
     // Dig out the Java class name.

Sources/JavaKitMacros/JavaMethodMacro.swift

@@ -34,7 +34,7 @@ extension JavaMethodMacro: BodyMacro {
     // MacroErrors.macroOutOfContext(node.attributeName.trimmedDescription)
 
     switch mode {
-    case .JavaImplements, .exportToJava:
+    case .javaImplementation, .exportToJava:
       return declaration.body.map { Array($0.statements) } ?? []
 
     case .importFromJava, nil:

Sources/JavaKitMacros/MacroErrors.swift

@@ -14,7 +14,7 @@
 
 enum MacroErrors: Error {
   case unrecognizedJavaClassMacro(String)
-  case JavaImplementsRequiresExtension
+  case javaImplementationRequiresExtension
   case classNameNotStringLiteral
   case classNameNotFullyQualified(String)
   case javaClassNotOnType

Sources/JavaKitMacros/SwiftJNIMacrosPlugin.swift

@@ -18,7 +18,7 @@ import SwiftSyntaxMacros
 @main
 struct JavaKitMacrosPlugin: CompilerPlugin {
   var providingMacros: [Macro.Type] = [
-    JavaImplementsMacro.self,
+    JavaImplementationMacro.self,
     JavaClassMacro.self,
     JavaFieldMacro.self,
     JavaMethodMacro.self,

USER_GUIDE.md

@@ -235,7 +235,7 @@ if let url = myObject.as(URL.self) {
 
 ### Implementing Java `native` methods in Swift
 
-JavaKit supports implementing Java `native` methods in Swift using JNI with the `@JavaImplements` macro. In Java, the method must be declared as `native`, e.g.,
+JavaKit supports implementing Java `native` methods in Swift using JNI with the `@JavaImplementation` macro. In Java, the method must be declared as `native`, e.g.,
 
 ```java
 package org.swift.javakit.example;
@@ -259,10 +259,10 @@ On the Swift side, the Java class needs to be exposed to Swift through `Java2Swi
 }
 ```
 
-Implementations of `native` methods are written in an extension of the Swift type that has been marked with `@JavaImplements`. The methods themselves must be marked with `@JavaMethod`, indicating that they are available to Java as well. To help ensure that the Swift code implements all of the `native` methods with the right signatures, JavaKit produces a protocol with the Swift type name suffixed by `NativeMethods`. Declare conformance to that protocol and implement its requirements, for example:
+Implementations of `native` methods are written in an extension of the Swift type that has been marked with `@JavaImplementation`. The methods themselves must be marked with `@JavaMethod`, indicating that they are available to Java as well. To help ensure that the Swift code implements all of the `native` methods with the right signatures, JavaKit produces a protocol with the Swift type name suffixed by `NativeMethods`. Declare conformance to that protocol and implement its requirements, for example:
 
 ```swift
-@JavaImplements("org.swift.javakit.HelloSwift")
+@JavaImplementation("org.swift.javakit.HelloSwift")
 extension Hello: HelloNativeMethods {
   @JavaMethod
   func reportStatistics(_ meaning: String, _ numbers: [Double]) -> String {
@@ -532,15 +532,10 @@ Now, in the `HelloSwift` Swift library, define a `struct` that provides the `mai
 ```swift
 import JavaKit
 
-@JavaImplements("org.swift.javakit.HelloSwiftMain")
+@JavaImplementation("org.swift.javakit.HelloSwiftMain")
 struct HelloSwiftMain {
-<<<<<<< HEAD
-  @JavaImplements
-  static func main(arguments: [String], environment: JNIEnvironment? = nil) {
-=======
   @JavaStaticMethod
-  static func main(arguments: [String], environment: JNIEnvironment) {
->>>>>>> 148e53c (JavaKit: Rework `@JavaImplements` to be more like `@implements` language feature)
+  static func main(arguments: [String], environment: JNIEnvironment? = nil) {
     print("Command line arguments are: \(arguments)")
   }
 }
@@ -571,7 +566,7 @@ struct HelloSwiftMain: ParsableCommand {
   @Option(name: .shortAndLong, help: "Enable verbose output")
   var verbose: Bool = false
 
-  @JavaImplements
+  @JavaImplementation
   static func main(arguments: [String], environment: JNIEnvironment? = nil) {
     let command = Self.parseOrExit(arguments)
     command.run(environment: environment)