From cd55d01f72945a1c14b21022e431785f1aa52259 Mon Sep 17 00:00:00 2001
From: Steve Myers <steve@notmandatory.org>
Date: Sat, 18 Dec 2021 10:45:08 -0800
Subject: [PATCH] Upgrade gradle and sdk and dependency versions

---
 README.md                                |  7 ++++---
 android/build.gradle                     | 19 +++++++++----------
 build.gradle                             | 13 ++-----------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 jvm/build.gradle                         |  6 +++---
 5 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index c0e4388..32789eb 100644
--- a/README.md
+++ b/README.md
@@ -69,11 +69,11 @@ val newAddress = wallet.getNewAddress()
    ```
 1. Publish   
    ```shell
-   ./gradlew :jvm:publishReleasePublicationToMavenLocal
-   ./gradlew :android:publishReleasePublicationToMavenLocal
+   ./gradlew :jvm:publishToMavenLocal
+   ./gradlew :android:publishToMavenLocal
    ```
 
-### How to publish to maven central (project maintainers only)
+### How to publish to maven central with [Gradle Nexus Publish Plugin] (project maintainers only)
 
 1. Set your `~/.gradle/gradle.properties` signing key values and SONATYPE login
    ```properties
@@ -96,3 +96,4 @@ val newAddress = wallet.getNewAddress()
 [`bdk`]: https://github.com/bitcoindevkit/bdk
 [`bdk-ffi`]: https://github.com/bitcoindevkit/bdk-ffi
 ["Getting Started (Developer)"]: https://github.com/bitcoindevkit/bdk-ffi#getting-started-developer
+[Gradle Nexus Publish Plugin]: https://github.com/gradle-nexus/publish-plugin
diff --git a/android/build.gradle b/android/build.gradle
index 3d68c8d..eddc329 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -4,11 +4,11 @@ apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 
@@ -27,13 +27,13 @@ android {
 dependencies {
     implementation 'net.java.dev.jna:jna:5.8.0@aar'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
     api "org.slf4j:slf4j-api:1.7.30"
 
     androidTestImplementation 'com.github.tony19:logback-android:2.0.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1'
 }
 
@@ -43,14 +43,13 @@ afterEvaluate {
         publications {
             // Creates a Maven publication called "release".
             release(MavenPublication) {
+                // Applies the component for the release build variant.
+                from components.release
 
                 // You can then customize attributes of the publication as shown below.
                 groupId = 'org.bitcoindevkit'
                 artifactId = 'bdk-android'
-                version = '0.2.0'
-
-                // Applies the component for the release build variant.
-                from components.release
+                version = '0.2.2'
 
                 pom {
                     name = 'bdk-android'
diff --git a/build.gradle b/build.gradle
index 5946db4..4fa13db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,30 +1,21 @@
 buildscript {
-    ext.kotlin_version = '1.5.10'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 plugins {
-    id "java-library"
     id "signing"
     id "maven-publish"
     id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
 }
 
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            from(components.java)
-        }
-    }
-}
-
 signing {
     def signingKey = findProperty("signingKey")
     def signingPassword = findProperty("signingPassword")
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffed3a2..d2880ba 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/jvm/build.gradle b/jvm/build.gradle
index 9354102..c0a8c15 100644
--- a/jvm/build.gradle
+++ b/jvm/build.gradle
@@ -34,11 +34,11 @@ afterEvaluate {
         publications {
 
             release(MavenPublication) {
+                from components.java
+
                 groupId = 'org.bitcoindevkit'
                 artifactId = 'bdk-jvm'
-                version = '0.2.0'
-
-                from components.java
+                version = '0.2.2'
 
                 pom {
                     name = 'bdk-jvm'