From 0eadff1327a88be4feb9e90da001b792a929f49c Mon Sep 17 00:00:00 2001
From: thunderbiscuit <thunderbiscuit@protonmail.com>
Date: Tue, 9 Apr 2024 16:15:08 -0400
Subject: [PATCH] build: small fixes related to gradle 8.7 upgrade

---
 bdk-android/lib/build.gradle.kts                            | 6 ++++++
 .../kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt | 2 ++
 bdk-android/settings.gradle.kts                             | 1 +
 3 files changed, 9 insertions(+)

diff --git a/bdk-android/lib/build.gradle.kts b/bdk-android/lib/build.gradle.kts
index b5a6e6b..a2123c3 100644
--- a/bdk-android/lib/build.gradle.kts
+++ b/bdk-android/lib/build.gradle.kts
@@ -105,6 +105,12 @@ afterEvaluate {
             }
         }
     }
+    
+    // This is required because we must ensure the moveNativeAndroidLibs task is executed after
+    // the mergeReleaseJniLibFolders (hard requirement introduced by our upgrade to Gradle 8.7)
+    tasks.named("mergeReleaseJniLibFolders") {
+        dependsOn(":lib:moveNativeAndroidLibs")
+    }
 }
 
 signing {
diff --git a/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt b/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt
index 56f4d1d..a16a5ff 100644
--- a/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt
+++ b/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt
@@ -113,6 +113,8 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
         val moveNativeAndroidLibs by tasks.register<Copy>("moveNativeAndroidLibs") {
 
             dependsOn(buildAndroidAarch64Binary)
+            dependsOn(buildAndroidArmv7Binary)
+            dependsOn(buildAndroidX86_64Binary)
 
             into("${project.projectDir}/../lib/src/main/jniLibs/")
 
diff --git a/bdk-android/settings.gradle.kts b/bdk-android/settings.gradle.kts
index 5426a69..cf43879 100644
--- a/bdk-android/settings.gradle.kts
+++ b/bdk-android/settings.gradle.kts
@@ -13,5 +13,6 @@ pluginManagement {
 dependencyResolutionManagement {
     repositories {
         mavenCentral()
+        google()
     }
 }