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

1.63 msrv #115

Merged
merged 2 commits into from
Nov 21, 2023
Merged

1.63 msrv #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
259fd2d
Use 1.63 MSRV
jbesraa Nov 15, 2023
2f49589
update edition and resolver
jbesraa Nov 17, 2023
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
5 changes: 3 additions & 2 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fail-fast: false
matrix:
rust:
- 1.57.0 # MSRV
- 1.63.0 # MSRV
- stable
- nightly

Expand All @@ -25,7 +25,7 @@ jobs:
toolchain: ${{ matrix.rust }}
override: true
- name: Fixes for MSRV
if: matrix.rust == '1.57.0'
if: matrix.rust == '1.63.0'
run: |
cargo update
cargo update -p log --precise 0.4.18
Expand All @@ -35,6 +35,7 @@ jobs:
cargo update -p rustls --precise 0.20.8
cargo update -p webpki --precise 0.22.2
cargo update -p byteorder --precise 1.4.3
cargo update -p regex --precise 1.9.6
- name: test
run: cargo test --verbose --all-features --lib

Expand Down
5 changes: 4 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Seeking review of the code that verifies there is no overpayment. Contributions

## Minimum Supported Rust Version (MSRV)

The `payjoin` library should always compile with any combination of features on Rust **1.57.0**.
The `payjoin` library should always compile with any combination of features on Rust **1.63.0**.

To build and test with the MSRV you will need to pin the below dependency versions:

Expand All @@ -84,8 +84,11 @@ cargo update -p minreq --precise 2.8.0
cargo update -p rustls --precise 0.20.8
cargo update -p webpki --precise 0.22.2
cargo update -p byteorder --precise 1.4.3
cargo update -p regex --precise 1.9.6
```

The `payjoin-cli` should compile with Rust **stable** MSRV

## License

MIT
11 changes: 2 additions & 9 deletions payjoin-cli/Cargo.lock
View file
Open in desktop

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

5 changes: 4 additions & 1 deletion payjoin-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
name = "payjoin-cli"
version = "0.0.1"
authors = ["Dan Gould <[email protected]>", "Martin Habovstiak <[email protected]>"]
edition = "2018"
repository = "https://github.com/payjoin/rust-payjoin"
readme = "README.md"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this is default behavior. Any reason to be explicit like it wasn't being picked up or incorrectly picking up payjoin/README.md?

edition = "2021"
resolver = "2"
Comment on lines +5 to +8
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jbesraa May you please share why this is necessary to introduce this change? I'm not so familiar with this part of the build process

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

resolver = "2" is a flag to add latest deps resolution features. But I actually dont think we need it because we have edition = "2021" and in this edition the default resolver is =2.

https://doc.rust-lang.org/cargo/reference/resolver.html#feature-resolver-version-2


[[bin]]
name = "payjoin"
Expand Down
3 changes: 2 additions & 1 deletion payjoin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ readme = "../README.md"
keywords = ["bip78", "payjoin", "bitcoin"]
categories = ["api-bindings", "cryptography::cryptocurrencies", "network-programming"]
license = "MITNFA"
edition = "2018"
resolver = "2"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
Loading