[PoC] package traits to disable/remove macros when not needed

Package.swift

@@ -1,11 +1,14 @@
-// swift-tools-version: 6.0
+// swift-tools-version: 6.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import CompilerPluginSupport
 import PackageDescription
 
 import Foundation
 
+// Package Trait Names 
+let SwiftJavaMacrosSupport: String = "SwiftJavaMacrosSupport"
+
 // Note: the JAVA_HOME environment variable must be set to point to where
 // Java is installed, e.g.,
 //   Library/Java/JavaVirtualMachines/openjdk-21.jdk/Contents/Home.
@@ -196,6 +199,17 @@ let package = Package(
     ),
 
   ],
+
+  traits: [
+    .init(
+      name: SwiftJavaMacrosSupport, 
+      description: "Enable @JavaMethod, @JavaClass and other Swift macros which are used in wrapping Java types"
+    ),
+    .default(enabledTraits: [
+      SwiftJavaMacrosSupport
+    ]) // enabled by default, but downstream libraries may disable macros if they don't use them
+  ],
+
   dependencies: [
     .package(url: "https://github.com/swiftlang/swift-syntax", from: "601.0.1"),
     .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
@@ -208,6 +222,7 @@ let package = Package(
     // Benchmarking
     .package(url: "https://github.com/ordo-one/package-benchmark", .upToNextMajor(from: "1.4.0")),
   ],
+
   targets: [
     .target(
       name: "SwiftJavaDocumentation",
@@ -220,8 +235,8 @@ let package = Package(
     .macro(
       name: "SwiftJavaMacros",
       dependencies: [
-        .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
-        .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
+        .product(name: "SwiftSyntaxMacros", package: "swift-syntax", condition: .when(traits: [SwiftJavaMacrosSupport])),
+        .product(name: "SwiftCompilerPlugin", package: "swift-syntax", condition: .when(traits: [SwiftJavaMacrosSupport])),
       ],
       swiftSettings: [
         .swiftLanguageMode(.v5)
@@ -237,10 +252,10 @@ let package = Package(
     .target(
       name: "SwiftJava",
       dependencies: [
-        "CSwiftJavaJNI",
-        "SwiftJavaMacros",
-        "JavaTypes",
-        "SwiftJavaConfigurationShared", // for Configuration reading at runtime
+        .byName(name: "CSwiftJavaJNI"),
+        .byName(name: "JavaTypes"),
+        .byName(name: "SwiftJavaMacros", condition: .when(traits: [SwiftJavaMacrosSupport])),
+        .byName(name: "SwiftJavaConfigurationShared"), // for Configuration reading at runtime
       ],
       exclude: ["swift-java.config"],
       swiftSettings: [

Sources/JavaStdlib/JavaIO/generated/BufferedInputStream.swift

@@ -2,6 +2,7 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaClass("java.io.BufferedInputStream")
 open class BufferedInputStream: InputStream {
   @JavaMethod
@@ -37,3 +38,4 @@ open class BufferedInputStream: InputStream {
   @JavaMethod
   open override func markSupported() -> Bool
 }
+#endif

Sources/JavaStdlib/JavaIO/generated/Charset.swift

@@ -2,6 +2,7 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaClass("java.nio.charset.Charset")
 open class Charset: JavaObject {
   @JavaMethod
@@ -47,3 +48,4 @@ extension JavaClass<Charset> {
   @JavaStaticMethod
   public func isSupported(_ arg0: String) -> Bool
 }
+#endif

Sources/JavaStdlib/JavaIO/generated/Closeable.swift

@@ -2,8 +2,10 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaInterface("java.io.Closeable")
 public struct Closeable {
   @JavaMethod
   public func close() throws
 }
+#endif

Sources/JavaStdlib/JavaIO/generated/File.swift

@@ -2,6 +2,7 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaClass("java.io.File")
 open class File: JavaObject {
   @JavaMethod
@@ -164,3 +165,4 @@ extension JavaClass<File> {
   @JavaStaticMethod
   public func createTempFile(_ arg0: String, _ arg1: String, _ arg2: File?) throws -> File!
 }
+#endif

Sources/JavaStdlib/JavaIO/generated/FileDescriptor.swift

@@ -2,6 +2,7 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaClass("java.io.FileDescriptor")
 open class FileDescriptor: JavaObject {
   @JavaMethod
@@ -23,3 +24,4 @@ extension JavaClass<FileDescriptor> {
   @JavaStaticField(isFinal: true)
   public var err: FileDescriptor!
 }
+#endif

Sources/JavaStdlib/JavaIO/generated/FileReader.swift

@@ -2,6 +2,7 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaClass("java.io.FileReader")
 open class FileReader: InputStreamReader {
   @JavaMethod
@@ -19,3 +20,4 @@ open class FileReader: InputStreamReader {
   @JavaMethod
   @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) throws
 }
+#endif

Sources/JavaStdlib/JavaIO/generated/Flushable.swift

@@ -2,8 +2,10 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaInterface("java.io.Flushable")
 public struct Flushable {
   @JavaMethod
   public func flush() throws
 }
+#endif

Sources/JavaStdlib/JavaIO/generated/InputStream.swift

@@ -2,6 +2,7 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaClass("java.io.InputStream", implements: Closeable.self)
 open class InputStream: JavaObject {
   @JavaMethod
@@ -53,3 +54,4 @@ extension JavaClass<InputStream> {
   @JavaStaticMethod
   public func nullInputStream() -> InputStream!
 }
+#endif

Sources/JavaStdlib/JavaIO/generated/InputStreamReader.swift

@@ -2,6 +2,7 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaClass("java.io.InputStreamReader")
 open class InputStreamReader: Reader {
   @JavaMethod
@@ -28,3 +29,4 @@ open class InputStreamReader: Reader {
   @JavaMethod
   open func getEncoding() -> String
 }
+#endif

Sources/JavaStdlib/JavaIO/generated/OutputStream.swift

@@ -2,6 +2,7 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaClass("java.io.OutputStream", implements: Closeable.self, Flushable.self)
 open class OutputStream: JavaObject {
   @JavaMethod
@@ -26,3 +27,4 @@ extension JavaClass<OutputStream> {
   @JavaStaticMethod
   public func nullOutputStream() -> OutputStream!
 }
+#endif

Sources/JavaStdlib/JavaIO/generated/Path.swift

@@ -2,6 +2,7 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaInterface("java.nio.file.Path")
 public struct Path {
   @JavaMethod
@@ -86,3 +87,4 @@ extension JavaClass<Path> {
   @JavaStaticMethod
   public func of(_ arg0: String, _ arg1: [String]) -> Path!
 }
+#endif

Sources/JavaStdlib/JavaIO/generated/Readable.swift

@@ -2,7 +2,9 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaInterface("java.lang.Readable")
 public struct Readable {
 
 }
+#endif

Sources/JavaStdlib/JavaIO/generated/Reader.swift

@@ -2,6 +2,7 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaClass("java.io.Reader", implements: Readable.self, Closeable.self)
 open class Reader: JavaObject {
   @JavaMethod
@@ -38,3 +39,4 @@ extension JavaClass<Reader> {
   @JavaStaticMethod
   public func nullReader() -> Reader!
 }
+#endif

Sources/JavaStdlib/JavaIO/generated/StringReader.swift

@@ -2,6 +2,7 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaClass("java.io.StringReader")
 open class StringReader: Reader {
   @JavaMethod
@@ -31,3 +32,4 @@ open class StringReader: Reader {
   @JavaMethod
   open override func markSupported() -> Bool
 }
+#endif

Sources/JavaStdlib/JavaIO/generated/WatchService.swift

@@ -2,8 +2,10 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaInterface("java.nio.file.WatchService", extends: Closeable.self)
 public struct WatchService {
   @JavaMethod
   public func close() throws
 }
+#endif

Sources/JavaStdlib/JavaIO/generated/Writer.swift

@@ -2,6 +2,7 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaClass("java.io.Writer", implements: Appendable.self, Closeable.self, Flushable.self)
 open class Writer: JavaObject {
   @JavaMethod
@@ -47,3 +48,4 @@ extension JavaClass<Writer> {
   @JavaStaticMethod
   public func nullWriter() -> Writer!
 }
+#endif

Sources/JavaStdlib/JavaLangReflect/Constructor+Utilities.swift

@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if SwiftJavaMacrosSupport
 extension Constructor {
   /// Whether this is a 'public' constructor.
   public var isPublic: Bool {
@@ -23,3 +24,4 @@ extension Constructor {
     return (getModifiers() & 256) != 0
   }
 }
+#endif

Sources/JavaStdlib/JavaLangReflect/Executable+Utilities.swift

@@ -14,6 +14,7 @@
 
 import SwiftJava
 
+#if SwiftJavaMacrosSupport
 extension Executable {
   /// Whether this executable throws any checked exception.
   public var throwsCheckedException: Bool {
@@ -29,3 +30,4 @@ extension Executable {
     return false
   }
 }
+#endif

Sources/JavaStdlib/JavaLangReflect/Field+Utilities.swift

@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if SwiftJavaMacrosSupport
 extension Field {
     /// Whether this is a 'static' field.
     public var isStatic: Bool {
@@ -23,3 +24,4 @@ extension Field {
     return (getModifiers() & 16) != 0
   }
 }
+#endif

Sources/JavaStdlib/JavaLangReflect/JavaClass+Reflection.swift

@@ -16,6 +16,7 @@ import SwiftJava
 
 // TODO: We should be able to autogenerate this as an extension based on
 // knowing that JavaClass was defined elsewhere.
+#if SwiftJavaMacrosSupport
 extension JavaClass {
   @JavaMethod
   public func getDeclaredMethods() -> [Method?]
@@ -47,3 +48,4 @@ extension JavaClass {
   @JavaMethod
   public func getAnnotations() -> [Annotation?]
 }
+#endif

Sources/JavaStdlib/JavaLangReflect/Method+Utilities.swift

@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if SwiftJavaMacrosSupport
 extension Method {
   /// Whether this is a 'public' method.
   public var isPublic: Bool {
@@ -33,3 +34,4 @@ extension Method {
     return (getModifiers() & 256) != 0
   }
 }
+#endif

Sources/JavaStdlib/JavaLangReflect/generated/AccessibleObject.swift

@@ -2,6 +2,7 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaClass("java.lang.reflect.AccessibleObject")
 open class AccessibleObject: JavaObject {
   @JavaMethod
@@ -41,3 +42,4 @@ extension JavaClass<AccessibleObject> {
   @JavaStaticMethod
   public func setAccessible(_ arg0: [AccessibleObject?], _ arg1: Bool)
 }
+#endif

Sources/JavaStdlib/JavaLangReflect/generated/AnnotatedType.swift

@@ -2,6 +2,7 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaInterface("java.lang.reflect.AnnotatedType")
 public struct AnnotatedType {
   @JavaMethod
@@ -31,3 +32,4 @@ public struct AnnotatedType {
   @JavaMethod
   public func getDeclaredAnnotationsByType(_ arg0: JavaClass<Annotation>?) -> [Annotation?]
 }
+#endif

Sources/JavaStdlib/JavaLangReflect/generated/Annotation.swift

@@ -2,6 +2,7 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaInterface("java.lang.annotation.Annotation")
 public struct Annotation {
   @JavaMethod
@@ -16,3 +17,4 @@ public struct Annotation {
   @JavaMethod
   public func annotationType() -> JavaClass<Annotation>!
 }
+#endif

Sources/JavaStdlib/JavaLangReflect/generated/Constructor.swift

@@ -2,6 +2,7 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaClass("java.lang.reflect.Constructor")
 open class Constructor<T: AnyJavaObject>: Executable {
   @JavaMethod
@@ -77,3 +78,4 @@ extension JavaClass {
   @JavaStaticField(isFinal: true)
   public var DECLARED: Int32
 }
+#endif

Sources/JavaStdlib/JavaLangReflect/generated/Executable.swift

@@ -3,6 +3,7 @@ import SwiftJava
 import JavaUtil
 import CSwiftJavaJNI
 
+#if SwiftJavaMacrosSupport
 @JavaClass("java.lang.reflect.Executable", implements: GenericDeclaration.self)
 open class Executable: AccessibleObject {
   @JavaMethod
@@ -75,3 +76,4 @@ extension JavaClass<Executable> {
   @JavaStaticField(isFinal: true)
   public var DECLARED: Int32
 }
+#endif