From dc29bdd84873127907ce816a193e8a8a32f232da Mon Sep 17 00:00:00 2001 From: Konrad Malawski Date: Mon, 1 Sep 2025 14:39:10 +0900 Subject: [PATCH] PoC how we might try to use package traits --- Package.swift | 29 +++++++++---- .../generated/BufferedInputStream.swift | 2 + .../JavaStdlib/JavaIO/generated/Charset.swift | 2 + .../JavaIO/generated/Closeable.swift | 2 + .../JavaStdlib/JavaIO/generated/File.swift | 2 + .../JavaIO/generated/FileDescriptor.swift | 2 + .../JavaIO/generated/FileReader.swift | 2 + .../JavaIO/generated/Flushable.swift | 2 + .../JavaIO/generated/InputStream.swift | 2 + .../JavaIO/generated/InputStreamReader.swift | 2 + .../JavaIO/generated/OutputStream.swift | 2 + .../JavaStdlib/JavaIO/generated/Path.swift | 2 + .../JavaIO/generated/Readable.swift | 2 + .../JavaStdlib/JavaIO/generated/Reader.swift | 2 + .../JavaIO/generated/StringReader.swift | 2 + .../JavaIO/generated/WatchService.swift | 2 + .../JavaStdlib/JavaIO/generated/Writer.swift | 2 + .../Constructor+Utilities.swift | 2 + .../Executable+Utilities.swift | 2 + .../JavaLangReflect/Field+Utilities.swift | 2 + .../JavaClass+Reflection.swift | 2 + .../JavaLangReflect/Method+Utilities.swift | 2 + .../generated/AccessibleObject.swift | 2 + .../generated/AnnotatedType.swift | 2 + .../generated/Annotation.swift | 2 + .../generated/Constructor.swift | 2 + .../generated/Executable.swift | 2 + .../JavaLangReflect/generated/Field.swift | 2 + .../generated/GenericArrayType.swift | 2 + .../generated/GenericDeclaration.swift | 2 + .../JavaLangReflect/generated/Method.swift | 2 + .../JavaLangReflect/generated/Parameter.swift | 2 + .../generated/ParameterizedType.swift | 2 + .../JavaLangReflect/generated/Type.swift | 2 + .../generated/TypeVariable.swift | 2 + .../generated/WildcardType.swift | 2 + .../JavaStdlib/JavaNet/generated/URI.swift | 2 + .../JavaStdlib/JavaNet/generated/URL.swift | 2 + .../JavaNet/generated/URLClassLoader.swift | 2 + .../JavaNet/generated/URLConnection.swift | 2 + .../JavaUtil/JavaEnumeration+Sequence.swift | 2 + .../JavaUtil/JavaIterator+Iterator.swift | 2 + .../JavaStdlib/JavaUtil/List+Sequence.swift | 2 + .../JavaUtil/generated/ArrayDeque.swift | 2 + .../JavaUtil/generated/ArrayList.swift | 2 + .../JavaUtil/generated/BitSet.swift | 2 + .../JavaUtil/generated/Enumeration.swift | 2 + .../JavaUtil/generated/HashMap.swift | 2 + .../JavaUtil/generated/HashSet.swift | 2 + .../JavaUtil/generated/JavaCollection.swift | 2 + .../JavaUtil/generated/JavaDictionary.swift | 2 + .../JavaUtil/generated/JavaIterator.swift | 2 + .../JavaUtil/generated/JavaSet.swift | 2 + .../JavaUtil/generated/LinkedList.swift | 2 + .../JavaStdlib/JavaUtil/generated/List.swift | 2 + .../JavaUtil/generated/ListIterator.swift | 2 + .../JavaUtil/generated/PriorityQueue.swift | 2 + .../JavaStdlib/JavaUtil/generated/Queue.swift | 2 + .../JavaUtil/generated/RandomAccess.swift | 2 + .../JavaStdlib/JavaUtil/generated/Stack.swift | 2 + .../JavaUtil/generated/TreeMap.swift | 2 + .../JavaUtil/generated/TreeSet.swift | 2 + .../generated/JavaBiConsumer.swift | 2 + .../generated/JavaBiFunction.swift | 2 + .../generated/JavaBiPredicate.swift | 2 + .../generated/JavaBinaryOperator.swift | 2 + .../generated/JavaBooleanSupplier.swift | 2 + .../generated/JavaConsumer.swift | 2 + .../generated/JavaDoubleBinaryOperator.swift | 2 + .../generated/JavaDoubleConsumer.swift | 2 + .../generated/JavaDoubleFunction.swift | 2 + .../generated/JavaDoublePredicate.swift | 2 + .../generated/JavaDoubleSupplier.swift | 2 + .../generated/JavaDoubleToIntFunction.swift | 2 + .../generated/JavaDoubleToLongFunction.swift | 2 + .../generated/JavaDoubleUnaryOperator.swift | 2 + .../generated/JavaFunction.swift | 2 + .../generated/JavaIntBinaryOperator.swift | 2 + .../generated/JavaIntConsumer.swift | 2 + .../generated/JavaIntFunction.swift | 2 + .../generated/JavaIntPredicate.swift | 2 + .../generated/JavaIntSupplier.swift | 2 + .../generated/JavaIntToDoubleFunction.swift | 2 + .../generated/JavaIntToLongFunction.swift | 2 + .../generated/JavaIntUnaryOperator.swift | 2 + .../generated/JavaLongBinaryOperator.swift | 2 + .../generated/JavaLongConsumer.swift | 2 + .../generated/JavaLongFunction.swift | 2 + .../generated/JavaLongPredicate.swift | 2 + .../generated/JavaLongSupplier.swift | 2 + .../generated/JavaLongToDoubleFunction.swift | 2 + .../generated/JavaLongToIntFunction.swift | 2 + .../generated/JavaLongUnaryOperator.swift | 2 + .../generated/JavaObjDoubleConsumer.swift | 2 + .../generated/JavaObjIntConsumer.swift | 2 + .../generated/JavaObjLongConsumer.swift | 2 + .../generated/JavaPredicate.swift | 2 + .../generated/JavaSupplier.swift | 2 + .../generated/JavaToDoubleBiFunction.swift | 2 + .../generated/JavaToDoubleFunction.swift | 2 + .../generated/JavaToIntBiFunction.swift | 2 + .../generated/JavaToIntFunction.swift | 2 + .../generated/JavaToLongBiFunction.swift | 2 + .../generated/JavaToLongFunction.swift | 2 + .../generated/JavaUnaryOperator.swift | 2 + .../JavaUtilJar/generated/Attributes.swift | 2 + .../JavaUtilJar/generated/JarEntry.swift | 2 + .../JavaUtilJar/generated/JarFile.swift | 2 + .../generated/JarInputStream.swift | 2 + .../generated/JarOutputStream.swift | 2 + .../JavaUtilJar/generated/Manifest.swift | 2 + .../JavaUtilJar/generated/ZipEntry.swift | 2 + ...ort.swift => CSwiftJavaJNI+Exported.swift} | 0 .../Exceptions/Exception+Error.swift | 2 + .../Exceptions/ExceptionHandling.swift | 2 + .../Exceptions/Throwable+Error.swift | 2 + Sources/SwiftJava/Macros.swift | 3 ++ Sources/SwiftJava/Optional+JavaObject.swift | 2 + Sources/SwiftJava/Optional+JavaOptional.swift | 2 + Sources/SwiftJava/generated/Appendable.swift | 2 + .../SwiftJava/generated/CharSequence.swift | 2 + Sources/SwiftJava/generated/Exception.swift | 2 + Sources/SwiftJava/generated/JavaArray.swift | 2 + Sources/SwiftJava/generated/JavaBoolean.swift | 2 + Sources/SwiftJava/generated/JavaByte.swift | 2 + .../SwiftJava/generated/JavaCharacter.swift | 2 + Sources/SwiftJava/generated/JavaClass.swift | 2 + .../SwiftJava/generated/JavaClassLoader.swift | 2 + Sources/SwiftJava/generated/JavaDouble.swift | 2 + Sources/SwiftJava/generated/JavaError.swift | 2 + Sources/SwiftJava/generated/JavaFloat.swift | 2 + Sources/SwiftJava/generated/JavaInteger.swift | 2 + Sources/SwiftJava/generated/JavaLong.swift | 2 + Sources/SwiftJava/generated/JavaNumber.swift | 2 + Sources/SwiftJava/generated/JavaObject.swift | 2 + .../SwiftJava/generated/JavaOptional.swift | 2 + .../generated/JavaOptionalDouble.swift | 2 + .../SwiftJava/generated/JavaOptionalInt.swift | 2 + .../generated/JavaOptionalLong.swift | 2 + Sources/SwiftJava/generated/JavaShort.swift | 2 + Sources/SwiftJava/generated/JavaString.swift | 2 + Sources/SwiftJava/generated/JavaVoid.swift | 2 + .../generated/RuntimeException.swift | 2 + Sources/SwiftJava/generated/Throwable.swift | 2 + Sources/SwiftJavaMacros/GenerationMode.swift | 4 ++ .../SwiftJavaMacros/ImplementsJavaMacro.swift | 4 ++ Sources/SwiftJavaMacros/JavaClassMacro.swift | 4 ++ Sources/SwiftJavaMacros/JavaFieldMacro.swift | 4 ++ Sources/SwiftJavaMacros/JavaMethodMacro.swift | 4 ++ Sources/SwiftJavaMacros/MacroErrors.swift | 4 ++ .../SwiftJNIMacrosPlugin.swift | 11 +++++ .../SwiftJavaMacros/SwiftSyntaxUtils.swift | 4 ++ .../AdditionalSwiftImportsTests.swift | 42 +++++++++++++++++++ 153 files changed, 388 insertions(+), 7 deletions(-) rename Sources/SwiftJava/{JavaRuntime+Reexport.swift => CSwiftJavaJNI+Exported.swift} (100%) create mode 100644 Tests/JExtractSwiftTests/AdditionalSwiftImportsTests.swift diff --git a/Package.swift b/Package.swift index 1c0e9481..950b51fe 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// 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 @@ -6,6 +6,9 @@ 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: [ diff --git a/Sources/JavaStdlib/JavaIO/generated/BufferedInputStream.swift b/Sources/JavaStdlib/JavaIO/generated/BufferedInputStream.swift index 2a211eb9..5900dc4c 100644 --- a/Sources/JavaStdlib/JavaIO/generated/BufferedInputStream.swift +++ b/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 diff --git a/Sources/JavaStdlib/JavaIO/generated/Charset.swift b/Sources/JavaStdlib/JavaIO/generated/Charset.swift index 03e85a8c..94e0735c 100644 --- a/Sources/JavaStdlib/JavaIO/generated/Charset.swift +++ b/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 { @JavaStaticMethod public func isSupported(_ arg0: String) -> Bool } +#endif diff --git a/Sources/JavaStdlib/JavaIO/generated/Closeable.swift b/Sources/JavaStdlib/JavaIO/generated/Closeable.swift index 1df52641..18e67747 100644 --- a/Sources/JavaStdlib/JavaIO/generated/Closeable.swift +++ b/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 diff --git a/Sources/JavaStdlib/JavaIO/generated/File.swift b/Sources/JavaStdlib/JavaIO/generated/File.swift index 68b04efb..c94f0761 100644 --- a/Sources/JavaStdlib/JavaIO/generated/File.swift +++ b/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 { @JavaStaticMethod public func createTempFile(_ arg0: String, _ arg1: String, _ arg2: File?) throws -> File! } +#endif diff --git a/Sources/JavaStdlib/JavaIO/generated/FileDescriptor.swift b/Sources/JavaStdlib/JavaIO/generated/FileDescriptor.swift index 4c95b2b3..8ca553ce 100644 --- a/Sources/JavaStdlib/JavaIO/generated/FileDescriptor.swift +++ b/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 { @JavaStaticField(isFinal: true) public var err: FileDescriptor! } +#endif diff --git a/Sources/JavaStdlib/JavaIO/generated/FileReader.swift b/Sources/JavaStdlib/JavaIO/generated/FileReader.swift index b793a3f6..3741a083 100644 --- a/Sources/JavaStdlib/JavaIO/generated/FileReader.swift +++ b/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 diff --git a/Sources/JavaStdlib/JavaIO/generated/Flushable.swift b/Sources/JavaStdlib/JavaIO/generated/Flushable.swift index 95cfc448..5accb284 100644 --- a/Sources/JavaStdlib/JavaIO/generated/Flushable.swift +++ b/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 diff --git a/Sources/JavaStdlib/JavaIO/generated/InputStream.swift b/Sources/JavaStdlib/JavaIO/generated/InputStream.swift index b42a8fd8..505314e6 100644 --- a/Sources/JavaStdlib/JavaIO/generated/InputStream.swift +++ b/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 { @JavaStaticMethod public func nullInputStream() -> InputStream! } +#endif diff --git a/Sources/JavaStdlib/JavaIO/generated/InputStreamReader.swift b/Sources/JavaStdlib/JavaIO/generated/InputStreamReader.swift index 7e55d633..1b452f55 100644 --- a/Sources/JavaStdlib/JavaIO/generated/InputStreamReader.swift +++ b/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 diff --git a/Sources/JavaStdlib/JavaIO/generated/OutputStream.swift b/Sources/JavaStdlib/JavaIO/generated/OutputStream.swift index d499508c..363929da 100644 --- a/Sources/JavaStdlib/JavaIO/generated/OutputStream.swift +++ b/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 { @JavaStaticMethod public func nullOutputStream() -> OutputStream! } +#endif diff --git a/Sources/JavaStdlib/JavaIO/generated/Path.swift b/Sources/JavaStdlib/JavaIO/generated/Path.swift index 235d9cef..b162a414 100644 --- a/Sources/JavaStdlib/JavaIO/generated/Path.swift +++ b/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 { @JavaStaticMethod public func of(_ arg0: String, _ arg1: [String]) -> Path! } +#endif diff --git a/Sources/JavaStdlib/JavaIO/generated/Readable.swift b/Sources/JavaStdlib/JavaIO/generated/Readable.swift index 8961e18a..9633950f 100644 --- a/Sources/JavaStdlib/JavaIO/generated/Readable.swift +++ b/Sources/JavaStdlib/JavaIO/generated/Readable.swift @@ -2,7 +2,9 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.lang.Readable") public struct Readable { } +#endif diff --git a/Sources/JavaStdlib/JavaIO/generated/Reader.swift b/Sources/JavaStdlib/JavaIO/generated/Reader.swift index 5d8f77bf..9c2db209 100644 --- a/Sources/JavaStdlib/JavaIO/generated/Reader.swift +++ b/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 { @JavaStaticMethod public func nullReader() -> Reader! } +#endif diff --git a/Sources/JavaStdlib/JavaIO/generated/StringReader.swift b/Sources/JavaStdlib/JavaIO/generated/StringReader.swift index ae4464ed..e88e2be4 100644 --- a/Sources/JavaStdlib/JavaIO/generated/StringReader.swift +++ b/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 diff --git a/Sources/JavaStdlib/JavaIO/generated/WatchService.swift b/Sources/JavaStdlib/JavaIO/generated/WatchService.swift index e2c570a3..62c334b5 100644 --- a/Sources/JavaStdlib/JavaIO/generated/WatchService.swift +++ b/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 diff --git a/Sources/JavaStdlib/JavaIO/generated/Writer.swift b/Sources/JavaStdlib/JavaIO/generated/Writer.swift index fe20d27d..d887211d 100644 --- a/Sources/JavaStdlib/JavaIO/generated/Writer.swift +++ b/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 { @JavaStaticMethod public func nullWriter() -> Writer! } +#endif diff --git a/Sources/JavaStdlib/JavaLangReflect/Constructor+Utilities.swift b/Sources/JavaStdlib/JavaLangReflect/Constructor+Utilities.swift index 8f57ffa5..5795b455 100644 --- a/Sources/JavaStdlib/JavaLangReflect/Constructor+Utilities.swift +++ b/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 \ No newline at end of file diff --git a/Sources/JavaStdlib/JavaLangReflect/Executable+Utilities.swift b/Sources/JavaStdlib/JavaLangReflect/Executable+Utilities.swift index bf70f114..09aa5362 100644 --- a/Sources/JavaStdlib/JavaLangReflect/Executable+Utilities.swift +++ b/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 diff --git a/Sources/JavaStdlib/JavaLangReflect/Field+Utilities.swift b/Sources/JavaStdlib/JavaLangReflect/Field+Utilities.swift index 0fc1b2be..b2ed7add 100644 --- a/Sources/JavaStdlib/JavaLangReflect/Field+Utilities.swift +++ b/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 diff --git a/Sources/JavaStdlib/JavaLangReflect/JavaClass+Reflection.swift b/Sources/JavaStdlib/JavaLangReflect/JavaClass+Reflection.swift index 29e24be5..ab7f12db 100644 --- a/Sources/JavaStdlib/JavaLangReflect/JavaClass+Reflection.swift +++ b/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 diff --git a/Sources/JavaStdlib/JavaLangReflect/Method+Utilities.swift b/Sources/JavaStdlib/JavaLangReflect/Method+Utilities.swift index 71ee864c..ff2fde2f 100644 --- a/Sources/JavaStdlib/JavaLangReflect/Method+Utilities.swift +++ b/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 diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/AccessibleObject.swift b/Sources/JavaStdlib/JavaLangReflect/generated/AccessibleObject.swift index c6b0f4fc..a18521dd 100644 --- a/Sources/JavaStdlib/JavaLangReflect/generated/AccessibleObject.swift +++ b/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 { @JavaStaticMethod public func setAccessible(_ arg0: [AccessibleObject?], _ arg1: Bool) } +#endif diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/AnnotatedType.swift b/Sources/JavaStdlib/JavaLangReflect/generated/AnnotatedType.swift index 87480ef4..0ab618dd 100644 --- a/Sources/JavaStdlib/JavaLangReflect/generated/AnnotatedType.swift +++ b/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?] } +#endif diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/Annotation.swift b/Sources/JavaStdlib/JavaLangReflect/generated/Annotation.swift index 1449bf32..fa61da5e 100644 --- a/Sources/JavaStdlib/JavaLangReflect/generated/Annotation.swift +++ b/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! } +#endif diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/Constructor.swift b/Sources/JavaStdlib/JavaLangReflect/generated/Constructor.swift index 202cba9b..fd8a1da8 100644 --- a/Sources/JavaStdlib/JavaLangReflect/generated/Constructor.swift +++ b/Sources/JavaStdlib/JavaLangReflect/generated/Constructor.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.reflect.Constructor") open class Constructor: Executable { @JavaMethod @@ -77,3 +78,4 @@ extension JavaClass { @JavaStaticField(isFinal: true) public var DECLARED: Int32 } +#endif diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/Executable.swift b/Sources/JavaStdlib/JavaLangReflect/generated/Executable.swift index 3a6df8ea..d05b9ca2 100644 --- a/Sources/JavaStdlib/JavaLangReflect/generated/Executable.swift +++ b/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 { @JavaStaticField(isFinal: true) public var DECLARED: Int32 } +#endif diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/Field.swift b/Sources/JavaStdlib/JavaLangReflect/generated/Field.swift index ba4f4538..8559ad73 100644 --- a/Sources/JavaStdlib/JavaLangReflect/generated/Field.swift +++ b/Sources/JavaStdlib/JavaLangReflect/generated/Field.swift @@ -3,6 +3,7 @@ import SwiftJava import JavaUtil import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.reflect.Field") open class Field: AccessibleObject { @JavaMethod @@ -114,3 +115,4 @@ extension JavaClass { @JavaStaticField(isFinal: true) public var DECLARED: Int32 } +#endif diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/GenericArrayType.swift b/Sources/JavaStdlib/JavaLangReflect/generated/GenericArrayType.swift index 42375e08..a9664e24 100644 --- a/Sources/JavaStdlib/JavaLangReflect/generated/GenericArrayType.swift +++ b/Sources/JavaStdlib/JavaLangReflect/generated/GenericArrayType.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.lang.reflect.GenericArrayType", extends: Type.self) public struct GenericArrayType { @JavaMethod @@ -10,3 +11,4 @@ public struct GenericArrayType { @JavaMethod public func getTypeName() -> String } +#endif diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/GenericDeclaration.swift b/Sources/JavaStdlib/JavaLangReflect/generated/GenericDeclaration.swift index 839fa7db..8b6174b9 100644 --- a/Sources/JavaStdlib/JavaLangReflect/generated/GenericDeclaration.swift +++ b/Sources/JavaStdlib/JavaLangReflect/generated/GenericDeclaration.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.lang.reflect.GenericDeclaration") public struct GenericDeclaration { @JavaMethod @@ -28,3 +29,4 @@ public struct GenericDeclaration { @JavaMethod public func getDeclaredAnnotations() -> [Annotation?] } +#endif diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/Method.swift b/Sources/JavaStdlib/JavaLangReflect/generated/Method.swift index 94371cd4..a0f606d6 100644 --- a/Sources/JavaStdlib/JavaLangReflect/generated/Method.swift +++ b/Sources/JavaStdlib/JavaLangReflect/generated/Method.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.reflect.Method") open class Method: Executable { @JavaMethod @@ -89,3 +90,4 @@ extension JavaClass { @JavaStaticField(isFinal: true) public var DECLARED: Int32 } +#endif diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/Parameter.swift b/Sources/JavaStdlib/JavaLangReflect/generated/Parameter.swift index 35ea7098..f392b106 100644 --- a/Sources/JavaStdlib/JavaLangReflect/generated/Parameter.swift +++ b/Sources/JavaStdlib/JavaLangReflect/generated/Parameter.swift @@ -3,6 +3,7 @@ import SwiftJava import JavaUtil import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.reflect.Parameter") open class Parameter: JavaObject { @JavaMethod @@ -62,3 +63,4 @@ open class Parameter: JavaObject { @JavaMethod open func isImplicit() -> Bool } +#endif diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/ParameterizedType.swift b/Sources/JavaStdlib/JavaLangReflect/generated/ParameterizedType.swift index 5e29ee05..e5603b63 100644 --- a/Sources/JavaStdlib/JavaLangReflect/generated/ParameterizedType.swift +++ b/Sources/JavaStdlib/JavaLangReflect/generated/ParameterizedType.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.lang.reflect.ParameterizedType", extends: Type.self) public struct ParameterizedType { @JavaMethod @@ -16,3 +17,4 @@ public struct ParameterizedType { @JavaMethod public func getTypeName() -> String } +#endif diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/Type.swift b/Sources/JavaStdlib/JavaLangReflect/generated/Type.swift index ff52b41a..2a62fcfa 100644 --- a/Sources/JavaStdlib/JavaLangReflect/generated/Type.swift +++ b/Sources/JavaStdlib/JavaLangReflect/generated/Type.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.lang.reflect.Type") public struct Type { @JavaMethod public func getTypeName() -> String } +#endif diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/TypeVariable.swift b/Sources/JavaStdlib/JavaLangReflect/generated/TypeVariable.swift index 736fcfde..a8e35f04 100644 --- a/Sources/JavaStdlib/JavaLangReflect/generated/TypeVariable.swift +++ b/Sources/JavaStdlib/JavaLangReflect/generated/TypeVariable.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.lang.reflect.TypeVariable", extends: Type.self) public struct TypeVariable { @JavaMethod @@ -40,3 +41,4 @@ public struct TypeVariable { @JavaMethod public func getDeclaredAnnotations() -> [Annotation?] } +#endif diff --git a/Sources/JavaStdlib/JavaLangReflect/generated/WildcardType.swift b/Sources/JavaStdlib/JavaLangReflect/generated/WildcardType.swift index a09b1b3b..5034521a 100644 --- a/Sources/JavaStdlib/JavaLangReflect/generated/WildcardType.swift +++ b/Sources/JavaStdlib/JavaLangReflect/generated/WildcardType.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.lang.reflect.WildcardType", extends: Type.self) public struct WildcardType { @JavaMethod @@ -13,3 +14,4 @@ public struct WildcardType { @JavaMethod public func getTypeName() -> String } +#endif diff --git a/Sources/JavaStdlib/JavaNet/generated/URI.swift b/Sources/JavaStdlib/JavaNet/generated/URI.swift index d6242406..f8542222 100644 --- a/Sources/JavaStdlib/JavaNet/generated/URI.swift +++ b/Sources/JavaStdlib/JavaNet/generated/URI.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.net.URI") open class URI: JavaObject { @JavaMethod @@ -110,3 +111,4 @@ extension JavaClass { @JavaStaticMethod public func create(_ arg0: String) -> URI! } +#endif diff --git a/Sources/JavaStdlib/JavaNet/generated/URL.swift b/Sources/JavaStdlib/JavaNet/generated/URL.swift index 95ac8fb4..5671c771 100644 --- a/Sources/JavaStdlib/JavaNet/generated/URL.swift +++ b/Sources/JavaStdlib/JavaNet/generated/URL.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.net.URL") open class URL: JavaObject { @JavaMethod @@ -70,3 +71,4 @@ open class URL: JavaObject { @JavaMethod open func toURI() throws -> URI! } +#endif diff --git a/Sources/JavaStdlib/JavaNet/generated/URLClassLoader.swift b/Sources/JavaStdlib/JavaNet/generated/URLClassLoader.swift index d16e2eac..add8b4eb 100644 --- a/Sources/JavaStdlib/JavaNet/generated/URLClassLoader.swift +++ b/Sources/JavaStdlib/JavaNet/generated/URLClassLoader.swift @@ -3,6 +3,7 @@ import SwiftJava import JavaUtil import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.net.URLClassLoader") open class URLClassLoader: JavaObject { @JavaMethod @@ -33,3 +34,4 @@ extension JavaClass { @JavaStaticMethod public func newInstance(_ arg0: [URL?]) -> URLClassLoader! } +#endif diff --git a/Sources/JavaStdlib/JavaNet/generated/URLConnection.swift b/Sources/JavaStdlib/JavaNet/generated/URLConnection.swift index 332e7425..b84a1ff3 100644 --- a/Sources/JavaStdlib/JavaNet/generated/URLConnection.swift +++ b/Sources/JavaStdlib/JavaNet/generated/URLConnection.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.net.URLConnection") public struct URLConnection { @JavaMethod @@ -161,3 +162,4 @@ extension JavaClass { @JavaMethod public func guessContentTypeFromName(_ arg0: String) -> String } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/JavaEnumeration+Sequence.swift b/Sources/JavaStdlib/JavaUtil/JavaEnumeration+Sequence.swift index 742bfc91..a6501d57 100644 --- a/Sources/JavaStdlib/JavaUtil/JavaEnumeration+Sequence.swift +++ b/Sources/JavaStdlib/JavaUtil/JavaEnumeration+Sequence.swift @@ -12,6 +12,7 @@ // //===----------------------------------------------------------------------===// +#if SwiftJavaMacrosSupport extension Enumeration: Sequence, IteratorProtocol { public typealias Element = E @@ -21,3 +22,4 @@ extension Enumeration: Sequence, IteratorProtocol { return nextElement()?.as(Element.self)! } } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/JavaIterator+Iterator.swift b/Sources/JavaStdlib/JavaUtil/JavaIterator+Iterator.swift index ad427527..e6e9b6e3 100644 --- a/Sources/JavaStdlib/JavaUtil/JavaIterator+Iterator.swift +++ b/Sources/JavaStdlib/JavaUtil/JavaIterator+Iterator.swift @@ -13,6 +13,7 @@ //===----------------------------------------------------------------------===// import SwiftJava +#if SwiftJavaMacrosSupport extension JavaIterator: IteratorProtocol { public typealias Element = E @@ -25,3 +26,4 @@ extension JavaIterator: IteratorProtocol { return nil } } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/List+Sequence.swift b/Sources/JavaStdlib/JavaUtil/List+Sequence.swift index b3629569..b32f2ded 100644 --- a/Sources/JavaStdlib/JavaUtil/List+Sequence.swift +++ b/Sources/JavaStdlib/JavaUtil/List+Sequence.swift @@ -12,6 +12,7 @@ // //===----------------------------------------------------------------------===// +#if SwiftJavaMacrosSupport extension List: Sequence { public typealias Element = E public typealias Iterator = JavaIterator @@ -20,4 +21,5 @@ extension List: Sequence { return self.iterator()!.as(JavaIterator.self)! } } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/ArrayDeque.swift b/Sources/JavaStdlib/JavaUtil/generated/ArrayDeque.swift index b8a1fb18..5e2a7206 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/ArrayDeque.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/ArrayDeque.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.ArrayDeque") open class ArrayDeque: JavaObject { @JavaMethod @@ -118,3 +119,4 @@ open class ArrayDeque: JavaObject { @JavaMethod open func descendingIterator() -> JavaIterator! } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/ArrayList.swift b/Sources/JavaStdlib/JavaUtil/generated/ArrayList.swift index 9ead8f4c..8cc264a2 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/ArrayList.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/ArrayList.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.ArrayList", implements: List.self, RandomAccess.self) open class ArrayList: JavaObject { @JavaMethod @@ -115,3 +116,4 @@ open class ArrayList: JavaObject { @JavaMethod open func listIterator() -> ListIterator! } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/BitSet.swift b/Sources/JavaStdlib/JavaUtil/generated/BitSet.swift index 7356b4b8..7d94a2da 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/BitSet.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/BitSet.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.BitSet") open class BitSet: JavaObject { @JavaMethod @@ -107,3 +108,4 @@ extension JavaClass { @JavaStaticMethod public func valueOf(_ arg0: [Int8]) -> BitSet! } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/Enumeration.swift b/Sources/JavaStdlib/JavaUtil/generated/Enumeration.swift index 9c039b16..22591ebf 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/Enumeration.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/Enumeration.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.Enumeration") public struct Enumeration { @JavaMethod @@ -13,3 +14,4 @@ public struct Enumeration { @JavaMethod public func nextElement() -> JavaObject! } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/HashMap.swift b/Sources/JavaStdlib/JavaUtil/generated/HashMap.swift index a217d48f..9ca85d7c 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/HashMap.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/HashMap.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.HashMap") open class HashMap: JavaObject { @JavaMethod @@ -65,3 +66,4 @@ extension JavaClass { @JavaStaticMethod public func newHashMap(_ arg0: Int32) -> HashMap! where ObjectType == HashMap } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/HashSet.swift b/Sources/JavaStdlib/JavaUtil/generated/HashSet.swift index 3b089c86..99036874 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/HashSet.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/HashSet.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.HashSet", implements: JavaSet.self) open class HashSet: JavaObject { @JavaMethod @@ -50,3 +51,4 @@ extension JavaClass { @JavaStaticMethod public func newHashSet(_ arg0: Int32) -> HashSet! where ObjectType == HashSet } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/JavaCollection.swift b/Sources/JavaStdlib/JavaUtil/generated/JavaCollection.swift index 3a8db21b..2decfba1 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/JavaCollection.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/JavaCollection.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.Collection") public struct JavaCollection { @JavaMethod @@ -49,3 +50,4 @@ public struct JavaCollection { @JavaMethod public func containsAll(_ arg0: JavaCollection?) -> Bool } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/JavaDictionary.swift b/Sources/JavaStdlib/JavaUtil/generated/JavaDictionary.swift index 0a6508f5..b699e1fa 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/JavaDictionary.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/JavaDictionary.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.Dictionary") open class JavaDictionary: JavaObject { @JavaMethod @@ -28,3 +29,4 @@ open class JavaDictionary: JavaObject { @JavaMethod open func keys() -> Enumeration! } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/JavaIterator.swift b/Sources/JavaStdlib/JavaUtil/generated/JavaIterator.swift index 06f09d7f..210817a7 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/JavaIterator.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/JavaIterator.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.Iterator") public struct JavaIterator { @JavaMethod @@ -13,3 +14,4 @@ public struct JavaIterator { @JavaMethod public func next() -> JavaObject! } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/JavaSet.swift b/Sources/JavaStdlib/JavaUtil/generated/JavaSet.swift index 12ff0056..16d342a0 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/JavaSet.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/JavaSet.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.Set", extends: JavaCollection.self) public struct JavaSet { @JavaMethod @@ -89,3 +90,4 @@ extension JavaClass { @JavaStaticMethod public func of(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaSet! where ObjectType == JavaSet } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/LinkedList.swift b/Sources/JavaStdlib/JavaUtil/generated/LinkedList.swift index 2464980f..49e2b155 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/LinkedList.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/LinkedList.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.LinkedList") public struct LinkedList { @JavaMethod @@ -175,3 +176,4 @@ public struct LinkedList { @JavaMethod public func wait() throws } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/List.swift b/Sources/JavaStdlib/JavaUtil/generated/List.swift index 2ebc1942..1d085b78 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/List.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/List.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.List") public struct List { @JavaMethod @@ -140,3 +141,4 @@ extension JavaClass { @JavaStaticMethod public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?, _ arg7: JavaObject?, _ arg8: JavaObject?, _ arg9: JavaObject?) -> List! where ObjectType == List } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/ListIterator.swift b/Sources/JavaStdlib/JavaUtil/generated/ListIterator.swift index 121330b1..a06e16cd 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/ListIterator.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/ListIterator.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.ListIterator", extends: JavaIterator.self) public struct ListIterator { @JavaMethod @@ -31,3 +32,4 @@ public struct ListIterator { @JavaMethod public func previous() -> JavaObject! } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/PriorityQueue.swift b/Sources/JavaStdlib/JavaUtil/generated/PriorityQueue.swift index d9d9a85a..33b9fe96 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/PriorityQueue.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/PriorityQueue.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.PriorityQueue") open class PriorityQueue: JavaObject { @JavaMethod @@ -55,3 +56,4 @@ open class PriorityQueue: JavaObject { @JavaMethod open func offer(_ arg0: JavaObject?) -> Bool } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/Queue.swift b/Sources/JavaStdlib/JavaUtil/generated/Queue.swift index b007e90a..aec5b115 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/Queue.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/Queue.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.Queue", extends: JavaCollection.self) public struct Queue { @JavaMethod @@ -64,3 +65,4 @@ public struct Queue { @JavaMethod public func containsAll(_ arg0: JavaCollection?) -> Bool } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/RandomAccess.swift b/Sources/JavaStdlib/JavaUtil/generated/RandomAccess.swift index 91b3fa31..83746975 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/RandomAccess.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/RandomAccess.swift @@ -2,7 +2,9 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.RandomAccess") public struct RandomAccess { } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/Stack.swift b/Sources/JavaStdlib/JavaUtil/generated/Stack.swift index be4330eb..e3168deb 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/Stack.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/Stack.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.Stack") open class Stack: JavaObject { @JavaMethod @@ -22,3 +23,4 @@ open class Stack: JavaObject { @JavaMethod open func pop() -> JavaObject! } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/TreeMap.swift b/Sources/JavaStdlib/JavaUtil/generated/TreeMap.swift index c6dd3bb0..0ae1b529 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/TreeMap.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/TreeMap.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.TreeMap") open class TreeMap: JavaObject { @JavaMethod @@ -120,3 +121,4 @@ extension TreeMap { open func setValue(_ arg0: JavaObject?) -> JavaObject! } } +#endif diff --git a/Sources/JavaStdlib/JavaUtil/generated/TreeSet.swift b/Sources/JavaStdlib/JavaUtil/generated/TreeSet.swift index 3ec9b1ea..9121b656 100644 --- a/Sources/JavaStdlib/JavaUtil/generated/TreeSet.swift +++ b/Sources/JavaStdlib/JavaUtil/generated/TreeSet.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.TreeSet") open class TreeSet: JavaObject { @JavaMethod @@ -70,3 +71,4 @@ open class TreeSet: JavaObject { @JavaMethod open func higher(_ arg0: JavaObject?) -> JavaObject! } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBiConsumer.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBiConsumer.swift index a01a0933..06ed5622 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBiConsumer.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBiConsumer.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.BiConsumer") public struct JavaBiConsumer { @JavaMethod @@ -12,3 +13,4 @@ public struct JavaBiConsumer { JavaObject, JavaObject >? } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBiFunction.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBiFunction.swift index ad54c58b..5648a093 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBiFunction.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBiFunction.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.BiFunction") public struct JavaBiFunction { @JavaMethod @@ -12,3 +13,4 @@ public struct JavaBiFunction? } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBiPredicate.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBiPredicate.swift index ee8aa0f5..0707b1fb 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBiPredicate.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBiPredicate.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.BiPredicate") public struct JavaBiPredicate { @JavaMethod @@ -20,3 +21,4 @@ public struct JavaBiPredicate { @JavaMethod public func negate() -> JavaBiPredicate? } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBinaryOperator.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBinaryOperator.swift index 1c7f5456..aafd86fe 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBinaryOperator.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBinaryOperator.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface( "java.util.function.BinaryOperator", extends: JavaBiFunction.self) @@ -14,3 +15,4 @@ public struct JavaBinaryOperator { JavaObject, JavaObject, JavaObject >? } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBooleanSupplier.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBooleanSupplier.swift index e6e4a3ce..8924d522 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBooleanSupplier.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaBooleanSupplier.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.BooleanSupplier") public struct JavaBooleanSupplier { @JavaMethod public func getAsBoolean() -> Bool } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaConsumer.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaConsumer.swift index 7da9bea8..10540124 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaConsumer.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaConsumer.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.Consumer") public struct JavaConsumer { @JavaMethod @@ -10,3 +11,4 @@ public struct JavaConsumer { @JavaMethod public func andThen(_ arg0: JavaConsumer?) -> JavaConsumer? } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleBinaryOperator.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleBinaryOperator.swift index f6c1c671..8dc21e77 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleBinaryOperator.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleBinaryOperator.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.DoubleBinaryOperator") public struct JavaDoubleBinaryOperator { @JavaMethod public func applyAsDouble(_ arg0: Double, _ arg1: Double) -> Double } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleConsumer.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleConsumer.swift index baf53c4a..f11bcff4 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleConsumer.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleConsumer.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.DoubleConsumer") public struct JavaDoubleConsumer { @JavaMethod @@ -10,3 +11,4 @@ public struct JavaDoubleConsumer { @JavaMethod public func andThen(_ arg0: JavaDoubleConsumer?) -> JavaDoubleConsumer? } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleFunction.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleFunction.swift index 6f5d6752..e3fcb365 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleFunction.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleFunction.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.DoubleFunction") public struct JavaDoubleFunction { @JavaMethod public func apply(_ arg0: Double) -> JavaObject? } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoublePredicate.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoublePredicate.swift index c594518d..17d6d09c 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoublePredicate.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoublePredicate.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.DoublePredicate") public struct JavaDoublePredicate { @JavaMethod @@ -16,3 +17,4 @@ public struct JavaDoublePredicate { @JavaMethod public func negate() -> JavaDoublePredicate? } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleSupplier.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleSupplier.swift index 839ae7e7..c7eef946 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleSupplier.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleSupplier.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.DoubleSupplier") public struct JavaDoubleSupplier { @JavaMethod public func getAsDouble() -> Double } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleToIntFunction.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleToIntFunction.swift index 438249eb..5cf42604 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleToIntFunction.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleToIntFunction.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.DoubleToIntFunction") public struct JavaDoubleToIntFunction { @JavaMethod public func applyAsInt(_ arg0: Double) -> Int32 } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleToLongFunction.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleToLongFunction.swift index 76b916db..140d18e6 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleToLongFunction.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleToLongFunction.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.DoubleToLongFunction") public struct JavaDoubleToLongFunction { @JavaMethod public func applyAsLong(_ arg0: Double) -> Int64 } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleUnaryOperator.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleUnaryOperator.swift index cf1ff7e5..29bdf6de 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleUnaryOperator.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaDoubleUnaryOperator.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.DoubleUnaryOperator") public struct JavaDoubleUnaryOperator { @JavaMethod @@ -17,3 +18,4 @@ extension JavaClass { @JavaStaticMethod public func identity() -> JavaDoubleUnaryOperator? } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaFunction.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaFunction.swift index 7a8165d8..48050dd4 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaFunction.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaFunction.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.Function") public struct JavaFunction { @JavaMethod @@ -23,3 +24,4 @@ extension JavaClass { JavaObject, JavaObject >? where ObjectType == JavaFunction } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntBinaryOperator.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntBinaryOperator.swift index 3df580c7..9b98ac26 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntBinaryOperator.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntBinaryOperator.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.IntBinaryOperator") public struct JavaIntBinaryOperator { @JavaMethod public func applyAsInt(_ arg0: Int32, _ arg1: Int32) -> Int32 } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntConsumer.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntConsumer.swift index a8ac7c0b..123bb1df 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntConsumer.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntConsumer.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.IntConsumer") public struct JavaIntConsumer { @JavaMethod @@ -10,3 +11,4 @@ public struct JavaIntConsumer { @JavaMethod public func andThen(_ arg0: JavaIntConsumer?) -> JavaIntConsumer? } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntFunction.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntFunction.swift index 6ebb7292..192324c7 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntFunction.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntFunction.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.IntFunction") public struct JavaIntFunction { @JavaMethod public func apply(_ arg0: Int32) -> JavaObject? } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntPredicate.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntPredicate.swift index 66c5e133..a50ea9c9 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntPredicate.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntPredicate.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.IntPredicate") public struct JavaIntPredicate { @JavaMethod @@ -16,3 +17,4 @@ public struct JavaIntPredicate { @JavaMethod public func negate() -> JavaIntPredicate? } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntSupplier.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntSupplier.swift index 0976fd53..6bb03784 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntSupplier.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntSupplier.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.IntSupplier") public struct JavaIntSupplier { @JavaMethod public func getAsInt() -> Int32 } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntToDoubleFunction.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntToDoubleFunction.swift index 9891e815..c2469cc7 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntToDoubleFunction.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntToDoubleFunction.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.IntToDoubleFunction") public struct JavaIntToDoubleFunction { @JavaMethod public func applyAsDouble(_ arg0: Int32) -> Double } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntToLongFunction.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntToLongFunction.swift index 17a7b7fa..a3a4836c 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntToLongFunction.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntToLongFunction.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.IntToLongFunction") public struct JavaIntToLongFunction { @JavaMethod public func applyAsLong(_ arg0: Int32) -> Int64 } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntUnaryOperator.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntUnaryOperator.swift index 89528a2b..ee71cf82 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntUnaryOperator.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaIntUnaryOperator.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.IntUnaryOperator") public struct JavaIntUnaryOperator { @JavaMethod @@ -17,3 +18,4 @@ extension JavaClass { @JavaStaticMethod public func identity() -> JavaIntUnaryOperator? } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongBinaryOperator.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongBinaryOperator.swift index 1cd53b93..d97ba514 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongBinaryOperator.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongBinaryOperator.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.LongBinaryOperator") public struct JavaLongBinaryOperator { @JavaMethod public func applyAsLong(_ arg0: Int64, _ arg1: Int64) -> Int64 } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongConsumer.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongConsumer.swift index 4c84754a..9a08cbbd 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongConsumer.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongConsumer.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.LongConsumer") public struct JavaLongConsumer { @JavaMethod @@ -10,3 +11,4 @@ public struct JavaLongConsumer { @JavaMethod public func andThen(_ arg0: JavaLongConsumer?) -> JavaLongConsumer? } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongFunction.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongFunction.swift index 9ce4cef1..7a97594b 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongFunction.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongFunction.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.LongFunction") public struct JavaLongFunction { @JavaMethod public func apply(_ arg0: Int64) -> JavaObject? } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongPredicate.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongPredicate.swift index 8f8f91fc..3b82c2d0 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongPredicate.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongPredicate.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.LongPredicate") public struct JavaLongPredicate { @JavaMethod @@ -16,3 +17,4 @@ public struct JavaLongPredicate { @JavaMethod public func negate() -> JavaLongPredicate? } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongSupplier.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongSupplier.swift index e0a203a1..bd11247c 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongSupplier.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongSupplier.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.LongSupplier") public struct JavaLongSupplier { @JavaMethod public func getAsLong() -> Int64 } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongToDoubleFunction.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongToDoubleFunction.swift index 7167d8fc..0f40e759 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongToDoubleFunction.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongToDoubleFunction.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.LongToDoubleFunction") public struct JavaLongToDoubleFunction { @JavaMethod public func applyAsDouble(_ arg0: Int64) -> Double } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongToIntFunction.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongToIntFunction.swift index 00671304..3dd6d561 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongToIntFunction.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongToIntFunction.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.LongToIntFunction") public struct JavaLongToIntFunction { @JavaMethod public func applyAsInt(_ arg0: Int64) -> Int32 } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongUnaryOperator.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongUnaryOperator.swift index 8cf8944b..6bb41301 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongUnaryOperator.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaLongUnaryOperator.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.LongUnaryOperator") public struct JavaLongUnaryOperator { @JavaMethod @@ -17,3 +18,4 @@ extension JavaClass { @JavaStaticMethod public func identity() -> JavaLongUnaryOperator? } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaObjDoubleConsumer.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaObjDoubleConsumer.swift index aa7d5a48..f0886869 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaObjDoubleConsumer.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaObjDoubleConsumer.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.ObjDoubleConsumer") public struct JavaObjDoubleConsumer { @JavaMethod public func accept(_ arg0: JavaObject?, _ arg1: Double) } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaObjIntConsumer.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaObjIntConsumer.swift index c53c3631..c31848a4 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaObjIntConsumer.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaObjIntConsumer.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.ObjIntConsumer") public struct JavaObjIntConsumer { @JavaMethod public func accept(_ arg0: JavaObject?, _ arg1: Int32) } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaObjLongConsumer.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaObjLongConsumer.swift index ff4f7798..1e4276b5 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaObjLongConsumer.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaObjLongConsumer.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.ObjLongConsumer") public struct JavaObjLongConsumer { @JavaMethod public func accept(_ arg0: JavaObject?, _ arg1: Int64) } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaPredicate.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaPredicate.swift index b888e178..da59fd30 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaPredicate.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaPredicate.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.Predicate") public struct JavaPredicate { @JavaMethod @@ -26,3 +27,4 @@ extension JavaClass { public func isEqual(_ arg0: JavaObject?) -> JavaPredicate? where ObjectType == JavaPredicate } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaSupplier.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaSupplier.swift index 4d4c73cd..8f4ed5a2 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaSupplier.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaSupplier.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.Supplier") public struct JavaSupplier { @JavaMethod public func get() -> JavaObject? } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToDoubleBiFunction.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToDoubleBiFunction.swift index 35f77b78..e2be49cf 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToDoubleBiFunction.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToDoubleBiFunction.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.ToDoubleBiFunction") public struct JavaToDoubleBiFunction { @JavaMethod public func applyAsDouble(_ arg0: JavaObject?, _ arg1: JavaObject?) -> Double } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToDoubleFunction.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToDoubleFunction.swift index 56ee180d..0e9f5b75 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToDoubleFunction.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToDoubleFunction.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.ToDoubleFunction") public struct JavaToDoubleFunction { @JavaMethod public func applyAsDouble(_ arg0: JavaObject?) -> Double } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToIntBiFunction.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToIntBiFunction.swift index dc17fa2b..3f10e85e 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToIntBiFunction.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToIntBiFunction.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.ToIntBiFunction") public struct JavaToIntBiFunction { @JavaMethod public func applyAsInt(_ arg0: JavaObject?, _ arg1: JavaObject?) -> Int32 } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToIntFunction.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToIntFunction.swift index 3663f499..2da5b5f4 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToIntFunction.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToIntFunction.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.ToIntFunction") public struct JavaToIntFunction { @JavaMethod public func applyAsInt(_ arg0: JavaObject?) -> Int32 } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToLongBiFunction.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToLongBiFunction.swift index 1d5fc739..d762e1f7 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToLongBiFunction.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToLongBiFunction.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.ToLongBiFunction") public struct JavaToLongBiFunction { @JavaMethod public func applyAsLong(_ arg0: JavaObject?, _ arg1: JavaObject?) -> Int64 } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToLongFunction.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToLongFunction.swift index 66805be7..fedcd77c 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToLongFunction.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaToLongFunction.swift @@ -2,8 +2,10 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.util.function.ToLongFunction") public struct JavaToLongFunction { @JavaMethod public func applyAsLong(_ arg0: JavaObject?) -> Int64 } +#endif diff --git a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaUnaryOperator.swift b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaUnaryOperator.swift index 11dc00ee..5017cc5a 100644 --- a/Sources/JavaStdlib/JavaUtilFunction/generated/JavaUnaryOperator.swift +++ b/Sources/JavaStdlib/JavaUtilFunction/generated/JavaUnaryOperator.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface( "java.util.function.UnaryOperator", extends: JavaFunction.self) public struct JavaUnaryOperator { @@ -23,3 +24,4 @@ extension JavaClass { public func identity() -> JavaUnaryOperator? where ObjectType == JavaUnaryOperator } +#endif diff --git a/Sources/JavaStdlib/JavaUtilJar/generated/Attributes.swift b/Sources/JavaStdlib/JavaUtilJar/generated/Attributes.swift index 4897ebe3..fc249510 100644 --- a/Sources/JavaStdlib/JavaUtilJar/generated/Attributes.swift +++ b/Sources/JavaStdlib/JavaUtilJar/generated/Attributes.swift @@ -3,6 +3,7 @@ import SwiftJava import JavaUtil import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.jar.Attributes") open class Attributes: JavaObject { @JavaMethod @@ -133,3 +134,4 @@ extension JavaClass { @JavaStaticField(isFinal: true) public var MULTI_RELEASE: Attributes.Name! } +#endif diff --git a/Sources/JavaStdlib/JavaUtilJar/generated/JarEntry.swift b/Sources/JavaStdlib/JavaUtilJar/generated/JarEntry.swift index adfb6d17..61d09d3e 100644 --- a/Sources/JavaStdlib/JavaUtilJar/generated/JarEntry.swift +++ b/Sources/JavaStdlib/JavaUtilJar/generated/JarEntry.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.jar.JarEntry") open class JarEntry: ZipEntry { @JavaMethod @@ -146,3 +147,4 @@ extension JavaClass { @JavaStaticField(isFinal: true) public var ENDCOM: Int32 } +#endif diff --git a/Sources/JavaStdlib/JavaUtilJar/generated/JarFile.swift b/Sources/JavaStdlib/JavaUtilJar/generated/JarFile.swift index e630afd2..ac106fef 100644 --- a/Sources/JavaStdlib/JavaUtilJar/generated/JarFile.swift +++ b/Sources/JavaStdlib/JavaUtilJar/generated/JarFile.swift @@ -3,6 +3,7 @@ import SwiftJava import JavaUtil import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.jar.JarFile") open class JarFile: JavaObject { @JavaMethod @@ -156,3 +157,4 @@ extension JavaClass { @JavaStaticField(isFinal: true) public var ENDCOM: Int32 } +#endif diff --git a/Sources/JavaStdlib/JavaUtilJar/generated/JarInputStream.swift b/Sources/JavaStdlib/JavaUtilJar/generated/JarInputStream.swift index 60f007fe..c045279f 100644 --- a/Sources/JavaStdlib/JavaUtilJar/generated/JarInputStream.swift +++ b/Sources/JavaStdlib/JavaUtilJar/generated/JarInputStream.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.jar.JarInputStream") open class JarInputStream: JavaObject { @JavaMethod @@ -140,3 +141,4 @@ extension JavaClass { @JavaStaticField(isFinal: true) public var ENDCOM: Int32 } +#endif diff --git a/Sources/JavaStdlib/JavaUtilJar/generated/JarOutputStream.swift b/Sources/JavaStdlib/JavaUtilJar/generated/JarOutputStream.swift index bd27471f..7abb6231 100644 --- a/Sources/JavaStdlib/JavaUtilJar/generated/JarOutputStream.swift +++ b/Sources/JavaStdlib/JavaUtilJar/generated/JarOutputStream.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.jar.JarOutputStream") open class JarOutputStream: JavaObject { @JavaMethod @@ -134,3 +135,4 @@ extension JavaClass { @JavaStaticField(isFinal: true) public var ENDCOM: Int32 } +#endif diff --git a/Sources/JavaStdlib/JavaUtilJar/generated/Manifest.swift b/Sources/JavaStdlib/JavaUtilJar/generated/Manifest.swift index 2033f41a..b659799f 100644 --- a/Sources/JavaStdlib/JavaUtilJar/generated/Manifest.swift +++ b/Sources/JavaStdlib/JavaUtilJar/generated/Manifest.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.jar.Manifest") open class Manifest: JavaObject { @JavaMethod @@ -28,3 +29,4 @@ open class Manifest: JavaObject { @JavaMethod open func getAttributes(_ arg0: String) -> Attributes! } +#endif diff --git a/Sources/JavaStdlib/JavaUtilJar/generated/ZipEntry.swift b/Sources/JavaStdlib/JavaUtilJar/generated/ZipEntry.swift index 3066d54c..be60c332 100644 --- a/Sources/JavaStdlib/JavaUtilJar/generated/ZipEntry.swift +++ b/Sources/JavaStdlib/JavaUtilJar/generated/ZipEntry.swift @@ -2,6 +2,7 @@ import SwiftJava import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.zip.ZipEntry") open class ZipEntry: JavaObject { @JavaMethod @@ -194,3 +195,4 @@ extension JavaClass { @JavaStaticField(isFinal: true) public var ENDCOM: Int32 } +#endif diff --git a/Sources/SwiftJava/JavaRuntime+Reexport.swift b/Sources/SwiftJava/CSwiftJavaJNI+Exported.swift similarity index 100% rename from Sources/SwiftJava/JavaRuntime+Reexport.swift rename to Sources/SwiftJava/CSwiftJavaJNI+Exported.swift diff --git a/Sources/SwiftJava/Exceptions/Exception+Error.swift b/Sources/SwiftJava/Exceptions/Exception+Error.swift index e0075179..626a9c9a 100644 --- a/Sources/SwiftJava/Exceptions/Exception+Error.swift +++ b/Sources/SwiftJava/Exceptions/Exception+Error.swift @@ -12,6 +12,7 @@ // //===----------------------------------------------------------------------===// +#if SwiftJavaMacrosSupport extension JavaClass { /// Determine whether this instance is a checked exception (which must be /// handled) vs. an unchecked exception (which is not handled). @@ -19,3 +20,4 @@ extension JavaClass { return !self.is(RuntimeException.self) } } +#endif \ No newline at end of file diff --git a/Sources/SwiftJava/Exceptions/ExceptionHandling.swift b/Sources/SwiftJava/Exceptions/ExceptionHandling.swift index d5ca1107..0918d156 100644 --- a/Sources/SwiftJava/Exceptions/ExceptionHandling.swift +++ b/Sources/SwiftJava/Exceptions/ExceptionHandling.swift @@ -12,6 +12,7 @@ // //===----------------------------------------------------------------------===// +#if SwiftJavaMacrosSupport extension JNIEnvironment { /// Execute a JNI call and check for an exception at the end. Translate /// any Java exception into an error. @@ -44,3 +45,4 @@ extension JNIEnvironment { } } } +#endif \ No newline at end of file diff --git a/Sources/SwiftJava/Exceptions/Throwable+Error.swift b/Sources/SwiftJava/Exceptions/Throwable+Error.swift index fbf8393d..c0490f5b 100644 --- a/Sources/SwiftJava/Exceptions/Throwable+Error.swift +++ b/Sources/SwiftJava/Exceptions/Throwable+Error.swift @@ -12,6 +12,7 @@ // //===----------------------------------------------------------------------===// +#if SwiftJavaMacrosSupport // Translate all Java Throwable instances in a Swift error. extension Throwable: Error, CustomStringConvertible { public var description: String { @@ -26,3 +27,4 @@ extension JavaClass { return !self.is(RuntimeException.self) && !self.is(JavaError.self) } } +#endif diff --git a/Sources/SwiftJava/Macros.swift b/Sources/SwiftJava/Macros.swift index 8e1bb86c..1821b807 100644 --- a/Sources/SwiftJava/Macros.swift +++ b/Sources/SwiftJava/Macros.swift @@ -12,6 +12,7 @@ // //===----------------------------------------------------------------------===// +#if SwiftJavaMacrosSupport /// Attached macro that declares that a particular `struct` type is a wrapper around a Java class. /// /// Use this macro to describe a type that was implemented as a class in Java. The @@ -162,3 +163,5 @@ public macro JavaStaticMethod() = #externalMacro(module: "SwiftJavaMacros", type /// ``` @attached(peer) public macro JavaImplementation(_ fullClassName: String) = #externalMacro(module: "SwiftJavaMacros", type: "JavaImplementationMacro") + +#endif \ No newline at end of file diff --git a/Sources/SwiftJava/Optional+JavaObject.swift b/Sources/SwiftJava/Optional+JavaObject.swift index 46fd9970..498ef536 100644 --- a/Sources/SwiftJava/Optional+JavaObject.swift +++ b/Sources/SwiftJava/Optional+JavaObject.swift @@ -15,6 +15,7 @@ import CSwiftJavaJNI import JavaTypes +#if SwiftJavaMacrosSupport extension Optional: JavaValue where Wrapped: AnyJavaObject { public typealias JNIType = jobject? @@ -101,3 +102,4 @@ extension Optional: JavaValue where Wrapped: AnyJavaObject { nil } } +#endif \ No newline at end of file diff --git a/Sources/SwiftJava/Optional+JavaOptional.swift b/Sources/SwiftJava/Optional+JavaOptional.swift index c9becd58..ce189a80 100644 --- a/Sources/SwiftJava/Optional+JavaOptional.swift +++ b/Sources/SwiftJava/Optional+JavaOptional.swift @@ -12,6 +12,7 @@ // //===----------------------------------------------------------------------===// +#if SwiftJavaMacrosSupport public extension Optional where Wrapped: AnyJavaObject { func toJavaOptional() -> JavaOptional { return try! JavaClass>().ofNullable(self?.as(JavaObject.self)).as(JavaOptional.self)! @@ -79,3 +80,4 @@ public extension Optional where Wrapped == Int64 { } } } +#endif \ No newline at end of file diff --git a/Sources/SwiftJava/generated/Appendable.swift b/Sources/SwiftJava/generated/Appendable.swift index b0c67ec5..f5918c0c 100644 --- a/Sources/SwiftJava/generated/Appendable.swift +++ b/Sources/SwiftJava/generated/Appendable.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.lang.Appendable") public struct Appendable { @JavaMethod @@ -12,3 +13,4 @@ public struct Appendable { @JavaMethod public func append(_ arg0: UInt16) throws -> Appendable! } +#endif \ No newline at end of file diff --git a/Sources/SwiftJava/generated/CharSequence.swift b/Sources/SwiftJava/generated/CharSequence.swift index eadc509e..d9452db0 100644 --- a/Sources/SwiftJava/generated/CharSequence.swift +++ b/Sources/SwiftJava/generated/CharSequence.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaInterface("java.lang.CharSequence") public struct CharSequence { @JavaMethod @@ -22,3 +23,4 @@ extension JavaClass { @JavaStaticMethod public func compare(_ arg0: CharSequence?, _ arg1: CharSequence?) -> Int32 } +#endif \ No newline at end of file diff --git a/Sources/SwiftJava/generated/Exception.swift b/Sources/SwiftJava/generated/Exception.swift index e87684cb..0525b328 100644 --- a/Sources/SwiftJava/generated/Exception.swift +++ b/Sources/SwiftJava/generated/Exception.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.Exception") open class Exception: Throwable { @JavaMethod @@ -15,3 +16,4 @@ open class Exception: Throwable { @JavaMethod @_nonoverride public convenience init(environment: JNIEnvironment? = nil) } +#endif diff --git a/Sources/SwiftJava/generated/JavaArray.swift b/Sources/SwiftJava/generated/JavaArray.swift index ae182208..f863cd59 100644 --- a/Sources/SwiftJava/generated/JavaArray.swift +++ b/Sources/SwiftJava/generated/JavaArray.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.reflect.Array") open class JavaArray: JavaObject { @@ -69,3 +70,4 @@ extension JavaClass { @JavaStaticMethod public func setDouble(_ arg0: JavaObject?, _ arg1: Int32, _ arg2: Double) throws } +#endif diff --git a/Sources/SwiftJava/generated/JavaBoolean.swift b/Sources/SwiftJava/generated/JavaBoolean.swift index bdf21df9..4c163c71 100644 --- a/Sources/SwiftJava/generated/JavaBoolean.swift +++ b/Sources/SwiftJava/generated/JavaBoolean.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.Boolean") open class JavaBoolean: JavaObject { @JavaMethod @@ -67,3 +68,4 @@ extension JavaClass { @JavaStaticMethod public func logicalXor(_ arg0: Bool, _ arg1: Bool) -> Bool } +#endif diff --git a/Sources/SwiftJava/generated/JavaByte.swift b/Sources/SwiftJava/generated/JavaByte.swift index e3f67c78..ef540fcc 100644 --- a/Sources/SwiftJava/generated/JavaByte.swift +++ b/Sources/SwiftJava/generated/JavaByte.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.Byte") open class JavaByte: JavaNumber { @JavaMethod @@ -94,3 +95,4 @@ extension JavaClass { @JavaStaticMethod public func parseByte(_ arg0: String, _ arg1: Int32) throws -> Int8 } +#endif diff --git a/Sources/SwiftJava/generated/JavaCharacter.swift b/Sources/SwiftJava/generated/JavaCharacter.swift index 406b45ee..004bd288 100644 --- a/Sources/SwiftJava/generated/JavaCharacter.swift +++ b/Sources/SwiftJava/generated/JavaCharacter.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.Character") open class JavaCharacter: JavaObject { @JavaMethod @@ -3519,3 +3520,4 @@ extension JavaClass { @JavaStaticMethod public func codePointOf(_ arg0: String) -> Int32 } +#endif diff --git a/Sources/SwiftJava/generated/JavaClass.swift b/Sources/SwiftJava/generated/JavaClass.swift index 0f1af1cd..d896879e 100644 --- a/Sources/SwiftJava/generated/JavaClass.swift +++ b/Sources/SwiftJava/generated/JavaClass.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.Class") open class JavaClass: JavaObject { @JavaMethod @@ -142,3 +143,4 @@ extension JavaClass { @JavaStaticMethod public func forPrimitiveName(_ arg0: String) -> JavaClass! where ObjectType == JavaClass } +#endif diff --git a/Sources/SwiftJava/generated/JavaClassLoader.swift b/Sources/SwiftJava/generated/JavaClassLoader.swift index 349cba8d..b2615a9b 100644 --- a/Sources/SwiftJava/generated/JavaClassLoader.swift +++ b/Sources/SwiftJava/generated/JavaClassLoader.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.ClassLoader") open class JavaClassLoader: JavaObject { @JavaMethod @@ -70,3 +71,4 @@ extension JavaClass { @JavaStaticMethod public func registerAsParallelCapable() -> Bool } +#endif diff --git a/Sources/SwiftJava/generated/JavaDouble.swift b/Sources/SwiftJava/generated/JavaDouble.swift index 8d54f8de..cadcf55e 100644 --- a/Sources/SwiftJava/generated/JavaDouble.swift +++ b/Sources/SwiftJava/generated/JavaDouble.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.Double") open class JavaDouble: JavaNumber { @JavaMethod @@ -140,3 +141,4 @@ extension JavaClass { @JavaStaticMethod public func parseDouble(_ arg0: String) throws -> Double } +#endif diff --git a/Sources/SwiftJava/generated/JavaError.swift b/Sources/SwiftJava/generated/JavaError.swift index 4ba9d2ca..2ef153df 100644 --- a/Sources/SwiftJava/generated/JavaError.swift +++ b/Sources/SwiftJava/generated/JavaError.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.Error") open class JavaError: Throwable { @JavaMethod @@ -15,3 +16,4 @@ open class JavaError: Throwable { @JavaMethod @_nonoverride public convenience init(environment: JNIEnvironment? = nil) } +#endif diff --git a/Sources/SwiftJava/generated/JavaFloat.swift b/Sources/SwiftJava/generated/JavaFloat.swift index ac989531..bd3912da 100644 --- a/Sources/SwiftJava/generated/JavaFloat.swift +++ b/Sources/SwiftJava/generated/JavaFloat.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.Float") open class JavaFloat: JavaNumber { @JavaMethod @@ -149,3 +150,4 @@ extension JavaClass { @JavaStaticMethod public func parseFloat(_ arg0: String) throws -> Float } +#endif diff --git a/Sources/SwiftJava/generated/JavaInteger.swift b/Sources/SwiftJava/generated/JavaInteger.swift index 94800037..8ba09607 100644 --- a/Sources/SwiftJava/generated/JavaInteger.swift +++ b/Sources/SwiftJava/generated/JavaInteger.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.Integer") open class JavaInteger: JavaNumber { @@ -183,3 +184,4 @@ extension JavaClass { @JavaStaticMethod public func rotateRight(_ arg0: Int32, _ arg1: Int32) -> Int32 } +#endif diff --git a/Sources/SwiftJava/generated/JavaLong.swift b/Sources/SwiftJava/generated/JavaLong.swift index a986e9ef..1a19ffb7 100644 --- a/Sources/SwiftJava/generated/JavaLong.swift +++ b/Sources/SwiftJava/generated/JavaLong.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.Long") open class JavaLong: JavaNumber { @JavaMethod @@ -185,3 +186,4 @@ extension JavaClass { @JavaStaticMethod public func parseUnsignedLong(_ arg0: String) throws -> Int64 } +#endif diff --git a/Sources/SwiftJava/generated/JavaNumber.swift b/Sources/SwiftJava/generated/JavaNumber.swift index 78f988f1..799777e5 100644 --- a/Sources/SwiftJava/generated/JavaNumber.swift +++ b/Sources/SwiftJava/generated/JavaNumber.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.Number") open class JavaNumber: JavaObject { @JavaMethod @@ -24,3 +25,4 @@ open class JavaNumber: JavaObject { @JavaMethod open func doubleValue() -> Double } +#endif diff --git a/Sources/SwiftJava/generated/JavaObject.swift b/Sources/SwiftJava/generated/JavaObject.swift index 7db8a965..1e01e158 100644 --- a/Sources/SwiftJava/generated/JavaObject.swift +++ b/Sources/SwiftJava/generated/JavaObject.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.Object") open class JavaObject { @JavaMethod @@ -39,3 +40,4 @@ open class JavaObject { @JavaMethod open func wait() throws } +#endif diff --git a/Sources/SwiftJava/generated/JavaOptional.swift b/Sources/SwiftJava/generated/JavaOptional.swift index 08cc764a..877d9f24 100644 --- a/Sources/SwiftJava/generated/JavaOptional.swift +++ b/Sources/SwiftJava/generated/JavaOptional.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.Optional") open class JavaOptional: JavaObject { @JavaMethod @@ -49,3 +50,4 @@ extension JavaClass { Optional(javaOptional: ofNullable(arg0)) } } +#endif diff --git a/Sources/SwiftJava/generated/JavaOptionalDouble.swift b/Sources/SwiftJava/generated/JavaOptionalDouble.swift index 0d0e2eae..9bf343da 100644 --- a/Sources/SwiftJava/generated/JavaOptionalDouble.swift +++ b/Sources/SwiftJava/generated/JavaOptionalDouble.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.OptionalDouble") open class JavaOptionalDouble: JavaObject { @JavaMethod @@ -42,3 +43,4 @@ extension JavaClass { Optional(javaOptional: empty()) } } +#endif diff --git a/Sources/SwiftJava/generated/JavaOptionalInt.swift b/Sources/SwiftJava/generated/JavaOptionalInt.swift index 2270e66e..c8c86547 100644 --- a/Sources/SwiftJava/generated/JavaOptionalInt.swift +++ b/Sources/SwiftJava/generated/JavaOptionalInt.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.OptionalInt") open class JavaOptionalInt: JavaObject { @JavaMethod @@ -42,3 +43,4 @@ extension JavaClass { Optional(javaOptional: empty()) } } +#endif diff --git a/Sources/SwiftJava/generated/JavaOptionalLong.swift b/Sources/SwiftJava/generated/JavaOptionalLong.swift index 10c3fbd0..ff67f1db 100644 --- a/Sources/SwiftJava/generated/JavaOptionalLong.swift +++ b/Sources/SwiftJava/generated/JavaOptionalLong.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.util.OptionalLong") open class JavaOptionalLong: JavaObject { @JavaMethod @@ -42,3 +43,4 @@ extension JavaClass { Optional(javaOptional: empty()) } } +#endif diff --git a/Sources/SwiftJava/generated/JavaShort.swift b/Sources/SwiftJava/generated/JavaShort.swift index 4f387b36..43c6ffdd 100644 --- a/Sources/SwiftJava/generated/JavaShort.swift +++ b/Sources/SwiftJava/generated/JavaShort.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.Short") open class JavaShort: JavaNumber { @JavaMethod @@ -97,3 +98,4 @@ extension JavaClass { @JavaStaticMethod public func parseShort(_ arg0: String, _ arg1: Int32) throws -> Int16 } +#endif diff --git a/Sources/SwiftJava/generated/JavaString.swift b/Sources/SwiftJava/generated/JavaString.swift index f3372f65..e63837bc 100644 --- a/Sources/SwiftJava/generated/JavaString.swift +++ b/Sources/SwiftJava/generated/JavaString.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.String", implements: CharSequence.self) open class JavaString: JavaObject { @JavaMethod @@ -266,3 +267,4 @@ extension JavaClass { @JavaStaticMethod public func copyValueOf(_ arg0: [UInt16]) -> String } +#endif diff --git a/Sources/SwiftJava/generated/JavaVoid.swift b/Sources/SwiftJava/generated/JavaVoid.swift index 54decbbc..32fe0b88 100644 --- a/Sources/SwiftJava/generated/JavaVoid.swift +++ b/Sources/SwiftJava/generated/JavaVoid.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.Void") open class JavaVoid: JavaObject { @@ -9,3 +10,4 @@ extension JavaClass { @JavaStaticField(isFinal: true) public var TYPE: JavaClass! } +#endif diff --git a/Sources/SwiftJava/generated/RuntimeException.swift b/Sources/SwiftJava/generated/RuntimeException.swift index 14516ed1..f8e889e8 100644 --- a/Sources/SwiftJava/generated/RuntimeException.swift +++ b/Sources/SwiftJava/generated/RuntimeException.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.RuntimeException") open class RuntimeException: Exception { @JavaMethod @@ -15,3 +16,4 @@ open class RuntimeException: Exception { @JavaMethod @_nonoverride public convenience init(environment: JNIEnvironment? = nil) } +#endif diff --git a/Sources/SwiftJava/generated/Throwable.swift b/Sources/SwiftJava/generated/Throwable.swift index 7df74b7e..e88ef9a3 100644 --- a/Sources/SwiftJava/generated/Throwable.swift +++ b/Sources/SwiftJava/generated/Throwable.swift @@ -1,6 +1,7 @@ // Auto-generated by Java-to-Swift wrapper generator. import CSwiftJavaJNI +#if SwiftJavaMacrosSupport @JavaClass("java.lang.Throwable") open class Throwable: JavaObject { @JavaMethod @@ -42,3 +43,4 @@ open class Throwable: JavaObject { @JavaMethod open func addSuppressed(_ arg0: Throwable?) } +#endif diff --git a/Sources/SwiftJavaMacros/GenerationMode.swift b/Sources/SwiftJavaMacros/GenerationMode.swift index 2bf9fc4f..53067ef3 100644 --- a/Sources/SwiftJavaMacros/GenerationMode.swift +++ b/Sources/SwiftJavaMacros/GenerationMode.swift @@ -12,6 +12,8 @@ // //===----------------------------------------------------------------------===// +#if SwiftJavaMacrosSupport + import SwiftSyntax import SwiftSyntaxMacros @@ -76,3 +78,5 @@ enum GenerationMode { return nil } } + +#endif \ No newline at end of file diff --git a/Sources/SwiftJavaMacros/ImplementsJavaMacro.swift b/Sources/SwiftJavaMacros/ImplementsJavaMacro.swift index b3057ae4..a5dcfcb4 100644 --- a/Sources/SwiftJavaMacros/ImplementsJavaMacro.swift +++ b/Sources/SwiftJavaMacros/ImplementsJavaMacro.swift @@ -12,6 +12,8 @@ // //===----------------------------------------------------------------------===// +#if SwiftJavaMacrosSupport + import SwiftSyntax import SwiftSyntaxBuilder import SwiftSyntaxMacros @@ -165,3 +167,5 @@ extension JavaImplementationMacro: PeerMacro { return exposedMembers } } + +#endif \ No newline at end of file diff --git a/Sources/SwiftJavaMacros/JavaClassMacro.swift b/Sources/SwiftJavaMacros/JavaClassMacro.swift index 9a2dd4a5..4cf8c439 100644 --- a/Sources/SwiftJavaMacros/JavaClassMacro.swift +++ b/Sources/SwiftJavaMacros/JavaClassMacro.swift @@ -12,6 +12,8 @@ // //===----------------------------------------------------------------------===// +#if SwiftJavaMacrosSupport + import SwiftSyntax import SwiftSyntaxBuilder import SwiftSyntaxMacros @@ -169,3 +171,5 @@ extension ClassDeclSyntax { return name.text == "JavaObject" } } + +#endif \ No newline at end of file diff --git a/Sources/SwiftJavaMacros/JavaFieldMacro.swift b/Sources/SwiftJavaMacros/JavaFieldMacro.swift index 29eb966c..01a06df8 100644 --- a/Sources/SwiftJavaMacros/JavaFieldMacro.swift +++ b/Sources/SwiftJavaMacros/JavaFieldMacro.swift @@ -12,6 +12,8 @@ // //===----------------------------------------------------------------------===// +#if SwiftJavaMacrosSupport + import SwiftSyntax import SwiftSyntaxBuilder import SwiftSyntaxMacros @@ -95,3 +97,5 @@ extension JavaFieldMacro: AccessorMacro { return false } } + +#endif \ No newline at end of file diff --git a/Sources/SwiftJavaMacros/JavaMethodMacro.swift b/Sources/SwiftJavaMacros/JavaMethodMacro.swift index db8a3b36..fff50d8e 100644 --- a/Sources/SwiftJavaMacros/JavaMethodMacro.swift +++ b/Sources/SwiftJavaMacros/JavaMethodMacro.swift @@ -12,6 +12,8 @@ // //===----------------------------------------------------------------------===// +#if SwiftJavaMacrosSupport + import SwiftSyntax import SwiftSyntaxBuilder @_spi(Testing) import SwiftSyntaxMacroExpansion @@ -158,3 +160,5 @@ extension TypeSyntaxProtocol { typeReference.description } } + +#endif \ No newline at end of file diff --git a/Sources/SwiftJavaMacros/MacroErrors.swift b/Sources/SwiftJavaMacros/MacroErrors.swift index 2fcbfa91..6ec51f42 100644 --- a/Sources/SwiftJavaMacros/MacroErrors.swift +++ b/Sources/SwiftJavaMacros/MacroErrors.swift @@ -12,6 +12,8 @@ // //===----------------------------------------------------------------------===// +#if SwiftJavaMacrosSupport + enum MacroErrors: Error { case unrecognizedJavaClassMacro(String) case javaImplementationRequiresExtension @@ -22,3 +24,5 @@ enum MacroErrors: Error { case missingEnvironment case macroOutOfContext(String) } + +#endif \ No newline at end of file diff --git a/Sources/SwiftJavaMacros/SwiftJNIMacrosPlugin.swift b/Sources/SwiftJavaMacros/SwiftJNIMacrosPlugin.swift index 637b2ea4..034a0705 100644 --- a/Sources/SwiftJavaMacros/SwiftJNIMacrosPlugin.swift +++ b/Sources/SwiftJavaMacros/SwiftJNIMacrosPlugin.swift @@ -12,9 +12,12 @@ // //===----------------------------------------------------------------------===// +#if SwiftJavaMacrosSupport import SwiftCompilerPlugin import SwiftSyntaxMacros +#endif +#if SwiftJavaMacrosSupport @main struct SwiftJavaMacrosPlugin: CompilerPlugin { var providingMacros: [Macro.Type] = [ @@ -24,3 +27,11 @@ struct SwiftJavaMacrosPlugin: CompilerPlugin { JavaMethodMacro.self, ] } +#else +@main +struct Dummy { + public static func main() { + fatalError("Placeholder; macros are disabled") + } +} +#endif diff --git a/Sources/SwiftJavaMacros/SwiftSyntaxUtils.swift b/Sources/SwiftJavaMacros/SwiftSyntaxUtils.swift index 08607056..3c6e7c67 100644 --- a/Sources/SwiftJavaMacros/SwiftSyntaxUtils.swift +++ b/Sources/SwiftJavaMacros/SwiftSyntaxUtils.swift @@ -12,6 +12,8 @@ // //===----------------------------------------------------------------------===// +#if SwiftJavaMacrosSupport + import SwiftSyntax extension FunctionParameterSyntax { @@ -29,3 +31,5 @@ extension FunctionParameterSyntax { return firstName.text } } + +#endif \ No newline at end of file diff --git a/Tests/JExtractSwiftTests/AdditionalSwiftImportsTests.swift b/Tests/JExtractSwiftTests/AdditionalSwiftImportsTests.swift new file mode 100644 index 00000000..4b0192d9 --- /dev/null +++ b/Tests/JExtractSwiftTests/AdditionalSwiftImportsTests.swift @@ -0,0 +1,42 @@ +//===----------------------------------------------------------------------===// +// +// This source file is part of the Swift.org open source project +// +// Copyright (c) 2025 Apple Inc. and the Swift.org project authors +// Licensed under Apache License v2.0 +// +// See LICENSE.txt for license information +// See CONTRIBUTORS.txt for the list of Swift.org project authors +// +// SPDX-License-Identifier: Apache-2.0 +// +//===----------------------------------------------------------------------===// + +import JExtractSwiftLib +import Testing +import SwiftJavaConfigurationShared + +final class AdditionalSwiftImportsTests { + let interfaceFile = + """ + public struct MyStruct {} + """ + + @Test("Import with additional imports") + func data_swiftThunk() throws { + var config = Configuration() + config.swiftAdditionalImports = ["Extras", "Additional"] + try assertOutput( + input: interfaceFile, + config: config, + .ffm, .swift, + detectChunkByInitialLines: 2, + expectedChunks: [ + """ + import Extras // additional import, requested through tool invocation + import Additional // additional import, requested through tool invocation + """ + ] + ) + } +}