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
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# Unreleased

- The Android AAR now ships targeted R8 consumer keep rules for the UniFFI/JNA FFI surface.

# 0.7.0-rc.64 (Synonym Fork)

## Bug Fixes

- The Android AAR now ships targeted R8 consumer keep rules for the UniFFI/JNA FFI surface.

# 0.7.0-rc.63 (Synonym Fork)

## Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exclude = ["bindings/uniffi-bindgen"]

[package]
name = "ldk-node"
version = "0.7.0-rc.63"
version = "0.7.0-rc.64"
authors = ["Elias Rohrer <dev@tnull.de>"]
homepage = "https://lightningdevkit.org/"
license = "MIT OR Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import PackageDescription

let tag = "v0.7.0-rc.63"
let tag = "v0.7.0-rc.64"
let checksum = "8890d1b91f2b3e0a33ffd2854e1a4e9721e99706e8378177d30fbc435cd2db49"
let url = "https://github.com/synonymdev/ldk-node/releases/download/\(tag)/LDKNodeFFI.xcframework.zip"

Expand Down
2 changes: 1 addition & 1 deletion bindings/kotlin/ldk-node-android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ android.useAndroidX=true
android.enableJetifier=true
kotlin.code.style=official
group=com.synonym
version=0.7.0-rc.63
version=0.7.0-rc.64
46 changes: 45 additions & 1 deletion bindings/kotlin/ldk-node-android/lib/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import java.io.ByteArrayOutputStream
import java.io.File
import java.util.zip.ZipFile

plugins {
id("com.android.library")
Expand Down Expand Up @@ -158,8 +159,51 @@ val validateReleaseNativeLibraries by tasks.registering {
}
}

val validateConsumerKeepRules by tasks.registering {
group = "verification"
description = "Validates Android consumer keep rules exist for R8."

val consumerRules = layout.projectDirectory.file("consumer-rules.pro")
inputs.file(consumerRules)

doLast {
val file = consumerRules.asFile
if (!file.isFile || file.readText().isBlank()) {
throw GradleException("Android consumer keep rules missing at '${file.path}'")
}
}
}

tasks.matching { it.name == "bundleReleaseAar" || it.name.startsWith("publish") }.configureEach {
dependsOn(validateReleaseNativeLibraries)
dependsOn(validateReleaseNativeLibraries, validateConsumerKeepRules)
}

tasks.matching { it.name == "bundleReleaseAar" }.configureEach {
doLast {
val aars = layout.buildDirectory.dir("outputs/aar").get().asFile
.listFiles()
?.filter { it.isFile && it.name.endsWith(".aar") && it.name.contains("release") }
.orEmpty()

if (aars.isEmpty()) {
throw GradleException("Release AAR missing after bundleReleaseAar")
}

aars.forEach { aar ->
ZipFile(aar).use { zip ->
val entry = zip.getEntry("proguard.txt")
?: throw GradleException(
"Release AAR is missing consumer keep rules (proguard.txt): '${aar.path}'"
)
val text = zip.getInputStream(entry).bufferedReader().readText()
if (text.isBlank()) {
throw GradleException(
"Release AAR consumer keep rules are empty: '${aar.path}'"
)
}
}
}
}
}

afterEvaluate {
Expand Down
28 changes: 28 additions & 0 deletions bindings/kotlin/ldk-node-android/lib/consumer-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Consumer keep rules for ldk-node Android bindings.
# Packaged into the AAR and applied automatically when a consuming app enables R8.

# JNA reads @Structure.FieldOrder and public fields by name, and constructs
# Structure, Structure$ByValue, and Structure$ByReference types reflectively.
-keepclassmembers class org.lightningdevkit.ldknode.** extends com.sun.jna.Structure {
<fields>;
<init>(...);
}

# JNA looks up Callback methods by name when building native function pointers.
-keepclassmembers class org.lightningdevkit.ldknode.** implements com.sun.jna.Callback {
<methods>;
}

# UniFFI 0.28 loads UniffiLib via Native.load; JNA looks up interface methods by name.
-keep,includedescriptorclasses interface org.lightningdevkit.ldknode.UniffiLib {
<methods>;
}

# @Structure.FieldOrder is read at runtime.
-keepattributes RuntimeVisibleAnnotations

# JNA's AAR references desktop AWT types that are absent on Android.
-dontwarn java.awt.Component
-dontwarn java.awt.GraphicsEnvironment
-dontwarn java.awt.HeadlessException
-dontwarn java.awt.Window
2 changes: 1 addition & 1 deletion bindings/kotlin/ldk-node-jvm/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx1536m
kotlin.code.style=official
group=com.synonym
version=0.7.0-rc.63
version=0.7.0-rc.64
2 changes: 1 addition & 1 deletion bindings/python/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "ldk_node"
version = "0.7.0-rc.63"
version = "0.7.0-rc.64"
authors = [
{ name="Elias Rohrer", email="dev@tnull.de" },
]
Expand Down