From 33f37ae5933b350178aa84482195bbd1a62c6e37 Mon Sep 17 00:00:00 2001
From: Sudarsan Balaji <sudarsan.balaji@artfuldev.com>
Date: Thu, 21 Oct 2021 23:26:34 +0530
Subject: [PATCH] Export source files with aar

---
 bindings/bdk-kotlin/android/build.gradle               | 10 +++++-----
 bindings/bdk-kotlin/android/proguard-rules.pro         |  2 ++
 .../bitcoindevkit => uniffi}/bdk/AndroidLibTest.kt     |  2 +-
 .../bdk-kotlin/android/src/main/AndroidManifest.xml    |  2 +-
 build.sh                                               |  3 +++
 5 files changed, 12 insertions(+), 7 deletions(-)
 rename bindings/bdk-kotlin/android/src/androidTest/kotlin/{org/bitcoindevkit => uniffi}/bdk/AndroidLibTest.kt (95%)

diff --git a/bindings/bdk-kotlin/android/build.gradle b/bindings/bdk-kotlin/android/build.gradle
index f06c838..ef034b4 100644
--- a/bindings/bdk-kotlin/android/build.gradle
+++ b/bindings/bdk-kotlin/android/build.gradle
@@ -33,7 +33,7 @@ afterEvaluate {
                 from components.release
 
                 // You can then customize attributes of the publication as shown below.
-                groupId = 'org.bitcoindevkit'
+                groupId = 'uniffi.bdk'
                 artifactId = 'bdk'
                 version = '0.0.1-SNAPSHOT'
             }
@@ -42,7 +42,7 @@ afterEvaluate {
                 // Applies the component for the debug build variant.
                 from components.debug
 
-                groupId = 'org.bitcoindevkit'
+                groupId = 'uniffi.bdk'
                 artifactId = 'bdk-debug'
                 version = '0.0.1-SNAPSHOT'
             }
@@ -51,9 +51,9 @@ afterEvaluate {
 }
 
 dependencies {
-    implementation(project(':jvm')) {
-        exclude group: 'net.java.dev.jna', module: 'jna'
-    }
+//    implementation(project(':jvm')) {
+//        exclude group: 'net.java.dev.jna', module: 'jna'
+//    }
 
     implementation 'net.java.dev.jna:jna:5.8.0@aar'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
diff --git a/bindings/bdk-kotlin/android/proguard-rules.pro b/bindings/bdk-kotlin/android/proguard-rules.pro
index 172980c..e319ee0 100644
--- a/bindings/bdk-kotlin/android/proguard-rules.pro
+++ b/bindings/bdk-kotlin/android/proguard-rules.pro
@@ -23,4 +23,6 @@
 # for JNA
 -dontwarn java.awt.*
 -keep class com.sun.jna.* { *; }
+-keep class uniffi.bdk.* { *; }
+-keepclassmembers class * extends uniffi.bdk.* { public *; }
 -keepclassmembers class * extends com.sun.jna.* { public *; }
diff --git a/bindings/bdk-kotlin/android/src/androidTest/kotlin/org/bitcoindevkit/bdk/AndroidLibTest.kt b/bindings/bdk-kotlin/android/src/androidTest/kotlin/uniffi/bdk/AndroidLibTest.kt
similarity index 95%
rename from bindings/bdk-kotlin/android/src/androidTest/kotlin/org/bitcoindevkit/bdk/AndroidLibTest.kt
rename to bindings/bdk-kotlin/android/src/androidTest/kotlin/uniffi/bdk/AndroidLibTest.kt
index 9e1eec0..b339681 100644
--- a/bindings/bdk-kotlin/android/src/androidTest/kotlin/org/bitcoindevkit/bdk/AndroidLibTest.kt
+++ b/bindings/bdk-kotlin/android/src/androidTest/kotlin/uniffi/bdk/AndroidLibTest.kt
@@ -1,4 +1,4 @@
-package org.bitcoindevkit.bdk
+package uniffi.bdk
 
 import android.app.Application
 import android.content.Context.MODE_PRIVATE
diff --git a/bindings/bdk-kotlin/android/src/main/AndroidManifest.xml b/bindings/bdk-kotlin/android/src/main/AndroidManifest.xml
index c8fa4de..406335d 100644
--- a/bindings/bdk-kotlin/android/src/main/AndroidManifest.xml
+++ b/bindings/bdk-kotlin/android/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="org.bitcoindevkit.bdk">
+  package="uniffi.bdk">
 
   <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/build.sh b/build.sh
index d94e956..13302c7 100755
--- a/build.sh
+++ b/build.sh
@@ -82,6 +82,9 @@ build_android() {
       cp target/i686-linux-android/debug/libuniffi_bdk.so bindings/bdk-kotlin/android/src/main/jniLibs/x86
   fi
 
+  # copy sources
+  cp -R bindings/bdk-kotlin/jvm/src/main/ bindings/bdk-kotlin/android/src/main/
+
   # bdk-kotlin aar
   (cd bindings/bdk-kotlin && ./gradlew :android:build && ./gradlew :android:publishToMavenLocal)
 }