Merge pull request #16 from synonymdev/feat/android-kotlin-serializable

feat: serializable types in android bindings

Author: ovitrif

.gitignore

@@ -30,7 +30,9 @@ swift.swiftdoc
 
 # fork
 !/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs
-!/bindings/kotlin/ldk-node-android/lib/src/main/kotlin/org/lightningdevkit/ldknode/ldk_node.kt
 .idea
+.build
+.cursor
+.claude
 *.local.*
 CLAUDE.md

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ldk-node"
-version = "0.6.2-rc.3"
+version = "0.6.2-rc.4"
 authors = ["Elias Rohrer <dev@tnull.de>"]
 homepage = "https://lightningdevkit.org/"
 license = "MIT OR Apache-2.0"
@@ -85,7 +85,7 @@ esplora-client = { version = "0.12", default-features = false, features = ["toki
 esplora-client_0_11 = { package = "esplora-client", version = "0.11", default-features = false, features = ["tokio", "async-https-rustls"] }
 electrum-client = { version = "0.24.0", default-features = true }
 libc = "0.2"
-uniffi = { version = "0.27.3", features = ["build"], optional = true }
+uniffi = { version = "0.28.3", features = ["build"], optional = true }
 serde = { version = "1.0.210", default-features = false, features = ["std", "derive"] }
 serde_json = { version = "1.0.128", default-features = false, features = ["std"] }
 log = { version = "0.4.22", default-features = false, features = ["std"]}
@@ -118,7 +118,7 @@ lnd_grpc_rust = { version = "2.10.0", default-features = false }
 tokio = { version = "1.37", features = ["fs"] }
 
 [build-dependencies]
-uniffi = { version = "0.27.3", features = ["build"], optional = true }
+uniffi = { version = "0.28.3", features = ["build"], optional = true }
 
 [profile.release]
 panic = "abort"

Package.swift

@@ -4,7 +4,7 @@
 import PackageDescription
 
 let tag = "v0.6.2-rc.3"
-let checksum = "ee0ccf65c286d652afc72cc613f7477f1c2c65faaf1774c5a8e21141b64b226b"
+let checksum = "2d56ab258b64757ed4aae0986332a97590ad26046a5c0dcc085bd6d6a60779d5"
 let url = "https://github.com/synonymdev/ldk-node/releases/download/\(tag)/LDKNodeFFI.xcframework.zip"
 
 let package = Package(

bindings/README.md

@@ -1,5 +1,6 @@
 ## Generating the Bindings
 
+## Build All Bindings
 Run in the root dir:
 ```sh
 RUSTFLAGS="--cfg no_download" cargo build && ./scripts/uniffi_bindgen_generate.sh && ./scripts/swift_create_xcframework_archive.sh && sh scripts/uniffi_bindgen_generate_kotlin_android.sh
@@ -11,7 +12,7 @@ Detailed instructions for publishing a new version of the bindings.
 
 1. Update `Cargo.toml`
 2. Update `libraryVersion` in `bindings/kotlin/ldk-node-android/gradle.properties`
-3. Run the command to generate all bindings
+3. Run the above command to build all bindings
 4. Open a PR with the changes
 5. Create a new GitHub release with a new tag like `v0.1.0`, uploading the following files:
    - `bindings/swift/LDKNodeFFI.xcframework.zip`

bindings/kotlin/ldk-node-android/build.gradle.kts

@@ -4,11 +4,13 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.1.2")
+        classpath("com.android.tools.build:gradle:8.1.1")
     }
 }
 
 plugins {
+    kotlin("android") version "1.9.20" apply false
+    kotlin("plugin.serialization") version "1.9.20" apply false
 }
 
 // library version is defined in gradle.properties

bindings/kotlin/ldk-node-android/gradle.properties

@@ -2,4 +2,4 @@ org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
-libraryVersion=0.6.2-rc.1
+libraryVersion=0.6.2-rc.4

bindings/kotlin/ldk-node-android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

bindings/kotlin/ldk-node-android/lib/build.gradle.kts

@@ -3,7 +3,8 @@ val libraryVersion: String by project
 
 plugins {
     id("com.android.library")
-    id("org.jetbrains.kotlin.android") version "1.6.10"
+    kotlin("android")
+    kotlin("plugin.serialization")
 
     id("maven-publish")
     id("signing")
@@ -16,11 +17,11 @@ repositories {
 }
 
 android {
+    namespace = "org.lightningdevkit.ldknode"
     compileSdk = 34
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 31
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
     }
@@ -32,6 +33,15 @@ android {
         }
     }
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
     publishing {
         singleVariant("release") {
             withSourcesJar()
@@ -46,13 +56,9 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
     implementation("androidx.appcompat:appcompat:1.4.0")
     implementation("androidx.core:core-ktx:1.7.0")
+    implementation("org.jetbrains.kotlinx:atomicfu:0.23.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
     api("org.slf4j:slf4j-api:1.7.30")
-
-    androidTestImplementation("com.github.tony19:logback-android:2.0.0")
-    androidTestImplementation("androidx.test.ext:junit:1.1.3")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
-    androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
-    androidTestImplementation("org.jetbrains.kotlin:kotlin-test-junit")
 }
 
 afterEvaluate {

bindings/kotlin/ldk-node-android/lib/src/androidTest/kotlin/org/lightningdevkit/ldknode/AndroidLibTest.kt

@@ -1,7 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="org.lightningdevkit">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-permission android:name="android.permission.INTERNET" />
 
 </manifest>
-