From 063f69222aa0087850d63fc186acb6eb8cbbb3ef Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Mon, 14 Nov 2022 19:53:07 -0600 Subject: [PATCH] Update android and jvm workflows and plugins for root rust /target --- .github/workflows/audit.yml | 1 - .github/workflows/publish-android.yaml | 2 +- .github/workflows/publish-jvm.yaml | 4 ++-- .github/workflows/test-android.yaml | 2 +- .github/workflows/test-jvm.yaml | 2 +- .../org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt | 8 ++++---- .../kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt | 4 ++-- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index ae54e31..b170630 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -16,5 +16,4 @@ jobs: - uses: actions/checkout@v2 - uses: actions-rs/audit-check@v1 with: - args: --manifest-path bdk-ffi/Cargo.toml token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/publish-android.yaml b/.github/workflows/publish-android.yaml index f5c76f6..ebe1f71 100644 --- a/.github/workflows/publish-android.yaml +++ b/.github/workflows/publish-android.yaml @@ -26,7 +26,7 @@ jobs: path: | ~/.cargo/registry ~/.cargo/git - bdk-ffi/target + ./target key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }} - name: Set up JDK diff --git a/.github/workflows/publish-jvm.yaml b/.github/workflows/publish-jvm.yaml index 05cdf15..74daff6 100644 --- a/.github/workflows/publish-jvm.yaml +++ b/.github/workflows/publish-jvm.yaml @@ -15,7 +15,7 @@ jobs: path: | ~/.cargo/registry ~/.cargo/git - ./bdk-ffi/target + ./target key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }} - name: Set up JDK @@ -59,7 +59,7 @@ jobs: path: | ~/.cargo/registry ~/.cargo/git - ./bdk-ffi/target + ./target key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }} - name: Set up JDK diff --git a/.github/workflows/test-android.yaml b/.github/workflows/test-android.yaml index 8896552..5083f57 100644 --- a/.github/workflows/test-android.yaml +++ b/.github/workflows/test-android.yaml @@ -34,7 +34,7 @@ jobs: path: | ~/.cargo/registry ~/.cargo/git - bdk-ffi/target + ./target key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }} - name: Set up JDK diff --git a/.github/workflows/test-jvm.yaml b/.github/workflows/test-jvm.yaml index 9dc99c1..9116887 100644 --- a/.github/workflows/test-jvm.yaml +++ b/.github/workflows/test-jvm.yaml @@ -22,7 +22,7 @@ jobs: path: | ~/.cargo/registry ~/.cargo/git - bdk-ffi/target + ./target key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }} - name: Set up JDK 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 55b14bc..4d2b16d 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 @@ -114,7 +114,7 @@ internal class UniFfiAndroidPlugin : Plugin { } } - // move the native libs build by cargo from bdk-ffi/target//release/ + // move the native libs build by cargo from target//release/ // to their place in the bdk-android library // the task only copies the available binaries built using the buildAndroidBinary tasks val moveNativeAndroidLibs by tasks.register("moveNativeAndroidLibs") { @@ -124,15 +124,15 @@ internal class UniFfiAndroidPlugin : Plugin { into("${project.projectDir}/../lib/src/main/jniLibs/") into("arm64-v8a") { - from("${project.projectDir}/../../bdk-ffi/target/aarch64-linux-android/release-smaller/libbdkffi.so") + from("${project.projectDir}/../../target/aarch64-linux-android/release-smaller/libbdkffi.so") } into("x86_64") { - from("${project.projectDir}/../../bdk-ffi/target/x86_64-linux-android/release-smaller/libbdkffi.so") + from("${project.projectDir}/../../target/x86_64-linux-android/release-smaller/libbdkffi.so") } into("armeabi-v7a") { - from("${project.projectDir}/../../bdk-ffi/target/armv7-linux-androideabi/release-smaller/libbdkffi.so") + from("${project.projectDir}/../../target/armv7-linux-androideabi/release-smaller/libbdkffi.so") } doLast { diff --git a/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt b/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt index 04e5b13..3bad185 100644 --- a/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt +++ b/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt @@ -37,7 +37,7 @@ internal class UniFfiJvmPlugin : Plugin { } } - // move the native libs build by cargo from bdk-ffi/target/.../release/ + // move the native libs build by cargo from target/.../release/ // to their place in the bdk-jvm library val moveNativeJvmLibs by tasks.register("moveNativeJvmLibs") { @@ -76,7 +76,7 @@ internal class UniFfiJvmPlugin : Plugin { doFirst { copy { with(it) { - from("${project.projectDir}/../../bdk-ffi/target/${this.targetDir}/release-smaller/libbdkffi.${this.ext}") + from("${project.projectDir}/../../target/${this.targetDir}/release-smaller/libbdkffi.${this.ext}") into("${project.projectDir}/../../bdk-jvm/lib/src/main/resources/${this.resDir}/") } }