Skip to content

Update Rust compiler to 1.85.1 #851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thunderbiscuit merged 1 commit into from
Sep 5, 2025
Merged

Update Rust compiler to 1.85.1 #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/workflows/cont_integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@ jobs:
defaults:
run:
working-directory: bdk-ffi
strategy:
matrix:
rust:
- version: 1.84.1
clippy: true

steps:
- name: "Checkout"
uses: actions/checkout@v4
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/test-android.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ jobs:
with:
ndk-version: r26c

- name: "Install Rust"
uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.84.1

- name: "Cache Rust"
uses: actions/cache@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ just publishlocal

## Minimum Supported Rust Version (MSRV)

This library should compile with any combination of features with Rust 1.84.1.
This library should compile with any combination of features with Rust 1.85.1.

## Contributing

Expand Down
1 change: 0 additions & 1 deletion bdk-android/scripts/build-linux-x86_64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ RESOURCE_DIR_ARMEABI_V7A="armeabi-v7a"

# Move to the Rust library directory
cd ../bdk-ffi/ || exit
rustup default 1.84.1
rustup target add $COMPILATION_TARGET_ARM64_V8A $COMPILATION_TARGET_ARMEABI_V7A $COMPILATION_TARGET_X86_64

# Build the binaries
Expand Down
1 change: 0 additions & 1 deletion bdk-android/scripts/build-macos-aarch64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ RESOURCE_DIR_ARMEABI_V7A="armeabi-v7a"

# Move to the Rust library directory
cd ../bdk-ffi/ || exit
rustup default 1.84.1
rustup target add $COMPILATION_TARGET_ARM64_V8A $COMPILATION_TARGET_ARMEABI_V7A $COMPILATION_TARGET_X86_64

# Build the binaries
Expand Down
1 change: 0 additions & 1 deletion bdk-android/scripts/build-windows-x86_64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ RESOURCE_DIR_ARMEABI_V7A="armeabi-v7a"

# Move to the Rust library directory
cd ../bdk-ffi/ || exit
rustup default 1.84.1
rustup target add $COMPILATION_TARGET_ARM64_V8A $COMPILATION_TARGET_ARMEABI_V7A $COMPILATION_TARGET_X86_64

# Build the binaries
Expand Down
3 changes: 3 additions & 0 deletions bdk-ffi/rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[toolchain]
channel = "1.85.1"
components = ["clippy", "rustfmt"]
7 changes: 3 additions & 4 deletions bdk-swift/build-xcframework.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,16 @@ NAME="bdkffi"
STATIC_LIB_NAME="lib${NAME}.a"
NEW_HEADER_DIR="../bdk-ffi/target/include"

# set required rust version and install component and targets
rustup default 1.84.1
cd ../bdk-ffi/ || exit

# install component and targets
rustup component add rust-src
rustup target add aarch64-apple-ios # iOS arm64
rustup target add x86_64-apple-ios # iOS x86_64
rustup target add aarch64-apple-ios-sim # simulator mac M1
rustup target add aarch64-apple-darwin # mac M1
rustup target add x86_64-apple-darwin # mac x86_64

cd ../bdk-ffi/ || exit

# build bdk-ffi rust lib for apple targets
cargo build --package bdk-ffi --profile release-smaller --target x86_64-apple-darwin
cargo build --package bdk-ffi --profile release-smaller --target aarch64-apple-darwin
Expand Down
Loading