Skip to content
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

Use the new v3 resolver for msrv compliant dependency versions #99

Merged
merged 1 commit into from
Nov 26, 2024
Merged

Use the new v3 resolver for msrv compliant dependency versions #99

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
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
pull_request:

jobs:
# Proxy application is not as strict as protocol library.
proxy:
runs-on: ubuntu-latest
strategy:
Expand Down
84 changes: 39 additions & 45 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
[workspace]
members = ["protocol", "proxy"]
# Resolving transitive dependencies which are MSRV compliant with resolver v3,
# but the v3 resolver is only available in rustc > 1.84.0.
#
# 1. Update workspace resolver setting to `3`.
# 2. Hop over to a toolchain with rust version > 1.84.0.
# 3. Run `cargo update` to fix up lock file versions.
# 4. Set workspace resolver setting back to `2` to support MSRV.
#
# Once MSRV > 1.84.0 this setting can be dropped since the default is then v3.
resolver = "2"
1 change: 0 additions & 1 deletion proxy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ license-file = "LICENSE"
description = "BIP324 proxy enabling v1-only clients to use the v2 Bitcoin P2P Protocol"
repository = "https://github.com/rust-bitcoin/bip324"
readme = "README.md"
rust-version = "1.63.0"

[package.metadata.configure_me]
spec = "config_spec.toml"
Expand Down