From 43ff1fb394585feedfdc8a113f5e76a13bbbd04a Mon Sep 17 00:00:00 2001
From: thunderbiscuit <thunderbiscuit@protonmail.com>
Date: Thu, 28 Mar 2024 12:09:13 -0400
Subject: [PATCH] build: update android build tools and configurations

---
 bdk-android/build.gradle.kts                     | 16 ++++++----------
 .../gradle/wrapper/gradle-wrapper.properties     |  3 ++-
 bdk-android/lib/build.gradle.kts                 | 15 +++++----------
 bdk-android/settings.gradle.kts                  | 15 +++++++++++++++
 4 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/bdk-android/build.gradle.kts b/bdk-android/build.gradle.kts
index c465913..32e52b4 100644
--- a/bdk-android/build.gradle.kts
+++ b/bdk-android/build.gradle.kts
@@ -1,14 +1,10 @@
-buildscript {
-    repositories {
-        google()
-    }
-    dependencies {
-        classpath("com.android.tools.build:gradle:7.1.2")
-    }
-}
-
 plugins {
-    id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
+    id("com.android.library").version("8.3.1").apply(false)
+    id("org.jetbrains.kotlin.android").version("1.6.10").apply(false)
+    id("org.gradle.maven-publish")
+    id("org.gradle.signing")
+    id("org.bitcoindevkit.plugins.generate-android-bindings").apply(false)
+    id("io.github.gradle-nexus.publish-plugin").version("1.1.0").apply(true)
 }
 
 // library version is defined in gradle.properties
diff --git a/bdk-android/gradle/wrapper/gradle-wrapper.properties b/bdk-android/gradle/wrapper/gradle-wrapper.properties
index d2880ba..852b45f 100644
--- a/bdk-android/gradle/wrapper/gradle-wrapper.properties
+++ b/bdk-android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Thu Mar 28 12:04:56 EDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/bdk-android/lib/build.gradle.kts b/bdk-android/lib/build.gradle.kts
index e4fe265..8d6ef0b 100644
--- a/bdk-android/lib/build.gradle.kts
+++ b/bdk-android/lib/build.gradle.kts
@@ -5,25 +5,20 @@ val libraryVersion: String by project
 
 plugins {
     id("com.android.library")
-    id("org.jetbrains.kotlin.android") version "1.6.10"
-    id("maven-publish")
-    id("signing")
+    id("org.jetbrains.kotlin.android")
+    id("org.gradle.maven-publish")
+    id("org.gradle.signing")
 
     // Custom plugin to generate the native libs and bindings file
     id("org.bitcoindevkit.plugins.generate-android-bindings")
 }
 
-repositories {
-    mavenCentral()
-    google()
-}
-
 android {
-    compileSdk = 33
+    namespace = "org.bitcoindevkit"
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 33
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
     }
diff --git a/bdk-android/settings.gradle.kts b/bdk-android/settings.gradle.kts
index ef7d1eb..8676745 100644
--- a/bdk-android/settings.gradle.kts
+++ b/bdk-android/settings.gradle.kts
@@ -2,3 +2,18 @@ rootProject.name = "bdk-android"
 
 include(":lib")
 includeBuild("plugins")
+
+pluginManagement {
+    repositories {
+        google()
+        gradlePluginPortal()
+        mavenCentral()
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+        google()
+    }
+}