Skip to content

Commit 419bc30

Browse files
committed
Verify that we build with MSRV + minimal dependencies
* Lower all dependencies to `-Z minimal-versions` in CI * Raise the following public dependencies: * bigdecimal to 0.0.13 to drop support for old num versions * chrono to 0.4.1 because it pulls in a really old num from before the rust 1.0 release * pq-sys to 0.4.0 because 0.3.x pulls in a old bindgen version * mysqlclient-sys to 0.3.0 for the same reason * Bump this internal dependencies: * syn to 1.0.1 because we require at least that version * num-* to 0.2.0 to match bigdecimal version * bcrypt to 0.2.0 because it would pull in rustc-serialize otherwise * tempfile to 3.0.0 because otherwise it pulls in winapi 0.0.1!!! * bitflags to 1.2.0 because of deprecation warnings regarding to try!
1 parent 9c99698 commit 419bc30

7 files changed

Lines changed: 21 additions & 15 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,9 @@ jobs:
397397
run: |
398398
sudo apt-get update
399399
sudo apt-get -y install libsqlite3-dev libpq-dev libmysqlclient-dev
400+
- name: Use minimal dependencies
401+
run: |
402+
RUSTC_BOOTSTRAP=1 cargo update -Z minimal-versions
400403
401404
- name: Check building with rust 1.40.0
402405
uses: actions-rs/cargo@v1

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ for Rust libraries in [RFC #1105](https://github.com/rust-lang/rfcs/blob/master/
4343
### Removed
4444

4545
* All previously deprecated items have been removed.
46-
* Support for uuid version < 0.7.0 has been removed.
46+
* Support for `uuid` version < 0.7.0 has been removed.
47+
* Support for `bigdecimal` < 0.0.13 has been removed.
48+
* Support for `pq-sys` < 0.4.0 has been removed.
49+
* Support for `mysqlclient-sys` < 0.2.0 has been removed.
4750

4851
### Changed
4952

diesel/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ edition = "2018"
1414

1515
[dependencies]
1616
byteorder = "1.0"
17-
chrono = { version = "0.4", optional = true }
17+
chrono = { version = "0.4.1", optional = true }
1818
libc = { version = "0.2.0", optional = true }
1919
libsqlite3-sys = { version = ">=0.8.0, <0.19.0", optional = true, features = ["min_sqlite_version_3_7_16"] }
20-
mysqlclient-sys = { version = ">=0.1.0, <0.3.0", optional = true }
21-
pq-sys = { version = ">=0.3.0, <0.5.0", optional = true }
20+
mysqlclient-sys = { version = "0.2.0", optional = true }
21+
pq-sys = { version = "0.4.0", optional = true }
2222
quickcheck = { version = "0.9", optional = true }
2323
serde_json = { version = ">=0.8.0, <2.0", optional = true }
2424
time = { version = "0.1", optional = true }
2525
url = { version = "2.1.0", optional = true }
2626
percent-encoding = { version = "2.1.0", optional = true }
2727
uuid = { version = ">=0.7.0, <0.9.0", optional = true}
2828
ipnetwork = { version = ">=0.12.2, <0.17.0", optional = true }
29-
num-bigint = { version = ">=0.1.41, <0.3", optional = true }
29+
num-bigint = { version = "0.2", optional = true }
3030
num-traits = { version = "0.2", optional = true }
31-
num-integer = { version = "0.1.32", optional = true }
32-
bigdecimal = { version = ">= 0.0.10, < 0.2.0", optional = true }
33-
bitflags = { version = "1.0", optional = true }
31+
num-integer = { version = "0.1.39", optional = true }
32+
bigdecimal = { version = ">= 0.0.13, < 0.2.0", optional = true }
33+
bitflags = { version = "1.2.0", optional = true }
3434
r2d2 = { version = ">= 0.8, < 0.9", optional = true }
3535

3636
[dependencies.diesel_derives]

diesel_cli/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ name = "diesel"
1717
path = "src/main.rs"
1818

1919
[dependencies]
20-
chrono = "0.4"
20+
chrono = "0.4.1"
2121
clap = "2.27"
2222
dotenv = "0.15"
2323
heck = "0.3.1"
@@ -53,4 +53,4 @@ sqlite-bundled = ["sqlite", "libsqlite3-sys/bundled"]
5353
uses_information_schema = []
5454

5555
[[test]]
56-
name = "tests"
56+
name = "tests"

diesel_derives/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repository = "https://github.com/diesel-rs/diesel/tree/master/diesel_derives"
1010
autotests = false
1111

1212
[dependencies]
13-
syn = { version = "1", features = ["full", "fold"] }
13+
syn = { version = "1.0.1", features = ["full", "fold"] }
1414
quote = "1"
1515
proc-macro2 = "1"
1616

diesel_tests/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ dotenv = "0.15"
1414

1515
[dependencies]
1616
assert_matches = "1.0.1"
17-
chrono = { version = "0.4" }
17+
chrono = "0.4.1"
1818
diesel = { path = "../diesel", default-features = false, features = ["quickcheck", "chrono", "uuid", "serde_json", "network-address", "numeric", "with-deprecated"] }
1919
diesel_migrations = { path = "../diesel_migrations" }
2020
dotenv = "0.15"
2121
quickcheck = "0.9"
2222
uuid = { version = ">=0.7.0, <0.9.0" }
2323
serde_json = { version=">=0.9, <2.0" }
2424
ipnetwork = ">=0.12.2, <0.17.0"
25-
bigdecimal = ">= 0.0.10, < 0.2.0"
25+
bigdecimal = ">= 0.0.13, < 0.2.0"
2626

2727
[features]
2828
default = []

examples/postgres/advanced-blog-cli/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ version = "0.1.0"
44
authors = ["Sean Griffin <sean@seantheprogrammer.com>"]
55

66
[dependencies]
7-
bcrypt = "0.1.0"
7+
bcrypt = "0.2.0"
88
chrono = "0.4.0"
99
diesel = { version = "2.0.0", path = "../../../diesel", features = ["postgres", "chrono"] }
1010
dotenv = "0.15"
1111
structopt = "0.1.6"
1212
structopt-derive = "0.1.6"
13-
tempfile = "2.2.0"
13+
tempfile = "3.0.0"
1414

1515
[dev-dependencies]
1616
assert_matches = "1.1"

0 commit comments

Comments
 (0)