Skip to content

Commit

Permalink
chore: bump rust compiler and android ndk versions
Browse files Browse the repository at this point in the history
  • Loading branch information
thunderbiscuit committed Nov 9, 2023
1 parent fd85d1d commit 9df7881
Show file tree
Hide file tree
Showing 8 changed files with 477 additions and 199 deletions.
23 changes: 13 additions & 10 deletions .github/workflows/test-android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions bdk-android/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,21 +55,21 @@ _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
rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi
```
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
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Loading

0 comments on commit 9df7881

Please sign in to comment.