build: pin rust compiler to 1.85.1

Author: thunderbiscuit

.github/workflows/cont_integration.yml

@@ -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

.github/workflows/test-android.yaml

@@ -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:

README.md

@@ -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
 

bdk-android/scripts/build-linux-x86_64.sh

@@ -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

bdk-android/scripts/build-macos-aarch64.sh

@@ -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

bdk-android/scripts/build-windows-x86_64.sh

@@ -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

bdk-ffi/rust-toolchain.toml

@@ -0,0 +1,3 @@
+[toolchain]
+channel = "1.85.1"
+components = ["clippy", "rustfmt"]

bdk-swift/build-xcframework.sh

@@ -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