Skip to content

Commit 9df7881

Browse files
chore: bump rust compiler and android ndk versions
1 parent fd85d1d commit 9df7881

File tree

8 files changed

+477
-199
lines changed

8 files changed

+477
-199
lines changed

.github/workflows/test-android.yaml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,22 @@ on:
1414
# We replace the default environment variable ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/25.2.9519653
1515
# with an older version of the NDK (21.4.7075529) using the fix proposed here: https://github.com/actions/runner-images/issues/5930
1616
# For information on why this is needed at the moment see issues #242 and #243, and PR #282
17-
env:
18-
ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/21.4.7075529
17+
# env:
18+
# ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/21.4.7075529
1919

2020
jobs:
2121
build:
2222
runs-on: ubuntu-20.04
2323
steps:
24-
- name: "Install Android NDK 21.4.7075529"
25-
run: |
26-
ANDROID_ROOT=/usr/local/lib/android
27-
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
28-
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
29-
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
24+
# - name: "Install Android NDK 21.4.7075529"
25+
# run: |
26+
# ANDROID_ROOT=/usr/local/lib/android
27+
# ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
28+
# SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
29+
# echo "y" | $SDKMANAGER "ndk;21.4.7075529"
30+
31+
- name: "Show default version of NDK"
32+
run: echo $ANDROID_NDK_ROOT
3033

3134
- name: "Check out PR branch"
3235
uses: actions/checkout@v3
@@ -46,8 +49,8 @@ jobs:
4649
distribution: temurin
4750
java-version: 11
4851

49-
- name: "Set default Rust version to 1.67.0"
50-
run: rustup default 1.67.0
52+
- name: "Set default Rust version to 1.73.0"
53+
run: rustup default 1.73.0
5154

5255
- name: "Install Rust Android targets"
5356
run: rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi

bdk-android/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,21 @@ _Note that Kotlin version `1.6.10` or later is required to build the library._
5555
git clone https://github.com/bitcoindevkit/bdk-ffi
5656
```
5757
2. Follow the "General" bdk-ffi ["Getting Started (Developer)"] instructions.
58-
3. Install Rust (note that we are currently building using Rust 1.67.0):
58+
3. Install Rust (note that we are currently building using Rust 1.73.0):
5959
```shell
6060
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
61-
rustup default 1.67.0
61+
rustup default 1.73.0
6262
```
6363
4. Install required targets
6464
```sh
6565
rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi
6666
```
6767
5. Install Android SDK and Build-Tools for API level 30+
6868
6. Setup `$ANDROID_SDK_ROOT` and `$ANDROID_NDK_ROOT` path variables (which are required by the
69-
build tool), for example (note that currently, NDK version 21.4.7075529 is required):
69+
build tool), for example (note that currently, NDK version 25.2.9519653 or above is required):
7070
```shell
7171
export ANDROID_SDK_ROOT=~/Android/Sdk
72-
export ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/21.4.7075529
72+
export ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/25.2.9519653
7373
```
7474
7. Build kotlin bindings
7575
```sh

bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/OfflineDescriptorTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.bitcoindevkit
22

33
import kotlin.test.Test
4-
import kotlin.test.assertTrue
54
import androidx.test.ext.junit.runners.AndroidJUnit4
65
import org.junit.runner.RunWith
6+
import kotlin.test.assertEquals
77

88
@RunWith(AndroidJUnit4::class)
99
class OfflineDescriptorTest {

0 commit comments

Comments
 (0)