From d603932e23f6b4ec7c718cb31e5178df445cbb1c Mon Sep 17 00:00:00 2001
From: thunderbiscuit <thunderbiscuit@protonmail.com>
Date: Wed, 14 Sep 2022 14:07:03 -0400
Subject: [PATCH] Update publishing CI workflow

---
 .github/workflows/publish-android.yaml |  9 +++++++--
 .github/workflows/publish-jvm.yaml     | 17 ++++++++++++-----
 bdk-jvm/plugins/README.md              |  2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/publish-android.yaml b/.github/workflows/publish-android.yaml
index 5a6ba2d..26ab381 100644
--- a/.github/workflows/publish-android.yaml
+++ b/.github/workflows/publish-android.yaml
@@ -44,7 +44,9 @@ jobs:
         run: rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi
 
       - name: Build bdk-android library
-        run: ./gradlew :android:buildAndroidLib
+        run: |
+          cd bdk-android
+          ./gradlew buildAndroidLib
 
       - name: Publish to Maven Local and Maven Central
         env:
@@ -53,4 +55,7 @@ jobs:
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.PGP_PASSPHRASE }}
           ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.NEXUS_USERNAME }}
           ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.NEXUS_PASSWORD }}
-        run: ./gradlew :android:publishToSonatype closeAndReleaseSonatypeStagingRepository
+        run: |
+          cd bdk-android
+          ./gradlew publishToSonatype
+#          ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
diff --git a/.github/workflows/publish-jvm.yaml b/.github/workflows/publish-jvm.yaml
index ac8f82a..56c14f1 100644
--- a/.github/workflows/publish-jvm.yaml
+++ b/.github/workflows/publish-jvm.yaml
@@ -36,7 +36,9 @@ jobs:
         run: rustup target add aarch64-apple-darwin
 
       - name: Build bdk-jvm library
-        run: ./gradlew :jvm:buildJvmLib
+        run: |
+          cd bdk-jvm
+          ./gradlew buildJvmLib
 
       # build aarch64 + x86_64 native libraries and upload
       - name: Upload macOS native libraries for reuse in publishing job
@@ -44,7 +46,7 @@ jobs:
         with:
           # name: no name is required because we upload the entire directory
           # the default name "artifact" will be used
-          path: /Users/runner/work/bdk-kotlin/bdk-kotlin/jvm/src/main/resources/
+          path: /Users/runner/work/bdk-kotlin/bdk-kotlin/bdk-jvm/lib/src/main/resources/
 
   build-jvm-full-library:
     name: Create full bdk-jvm library
@@ -75,7 +77,9 @@ jobs:
           java-version: 11
 
       - name: Build bdk-jvm library
-        run: ./gradlew :jvm:buildJvmLib
+        run: |
+          cd bdk-jvm
+          ./gradlew buildJvmLib
 
       - name: Download macOS native libraries from previous job
         uses: actions/download-artifact@v3
@@ -83,7 +87,7 @@ jobs:
         with:
           # download the artifact created in the prior job (named "artifact")
           name: artifact
-          path: ./jvm/src/main/resources/
+          path: ./bdk-jvm/lib/src/main/resources/
 
       - name: Publish to Maven Central
         env:
@@ -92,4 +96,7 @@ jobs:
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.PGP_PASSPHRASE }}
           ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.NEXUS_USERNAME }}
           ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.NEXUS_PASSWORD }}
-        run: ./gradlew :jvm:publishToSonatype closeAndReleaseSonatypeStagingRepository
+        run: |
+          cd bdk-jvm
+          ./gradlew publishToSonatype
+#          ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
diff --git a/bdk-jvm/plugins/README.md b/bdk-jvm/plugins/README.md
index c008327..b80e5d2 100644
--- a/bdk-jvm/plugins/README.md
+++ b/bdk-jvm/plugins/README.md
@@ -1,5 +1,5 @@
 # Readme
-The purpose of this directory is to host the Gradle plugin that add tasks for building the native binaries required by bdk-jvm, and building the language bindings files.
+The purpose of this directory is to host the Gradle plugin that adds tasks for building the native binaries required by bdk-jvm, and building the language bindings files.
 
 The plugin is applied to the `build.gradle.kts` file through the `plugins` block:
 ```kotlin