frost/bdk-ffi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update android and jvm workflows and plugins for root rust /target

Browse Source
This commit is contained in:
Steve Myers 2022-11-14 19:53:07 -06:00
parent 8857c851f6
commit 063f69222a
No known key found for this signature in database
GPG Key ID: 8105A46B22C2D051
7 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/audit.yml vendored
View File

@ -16,5 +16,4 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions-rs/audit-check@v1 - uses: actions-rs/audit-check@v1
with: with:
args: --manifest-path bdk-ffi/Cargo.toml
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}

2
.github/workflows/publish-android.yaml vendored
View File

@ -26,7 +26,7 @@ jobs:
path: | path: |
~/.cargo/registry ~/.cargo/registry
~/.cargo/git ~/.cargo/git
bdk-ffi/target ./target
key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }} key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
- name: Set up JDK - name: Set up JDK

4
.github/workflows/publish-jvm.yaml vendored
View File

@ -15,7 +15,7 @@ jobs:
path: | path: |
~/.cargo/registry ~/.cargo/registry
~/.cargo/git ~/.cargo/git
./bdk-ffi/target ./target
key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }} key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
- name: Set up JDK - name: Set up JDK
@ -59,7 +59,7 @@ jobs:
path: | path: |
~/.cargo/registry ~/.cargo/registry
~/.cargo/git ~/.cargo/git
./bdk-ffi/target ./target
key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }} key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
- name: Set up JDK - name: Set up JDK

2
.github/workflows/test-android.yaml vendored
View File

@ -34,7 +34,7 @@ jobs:
path: | path: |
~/.cargo/registry ~/.cargo/registry
~/.cargo/git ~/.cargo/git
bdk-ffi/target ./target
key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }} key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
- name: Set up JDK - name: Set up JDK

2
.github/workflows/test-jvm.yaml vendored
View File

@ -22,7 +22,7 @@ jobs:
path: | path: |
~/.cargo/registry ~/.cargo/registry
~/.cargo/git ~/.cargo/git
bdk-ffi/target ./target
key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }} key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
- name: Set up JDK - name: Set up JDK

8
bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt
View File

@ -114,7 +114,7 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
} }
} }
// move the native libs build by cargo from bdk-ffi/target/<architecture>/release/ // move the native libs build by cargo from target/<architecture>/release/
// to their place in the bdk-android library // to their place in the bdk-android library
// the task only copies the available binaries built using the buildAndroid<architecture>Binary tasks // the task only copies the available binaries built using the buildAndroid<architecture>Binary tasks
val moveNativeAndroidLibs by tasks.register<Copy>("moveNativeAndroidLibs") { val moveNativeAndroidLibs by tasks.register<Copy>("moveNativeAndroidLibs") {
@ -124,15 +124,15 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
into("${project.projectDir}/../lib/src/main/jniLibs/") into("${project.projectDir}/../lib/src/main/jniLibs/")
into("arm64-v8a") { 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") { 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") { 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 { doLast {

4
bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt
View File

@ -37,7 +37,7 @@ internal class UniFfiJvmPlugin : Plugin<Project> {
} }
} }
// 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 // to their place in the bdk-jvm library
val moveNativeJvmLibs by tasks.register<DefaultTask>("moveNativeJvmLibs") { val moveNativeJvmLibs by tasks.register<DefaultTask>("moveNativeJvmLibs") {
@ -76,7 +76,7 @@ internal class UniFfiJvmPlugin : Plugin<Project> {
doFirst { doFirst {
copy { copy {
with(it) { 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}/") into("${project.projectDir}/../../bdk-jvm/lib/src/main/resources/${this.resDir}/")
} }
} }