From a9c6aac6b9dc60668db49f49a932314bcc4b2a4a Mon Sep 17 00:00:00 2001 From: thunderbiscuit Date: Thu, 9 Nov 2023 16:17:03 -0600 Subject: [PATCH] chore: bump rust compiler version to 1.73.0 for JVM and python builds --- .github/workflows/cont_integration.yml | 10 +--------- .github/workflows/live-tests.yaml | 4 ++-- .github/workflows/publish-jvm.yaml | 12 ++++++------ .github/workflows/test-jvm.yaml | 4 ++-- README.md | 13 +------------ bdk-jvm/README.md | 5 +++-- bdk-python/scripts/generate-linux.sh | 2 +- bdk-python/scripts/generate-macos-arm64.sh | 2 +- bdk-python/scripts/generate-macos-x86_64.sh | 2 +- bdk-python/scripts/generate-windows.sh | 2 +- 10 files changed, 19 insertions(+), 37 deletions(-) diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml index 7449238..5db79fd 100644 --- a/.github/workflows/cont_integration.yml +++ b/.github/workflows/cont_integration.yml @@ -17,10 +17,8 @@ jobs: strategy: matrix: rust: - - version: 1.67.0 + - version: 1.73.0 clippy: true - # TODO 1: Should we keep this? We'll need to pin dependencies - # - version: 1.61.0 # MSRV steps: - name: "Checkout" uses: actions/checkout@v3 @@ -50,12 +48,6 @@ jobs: - name: "Update toolchain" run: rustup update - - name: "Pin dependencies for MSRV" - if: matrix.rust.version == '1.61.0' - run: | - cargo update -p hashlink --precise "0.8.1" - cargo update -p tokio --precise "1.29.1" - cargo update -p flate2 --precise "1.0.26" - name: "Build" run: cargo build diff --git a/.github/workflows/live-tests.yaml b/.github/workflows/live-tests.yaml index 712b07d..ab8d80a 100644 --- a/.github/workflows/live-tests.yaml +++ b/.github/workflows/live-tests.yaml @@ -27,8 +27,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: "Build bdk-jvm library" run: | diff --git a/.github/workflows/publish-jvm.yaml b/.github/workflows/publish-jvm.yaml index 02a1553..bfb052a 100644 --- a/.github/workflows/publish-jvm.yaml +++ b/.github/workflows/publish-jvm.yaml @@ -24,8 +24,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 aarch64 Rust target" run: rustup target add aarch64-apple-darwin @@ -54,8 +54,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 x86_64-pc-windows-msvc Rust target" run: rustup target add x86_64-pc-windows-msvc @@ -94,8 +94,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: "Build bdk-jvm library" run: | diff --git a/.github/workflows/test-jvm.yaml b/.github/workflows/test-jvm.yaml index e2c0aa8..cb2e515 100644 --- a/.github/workflows/test-jvm.yaml +++ b/.github/workflows/test-jvm.yaml @@ -32,8 +32,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: "Run JVM tests" run: | diff --git a/README.md b/README.md index dd71835..1c0de89 100644 --- a/README.md +++ b/README.md @@ -28,18 +28,7 @@ The below directories (a separate repository in the case of bdk-swift) include i ## Minimum Supported Rust Version (MSRV) -This library should compile with any combination of features with Rust 1.61.0. - -To build with the MSRV you will need to pin dependencies as follows: - -```shell -# required for sqlite feature, hashlink 0.8.2 has MSRV 1.61.0 -cargo update -p hashlink --precise "0.8.1" -# tokio 1.30.0 has MSRV 1.63.0 -cargo update -p tokio --precise "1.29.1" -# flate2 1.0.27 and up do not work with Rust 1.61.0, but 1.0.26 does -cargo update -p flate2 --precise "1.0.26" -``` +This library should compile with any combination of features with Rust 1.73.0. ## Contributing diff --git a/bdk-jvm/README.md b/bdk-jvm/README.md index 8a28247..67057fa 100644 --- a/bdk-jvm/README.md +++ b/bdk-jvm/README.md @@ -54,10 +54,10 @@ curl -s "https://get.sdkman.io" | bash source "$HOME/.sdkman/bin/sdkman-init.sh" sdk install java 11.0.19-tem ``` -2. Install Rust (note that we are currently building using Rust 1.67.0): +2. 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 ``` 3. Clone this repository. ```shell @@ -95,6 +95,7 @@ Depending on the JVM version you use, you might not have the JNA dependency on y ```shell class file for com.sun.jna.Pointer not found ``` + The solution is to add JNA as a dependency like so: ```kotlin dependencies { diff --git a/bdk-python/scripts/generate-linux.sh b/bdk-python/scripts/generate-linux.sh index 5efd84f..e0e1430 100644 --- a/bdk-python/scripts/generate-linux.sh +++ b/bdk-python/scripts/generate-linux.sh @@ -9,7 +9,7 @@ cd ../bdk-ffi/ cargo run --bin uniffi-bindgen generate src/bdk.udl --language python --out-dir ../bdk-python/src/bdkpython/ --no-format echo "Generating native binaries..." -rustup default 1.67.0 +rustup default 1.73.0 cargo build --profile release-smaller echo "Copying linux libbdkffi.so..." diff --git a/bdk-python/scripts/generate-macos-arm64.sh b/bdk-python/scripts/generate-macos-arm64.sh index 43baa4c..b6f5b97 100644 --- a/bdk-python/scripts/generate-macos-arm64.sh +++ b/bdk-python/scripts/generate-macos-arm64.sh @@ -9,7 +9,7 @@ cd ../bdk-ffi/ cargo run --bin uniffi-bindgen generate src/bdk.udl --language python --out-dir ../bdk-python/src/bdkpython/ --no-format echo "Generating native binaries..." -rustup default 1.67.0 +rustup default 1.73.0 rustup target add aarch64-apple-darwin cargo build --profile release-smaller --target aarch64-apple-darwin diff --git a/bdk-python/scripts/generate-macos-x86_64.sh b/bdk-python/scripts/generate-macos-x86_64.sh index 9bcbef6..3d3607e 100644 --- a/bdk-python/scripts/generate-macos-x86_64.sh +++ b/bdk-python/scripts/generate-macos-x86_64.sh @@ -9,7 +9,7 @@ cd ../bdk-ffi/ cargo run --bin uniffi-bindgen generate src/bdk.udl --language python --out-dir ../bdk-python/src/bdkpython/ --no-format echo "Generating native binaries..." -rustup default 1.67.0 +rustup default 1.73.0 rustup target add x86_64-apple-darwin cargo build --profile release-smaller --target x86_64-apple-darwin diff --git a/bdk-python/scripts/generate-windows.sh b/bdk-python/scripts/generate-windows.sh index 7de032c..1660a28 100644 --- a/bdk-python/scripts/generate-windows.sh +++ b/bdk-python/scripts/generate-windows.sh @@ -9,7 +9,7 @@ cd ../bdk-ffi/ cargo run --bin uniffi-bindgen generate src/bdk.udl --language python --out-dir ../bdk-python/src/bdkpython/ --no-format echo "Generating native binaries..." -rustup default 1.67.0 +rustup default 1.73.0 rustup target add x86_64-pc-windows-msvc cargo build --profile release-smaller --target x86_64-pc-windows-msvc