Skip to content

Commit ad53805

Browse files
committed
Updgrade dependencies and pin for MSRV
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.
1 parent 3306155 commit ad53805

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

client/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ log = "0.4.5"
2525
jsonrpc = "0.14.0"
2626

2727
# Used for deserialization of JSON.
28-
serde = "1"
29-
serde_json = "1"
28+
serde_json = "1.0.96"
29+
serde_test = "1.0.106"
3030

3131
[dev-dependencies]
32-
tempfile = "3.3.0"
32+
tempfile = "3.6.0"
3333

contrib/run_task.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ main() {
5959
;;
6060

6161
msrv)
62+
do_msrv_pins
6263
build_and_test "+$MSRV"
6364
;;
6465

@@ -86,6 +87,15 @@ build_and_test() {
8687
cargo "$toolchain" test --workspace
8788
}
8889

90+
# Pin dependencies to get the MSRV build to work.
91+
do_msrv_pins() {
92+
cargo update -p tempfile --precise 3.6.0
93+
cargo update -p cc --precise 1.0.79
94+
cargo update -p log --precise 0.4.18
95+
cargo update -p serde_json --precise 1.0.96
96+
cargo update -p serde --precise 1.0.156
97+
}
98+
8999
# Lint the workspace.
90100
do_lint() {
91101
cargo +nightly clippy --workspace --all-targets --keep-going -- -D warnings

json/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ name = "bitcoincore_rpc_json"
2020
path = "src/lib.rs"
2121

2222
[dependencies]
23-
serde = { version = "1", features = [ "derive" ] }
24-
serde_json = "1"
23+
serde = { version = "1.0.156", features = [ "derive" ] }
24+
serde_json = "1.0.96"
2525

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

0 commit comments

Comments
 (0)