Skip to content

jextract: add support for desugared optional on Android 23 #498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
madsodgaard wants to merge 2 commits into
base: main
Choose a base branch
from
Open

jextract: add support for desugared optional on Android 23 #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef76a84
revert subprocess
madsodgaard Dec 16, 2025
6a03a30
fix tests
madsodgaard Dec 16, 2025
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
2 changes: 2 additions & 0 deletions Sources/ExampleSwiftLibrary/MySwiftLibrary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import Glibc
import CRT
#elseif canImport(Darwin)
import Darwin.C
#elseif canImport(Android)
import Android
#endif

public func helloWorld() {
Expand Down
35 changes: 35 additions & 0 deletions Sources/SwiftJava/AndroidSupport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
//===----------------------------------------------------------------------===//
//
// 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
//
//===----------------------------------------------------------------------===//

public enum AndroidSupport {
/// Performs any known name conversions
/// for types that are desugared on specific Android versions
public static func androidDesugarClassNameConversion(
for fullClassName: String
) -> String {
#if os(Android) && compiler(>=6.3)
switch fullClassName {
case "java.util.Optional":
// On API 23, Optionals are desugared
if #unavailable(Android 24) {
return "j$.util.Optional"
}

default:
break
}
#endif
return fullClassName
}
}
10 changes: 8 additions & 2 deletions Sources/SwiftJavaMacros/JavaClassMacro.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ extension JavaClassMacro: MemberMacro {
}

var members: [DeclSyntax] = []

// Determine the modifiers to use for the fullJavaClassName member.
let fullJavaClassNameMemberModifiers: String
switch (isSwiftClass, isJavaLangObject) {
Expand All @@ -94,7 +94,13 @@ extension JavaClassMacro: MemberMacro {
let classNameAccessSpecifier = isSwiftClass ? "open" : "public"
members.append("""
/// The full Java class name for this Swift type.
\(raw: classNameAccessSpecifier) \(raw: fullJavaClassNameMemberModifiers) var fullJavaClassName: String { \(literal: className) }
\(raw: classNameAccessSpecifier) \(raw: fullJavaClassNameMemberModifiers) var fullJavaClassName: String {
#if os(Android)
AndroidSupport.androidDesugarClassNameConversion(for: "\(raw: className)")
#else
"\(raw: className)"
#endif
}
"""
)

Expand Down
20 changes: 20 additions & 0 deletions Tests/SwiftJavaMacrosTests/JavaClassMacroTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ class JavaKitMacroTests: XCTestCase {

/// The full Java class name for this Swift type.
open override class var fullJavaClassName: String {
#if os(Android)
AndroidSupport.androidDesugarClassNameConversion(for: "org.swift.example.HelloWorld")
#else
"org.swift.example.HelloWorld"
#endif
}

public required init(javaHolder: JavaObjectHolder) {
Expand Down Expand Up @@ -150,7 +154,11 @@ class JavaKitMacroTests: XCTestCase {

/// The full Java class name for this Swift type.
public static var fullJavaClassName: String {
#if os(Android)
AndroidSupport.androidDesugarClassNameConversion(for: "org.swift.example.HelloWorld")
#else
"org.swift.example.HelloWorld"
#endif
}

public typealias JavaSuperclass = JavaObject
Expand Down Expand Up @@ -242,7 +250,11 @@ class JavaKitMacroTests: XCTestCase {

/// The full Java class name for this Swift type.
open override class var fullJavaClassName: String {
#if os(Android)
AndroidSupport.androidDesugarClassNameConversion(for: "org.swift.example.HelloWorld")
#else
"org.swift.example.HelloWorld"
#endif
}

public required init(javaHolder: JavaObjectHolder) {
Expand Down Expand Up @@ -283,7 +295,11 @@ class JavaKitMacroTests: XCTestCase {

/// The full Java class name for this Swift type.
open class var fullJavaClassName: String {
#if os(Android)
AndroidSupport.androidDesugarClassNameConversion(for: "java.lang.Object")
#else
"java.lang.Object"
#endif
}

public var javaHolder: JavaObjectHolder
Expand Down Expand Up @@ -319,7 +335,11 @@ class JavaKitMacroTests: XCTestCase {

/// The full Java class name for this Swift type.
open override class var fullJavaClassName: String {
#if os(Android)
AndroidSupport.androidDesugarClassNameConversion(for: "java.lang.Optional")
#else
"java.lang.Optional"
#endif
}

public required init(javaHolder: JavaObjectHolder) {
Expand Down
Loading