Skip to content

add AndroidCoreLibraryDesugaring trait #578

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
+40 −13
Open

add AndroidCoreLibraryDesugaring trait #578

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
aa1f0bd
add AndroidCoreLibraryDesugaring trait
madsodgaard Feb 27, 2026
7ef5929
add docs
madsodgaard Feb 28, 2026
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
3 changes: 3 additions & 0 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,9 @@ let package = Package(
),

],
traits: [
.trait(name: "AndroidCoreLibraryDesugaring")
],
dependencies: [
.package(url: "https://github.com/swiftlang/swift-syntax", from: "602.0.0"),
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
Expand Down
7 changes: 2 additions & 5 deletions Sources/SwiftJava/AndroidSupport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,10 @@ public enum AndroidSupport {
public static func androidDesugarClassNameConversion(
for fullClassName: String
) -> String {
#if os(Android) && compiler(>=6.3)
#if os(Android) && AndroidCoreLibraryDesugaring
switch fullClassName {
case "java.util.Optional":
// On API 23, Optionals are desugared
if #unavailable(Android 24) {
return "j$.util.Optional"
}
return "j$.util.Optional"

default:
break
Expand Down
24 changes: 24 additions & 0 deletions Sources/SwiftJavaDocumentation/Documentation.docc/Android.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Android

## Android Core Library Desugaring

If you are using [Core Library Desugaring](https://developer.android.com/studio/write/java8-support) in your
Android project, you must enable the `AndroidCoreLibraryDesugaring` trait to ensure that the SwiftJava wrappers
use the desugared class names:

```swift
let package = Package(
name: "MyProject",
products: [
// ...
],
dependencies: [
.package(url: "https://github.com/swiftlang/swift-java", from: "...", traits: ["AndroidCoreLibraryDesugaring"]),
],

targets: [
// ...
]
)
```
```
4 changes: 2 additions & 2 deletions Sources/SwiftJavaDocumentation/Documentation.docc/SwiftPMPlugin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ let package = Package(
],

dependencies: [
.package(url: "https://github.com/apple/swift-java", from: "..."),
.package(url: "https://github.com/swiftlang/swift-java", from: "..."),
],

targets: [
Expand Down Expand Up @@ -123,4 +123,4 @@ func getJavaHomeFromLibexecJavaHome() -> String? {
return nil
}
}
```
```
3 changes: 3 additions & 0 deletions Sources/SwiftJavaDocumentation/Documentation.docc/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,6 @@ which is a quick overview of all the features and approaches offered by SwiftJav
- <doc:SwiftJavaCommandLineTool>
- <doc:SwiftPMPlugin>

### Android Support

- <doc:Android>
2 changes: 1 addition & 1 deletion Sources/SwiftJavaMacros/JavaClassMacro.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ extension JavaClassMacro: MemberMacro {
"""
/// The full Java class name for this Swift type.
\(raw: classNameAccessSpecifier) \(raw: fullJavaClassNameMemberModifiers) var fullJavaClassName: String {
#if os(Android)
#if os(Android) && AndroidCoreLibraryDesugaring
AndroidSupport.androidDesugarClassNameConversion(for: "\(raw: className)")
#else
"\(raw: className)"
Expand Down
10 changes: 5 additions & 5 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,7 @@ class JavaKitMacroTests: XCTestCase {

/// The full Java class name for this Swift type.
open override class var fullJavaClassName: String {
#if os(Android)
#if os(Android) && AndroidCoreLibraryDesugaring
AndroidSupport.androidDesugarClassNameConversion(for: "org.swift.example.HelloWorld")
#else
"org.swift.example.HelloWorld"
Expand Down Expand Up @@ -169,7 +169,7 @@ class JavaKitMacroTests: XCTestCase {

/// The full Java class name for this Swift type.
public static var fullJavaClassName: String {
#if os(Android)
#if os(Android) && AndroidCoreLibraryDesugaring
AndroidSupport.androidDesugarClassNameConversion(for: "org.swift.example.HelloWorld")
#else
"org.swift.example.HelloWorld"
Expand Down Expand Up @@ -278,7 +278,7 @@ class JavaKitMacroTests: XCTestCase {

/// The full Java class name for this Swift type.
open override class var fullJavaClassName: String {
#if os(Android)
#if os(Android) && AndroidCoreLibraryDesugaring
AndroidSupport.androidDesugarClassNameConversion(for: "org.swift.example.HelloWorld")
#else
"org.swift.example.HelloWorld"
Expand Down Expand Up @@ -336,7 +336,7 @@ class JavaKitMacroTests: XCTestCase {

/// The full Java class name for this Swift type.
open class var fullJavaClassName: String {
#if os(Android)
#if os(Android) && AndroidCoreLibraryDesugaring
AndroidSupport.androidDesugarClassNameConversion(for: "java.lang.Object")
#else
"java.lang.Object"
Expand Down Expand Up @@ -390,7 +390,7 @@ class JavaKitMacroTests: XCTestCase {

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