Merge pull request #140 from tnull/2023-07-cleanup-kotlin-jvm-generation-script

Clean up Kotlin/JVM bindings generation script

Author: tnull

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

@@ -100,9 +100,9 @@ afterEvaluate {
 }
 
 signing {
-    val signingKeyId: String? by project
-    val signingKey: String? by project
-    val signingPassword: String? by project
-    useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+//    val signingKeyId: String? by project
+//    val signingKey: String? by project
+//    val signingPassword: String? by project
+//    useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
     sign(publishing.publications)
 }

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

@@ -19,6 +19,11 @@ repositories {
     mavenCentral()
 }
 
+java {
+    withSourcesJar()
+    withJavadocJar()
+}
+
 dependencies {
     // Use the Kotlin JUnit 5 integration.
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
@@ -100,9 +105,9 @@ afterEvaluate {
 }
 
 signing {
-    val signingKeyId: String? by project
-    val signingKey: String? by project
-    val signingPassword: String? by project
-    useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+//    val signingKeyId: String? by project
+//    val signingKey: String? by project
+//    val signingPassword: String? by project
+//    useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
     sign(publishing.publications)
 }

scripts/uniffi_bindgen_generate_kotlin.sh

@@ -5,19 +5,30 @@ PROJECT_DIR="ldk-node-jvm"
 PACKAGE_DIR="org/lightningdevkit/ldknode"
 UNIFFI_BINDGEN_BIN="cargo run --features=uniffi/cli --bin uniffi-bindgen"
 
-DYNAMIC_LIB_PATH="target/release/libldk_node.dylib"
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-  DYNAMIC_LIB_PATH="target/release/libldk_node.so"
-fi
+	rustup target add x86_64-unknown-linux-gnu || exit 1
+	cargo build --release --target x86_64-unknown-linux-gnu --features uniffi || exit 1
+	DYNAMIC_LIB_PATH="target/x86_64-unknown-linux-gnu/release/libldk_node.so"
+	RES_DIR="$BINDINGS_DIR/$PROJECT_DIR/lib/src/main/resources/linux-x86-64/"
+	mkdir -p $RES_DIR || exit 1
+	cp $DYNAMIC_LIB_PATH $RES_DIR || exit 1
+else
+	rustup target add x86_64-apple-darwin || exit 1
+	cargo build --release --target x86_64-apple-darwin --features uniffi || exit 1
+	DYNAMIC_LIB_PATH="target/x86_64-apple-darwin/release/libldk_node.dylib"
+	RES_DIR="$BINDINGS_DIR/$PROJECT_DIR/lib/src/main/resources/darwin-x86-64/"
+	mkdir -p $RES_DIR || exit 1
+	cp $DYNAMIC_LIB_PATH $RES_DIR || exit 1
 
-#rustup target add aarch64-apple-darwin
-#cargo build --target aarch64-apple-darwin || exit 1
-cargo build --release --features uniffi || exit 1
-$UNIFFI_BINDGEN_BIN generate bindings/ldk_node.udl --language kotlin -o "$TARGET_DIR" || exit 1
+	rustup target add aarch64-apple-darwin || exit 1
+	cargo build --release --target aarch64-apple-darwin --features uniffi || exit 1
+	DYNAMIC_LIB_PATH="target/aarch64-apple-darwin/release/libldk_node.dylib"
+	RES_DIR="$BINDINGS_DIR/$PROJECT_DIR/lib/src/main/resources/darwin-aarch64/"
+	mkdir -p $RES_DIR || exit 1
+	cp $DYNAMIC_LIB_PATH $RES_DIR || exit 1
+fi
 
 mkdir -p "$BINDINGS_DIR"/"$PROJECT_DIR"/lib/src/main/kotlin/"$PACKAGE_DIR" || exit 1
-mkdir -p "$BINDINGS_DIR"/"$PROJECT_DIR"/lib/src/main/resources/darwin-aarch64/ || exit 1
+$UNIFFI_BINDGEN_BIN generate bindings/ldk_node.udl --language kotlin -o "$TARGET_DIR" || exit 1
 
 cp "$TARGET_DIR"/"$PACKAGE_DIR"/ldk_node.kt "$BINDINGS_DIR"/"$PROJECT_DIR"/lib/src/main/kotlin/"$PACKAGE_DIR"/ || exit 1
-#cp ./target/aarch64-apple-darwin/debug/libldk_node.dylib "$BINDINGS_DIR"/"$PROJECT_DIR"/lib/src/main/resources/darwin-aarch64/libldk_node.dylib || exit 1
-cp $DYNAMIC_LIB_PATH "$BINDINGS_DIR"/"$PROJECT_DIR"/lib/src/main/resources/libldk_node.dylib || exit 1