Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,19 @@ if let localPath = Context.environment["SWIFT_JAVA_JNI_CORE_PATH"] {
swiftJavaJNICoreDep = .package(url: "https://github.com/swiftlang/swift-java-jni-core", branch: "main")
}

// Set SWIFTJAVA_DOCC_PLUGIN_INSTALL=1 to install the docc-plugin automatically.
// This is a workaround because swift-subprocess includes the plugin explicitly,
// which breaks tools trying to add `swift package add-dependency` the plugin
// to swift-java because it thinks the plugin was already added, but it is not.
let extraDependencies: [Package.Dependency]
if Context.environment["SWIFTJAVA_DOCC_PLUGIN_INSTALL"] == "1" {
extraDependencies = [
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.5.0")
]
} else {
extraDependencies = []
}

let package = Package(
name: "swift-java",
platforms: [
Expand Down Expand Up @@ -159,7 +172,7 @@ let package = Package(

// Benchmarking
.package(url: "https://github.com/ordo-one/package-benchmark", .upToNextMajor(from: "1.4.0")),
],
] + extraDependencies,
targets: [
.target(
name: "SwiftJavaDocumentation",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import SwiftJava
import SwiftJavaJNICore

/// Java `sealed class`, permits: `java.lang.reflect.Constructor`, `java.lang.reflect.Method`
@JavaClass("java.lang.reflect.Executable", implements: GenericDeclaration.self)
open class Executable: AccessibleObject {
/// Java method `getAnnotatedExceptionTypes`.
Expand Down
1 change: 1 addition & 0 deletions Sources/SwiftJava/generated/ByteBuffer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ extension JavaClass<ByteBuffer> {
@JavaStaticMethod
public func wrap(_ arg0: [Int8], _ arg1: Int32, _ arg2: Int32) -> ByteBuffer!
}
/// Java `sealed class`, permits: `java.nio.HeapByteBuffer`, `java.nio.MappedByteBuffer`
@JavaClass("java.nio.ByteBuffer")
open class ByteBuffer: JavaObject {
/// Java method `alignedSlice`.
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftJava/generated/JavaThread.swift
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@ open class JavaThread: JavaObject {
open override func toString() -> String
}
extension JavaThread {
/// Java `sealed interface`, permits: `java.lang.Thread$Builder$OfPlatform`, `java.lang.Thread$Builder$OfVirtual`
@JavaInterface("java.lang.Thread$Builder")
public struct Builder {
/// Java method `inheritInheritableThreadLocals`.
Expand Down Expand Up @@ -423,6 +424,7 @@ extension JavaThread {
}
}
extension JavaThread.Builder {
/// Java `sealed interface`, permits: `java.lang.ThreadBuilders$PlatformThreadBuilder`
@JavaInterface("java.lang.Thread$Builder$OfPlatform", extends: JavaThread.Builder.self)
public struct OfPlatform {
/// Java method `daemon`.
Expand Down Expand Up @@ -499,6 +501,7 @@ extension JavaThread.Builder {
}
}
extension JavaThread.Builder {
/// Java `sealed interface`, permits: `java.lang.ThreadBuilders$VirtualThreadBuilder`
@JavaInterface("java.lang.Thread$Builder$OfVirtual", extends: JavaThread.Builder.self)
public struct OfVirtual {
/// Java method `inheritInheritableThreadLocals`.
Expand Down
Loading