From 90c4fd33281c5d2a01f87dfa243df52189ac5ebd Mon Sep 17 00:00:00 2001
From: Steve Myers <steve@notmandatory.org>
Date: Mon, 21 Jun 2021 15:08:39 -0700
Subject: [PATCH] Add jna lib to jvm jar resources

---
 bdk-kotlin/jvm/build.gradle | 12 ------------
 build.sh                    |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/bdk-kotlin/jvm/build.gradle b/bdk-kotlin/jvm/build.gradle
index d22bf52..d356464 100644
--- a/bdk-kotlin/jvm/build.gradle
+++ b/bdk-kotlin/jvm/build.gradle
@@ -4,18 +4,6 @@ plugins {
     id 'maven-publish'
 }
 
-test {
-    environment "LD_LIBRARY_PATH", file("${projectDir}/libs/x86_64_linux").absolutePath
-    testLogging {
-        events "PASSED", "SKIPPED", "FAILED", "STANDARD_OUT", "STANDARD_ERROR"
-    }
-}
-
-//task buildRust(type: Exec) {
-//    workingDir '../'
-//    commandLine './build.sh'
-//}
-
 dependencies {
     implementation platform('org.jetbrains.kotlin:kotlin-bom')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
diff --git a/build.sh b/build.sh
index 831687a..c0f2ecd 100755
--- a/build.sh
+++ b/build.sh
@@ -10,8 +10,8 @@ export LD_LIBRARY_PATH=`pwd`/target/debug
 cc cc/bdk_ffi_test.c -o cc/bdk_ffi_test -L target/debug -l bdk_ffi -l pthread -l dl -l m
 
 # bdk-kotlin jar
-mkdir -p bdk-kotlin/jvm/libs/x86_64_linux
-cp target/debug/libbdk_ffi.so bdk-kotlin/jvm/libs/x86_64_linux
+mkdir -p bdk-kotlin/jvm/src/main/resources/jnaLibs/x86_64_linux
+cp target/debug/libbdk_ffi.so bdk-kotlin/jvm/src/main/resources/jnaLibs/x86_64_linux
 
 (cd bdk-kotlin && gradle :jvm:build)