Skip to content

Commit ad5d519

Browse files
committed
Merge branch 'main' into fix/channel-monitor-migration
# Conflicts: # CHANGELOG.md # Package.swift # bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/arm64-v8a/libldk_node.so # bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/armeabi-v7a/libldk_node.so # bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/x86_64/libldk_node.so # bindings/kotlin/ldk-node-jvm/lib/src/main/resources/darwin-aarch64/libldk_node.dylib # bindings/kotlin/ldk-node-jvm/lib/src/main/resources/darwin-x86-64/libldk_node.dylib
2 parents dc087fb + d1d6fff commit ad5d519

19 files changed

Lines changed: 562 additions & 450 deletions

File tree

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change

bindgen.sh

100644100755
File mode changed.
Binary file not shown.
Binary file not shown.
Binary file not shown.

bindings/kotlin/ldk-node-android/lib/src/main/kotlin/org/lightningdevkit/ldknode/ldk_node.android.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change

bindings/kotlin/ldk-node-android/lib/src/main/kotlin/org/lightningdevkit/ldknode/ldk_node.common.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change

bindings/kotlin/ldk-node-jvm/lib/src/main/kotlin/org/lightningdevkit/ldknode/ldk_node.common.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change

bindings/kotlin/ldk-node-jvm/lib/src/main/kotlin/org/lightningdevkit/ldknode/ldk_node.jvm.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change

0 commit comments

Comments
 (0)