diff --git a/.github/workflows/test-android.yaml b/.github/workflows/test-android.yaml index 48abe6b1..afec5eba 100644 --- a/.github/workflows/test-android.yaml +++ b/.github/workflows/test-android.yaml @@ -14,19 +14,22 @@ on: # We replace the default environment variable ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/25.2.9519653 # with an older version of the NDK (21.4.7075529) using the fix proposed here: https://github.com/actions/runner-images/issues/5930 # For information on why this is needed at the moment see issues #242 and #243, and PR #282 -env: - ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/21.4.7075529 +# env: +# ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/21.4.7075529 jobs: build: runs-on: ubuntu-20.04 steps: - - name: "Install Android NDK 21.4.7075529" - run: | - ANDROID_ROOT=/usr/local/lib/android - ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk - SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager - echo "y" | $SDKMANAGER "ndk;21.4.7075529" + # - name: "Install Android NDK 21.4.7075529" + # run: | + # ANDROID_ROOT=/usr/local/lib/android + # ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk + # SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager + # echo "y" | $SDKMANAGER "ndk;21.4.7075529" + + - name: "Show default version of NDK" + run: echo $ANDROID_NDK_ROOT - name: "Check out PR branch" uses: actions/checkout@v3 @@ -46,8 +49,8 @@ jobs: distribution: temurin java-version: 11 - - name: "Set default Rust version to 1.67.0" - run: rustup default 1.67.0 + - name: "Set default Rust version to 1.73.0" + run: rustup default 1.73.0 - name: "Install Rust Android targets" run: rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi diff --git a/bdk-android/README.md b/bdk-android/README.md index d8c304a9..8567e192 100644 --- a/bdk-android/README.md +++ b/bdk-android/README.md @@ -55,10 +55,10 @@ _Note that Kotlin version `1.6.10` or later is required to build the library._ git clone https://github.com/bitcoindevkit/bdk-ffi ``` 2. Follow the "General" bdk-ffi ["Getting Started (Developer)"] instructions. -3. Install Rust (note that we are currently building using Rust 1.67.0): +3. Install Rust (note that we are currently building using Rust 1.73.0): ```shell curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -rustup default 1.67.0 +rustup default 1.73.0 ``` 4. Install required targets ```sh @@ -66,10 +66,10 @@ rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-android ``` 5. Install Android SDK and Build-Tools for API level 30+ 6. Setup `$ANDROID_SDK_ROOT` and `$ANDROID_NDK_ROOT` path variables (which are required by the - build tool), for example (note that currently, NDK version 21.4.7075529 is required): + build tool), for example (note that currently, NDK version 25.2.9519653 or above is required): ```shell export ANDROID_SDK_ROOT=~/Android/Sdk -export ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/21.4.7075529 +export ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/25.2.9519653 ``` 7. Build kotlin bindings ```sh diff --git a/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/OfflineDescriptorTest.kt b/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/OfflineDescriptorTest.kt index 22fcb717..84788065 100644 --- a/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/OfflineDescriptorTest.kt +++ b/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/OfflineDescriptorTest.kt @@ -1,9 +1,9 @@ package org.bitcoindevkit import kotlin.test.Test -import kotlin.test.assertTrue import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.runner.RunWith +import kotlin.test.assertEquals @RunWith(AndroidJUnit4::class) class OfflineDescriptorTest {