Skip to content

Commit

Permalink
Updgrade dependencies and pin for MSRV
Browse files Browse the repository at this point in the history
Currently, after upgrading `bitcoin` the MSRV build no longer works
because of dependency issues. I'm a little confused by them but the
following seems to fix it:

- Upgrade minimum dependency patch version number for `serde` and
  `serde_json`.

- Upgrade the dev dependency minor version for `tempfile`.

- In CI for the MSRV build pin some crate versions.
  • Loading branch information
tcharding committed Apr 30, 2024
1 parent dd1a8c1 commit 9f02889
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
6 changes: 3 additions & 3 deletions client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ log = "0.4.5"
jsonrpc = "0.14.0"

# Used for deserialization of JSON.
serde = "1"
serde_json = "1"
serde = "1.0.156"
serde_json = "1.0.96"

[dev-dependencies]
tempfile = "3.3.0"
tempfile = "3.6.0"

10 changes: 10 additions & 0 deletions contrib/run_task.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ main() {
;;

msrv)
do_msrv_pins
build_and_test "+$MSRV"
;;

Expand Down Expand Up @@ -86,6 +87,15 @@ build_and_test() {
cargo "$toolchain" test --workspace
}

# Pin dependencies to get the MSRV build to work.
do_msrv_pins() {
cargo update -p tempfile --precise 3.6.0
cargo update -p cc --precise 1.0.79
cargo update -p log --precise 0.4.18
cargo update -p serde_json --precise 1.0.96
cargo update -p serde --precise 1.0.156
}

# Check the workspace formatting.
do_fmt() {
cargo +stable fmt --all --check
Expand Down
4 changes: 2 additions & 2 deletions json/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ name = "bitcoincore_rpc_json"
path = "src/lib.rs"

[dependencies]
serde = { version = "1", features = [ "derive" ] }
serde_json = "1"
serde = { version = "1.0.156", features = [ "derive" ] }
serde_json = "1.0.96"

bitcoin = { version = "0.32.0", features = ["serde", "rand-std"]}

0 comments on commit 9f02889

Please sign in to comment.