Skip to content

Commit ac99caa

Browse files
oddgrdoddgrd
committed
chore: upgrade workspace dependencies
1 parent 4f2a5b9 commit ac99caa

File tree

14 files changed

+657
-608
lines changed

14 files changed

+657
-608
lines changed

‎Cargo.lock

+544-495
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎admin/Cargo.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7-
anyhow = "1.0.62"
8-
clap = { version = "4.0.0", features = [ "derive", "env" ] }
7+
anyhow = "1.0.66"
8+
clap = { version = "4.0.27", features = [ "derive", "env" ] }
99
dirs = "4.0.0"
10-
reqwest = { version = "0.11.11", features = ["json"] }
11-
serde = { version = "1.0.143", features = ["derive"] }
12-
serde_json = "1.0.83"
13-
tokio = { version = "1.20.1", features = ["macros", "rt-multi-thread"] }
10+
reqwest = { version = "0.11.13", features = ["json"] }
11+
serde = { version = "1.0.148", features = ["derive"] }
12+
serde_json = "1.0.89"
13+
tokio = { version = "1.22.0", features = ["macros", "rt-multi-thread"] }
1414
toml = "0.5.9"
15-
tracing = "0.1.35"
16-
tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
15+
tracing = "0.1.37"
16+
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
1717

1818
[dependencies.shuttle-common]
1919
version = "0.7.2"

‎cargo-shuttle/Cargo.toml

+20-20
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,40 @@ description = "A cargo command for the shuttle platform (https://www.shuttle.rs/
77
homepage = "https://www.shuttle.rs"
88

99
[dependencies]
10-
anyhow = "1.0.62"
11-
async-trait = "0.1.57"
10+
anyhow = "1.0.66"
11+
async-trait = "0.1.58"
1212
bollard = "0.13.0"
1313
cargo = "0.64.0"
14-
cargo-edit = { version = "0.10.4", features = ["cli"] }
15-
cargo_metadata = "0.15.0"
16-
chrono = "0.4.22"
14+
cargo-edit = { version = "0.11.6", features = ["cli"] }
15+
cargo_metadata = "0.15.2"
16+
chrono = "=0.4.22"
1717
clap = { version = "3.2.17", features = ["derive", "env"] }
1818
clap_complete = "3.2.5"
1919
crossbeam-channel = "0.5.6"
2020
crossterm = "0.25.0"
2121
dirs = "4.0.0"
22-
flate2 = "1.0.24"
23-
futures = "0.3.23"
22+
flate2 = "1.0.25"
23+
futures = "0.3.25"
2424
headers = "0.3.8"
2525
indoc = "1.0.7"
2626
log = "0.4.17"
2727
portpicker = "0.1.1"
28-
reqwest = { version = "0.11.11", features = ["json"] }
29-
reqwest-middleware = "0.1.6"
30-
reqwest-retry = "0.1.5"
31-
serde = { version = "1.0.143", features = ["derive"] }
32-
serde_json = "1.0.83"
33-
sqlx = { version = "0.6.1", features = ["runtime-tokio-native-tls", "postgres"] }
28+
reqwest = { version = "0.11.13", features = ["json"] }
29+
reqwest-middleware = "0.2.0"
30+
reqwest-retry = "0.2.0"
31+
serde = { version = "1.0.148", features = ["derive"] }
32+
serde_json = "1.0.89"
33+
sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls", "postgres"] }
3434
tar = "0.4.38"
35-
tokio = { version = "1.20.1", features = ["macros"] }
35+
tokio = { version = "1.22.0", features = ["macros"] }
3636
tokio-tungstenite = { version = "0.17.2", features = ["native-tls"] }
3737
toml = "0.5.9"
38-
toml_edit = "0.14.4"
39-
tracing = "0.1.35"
40-
tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
41-
url = "2.2.2"
42-
uuid = { version = "1.1.2", features = ["v4"] }
43-
webbrowser = "0.7.1"
38+
toml_edit = "0.15.0"
39+
tracing = "0.1.37"
40+
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
41+
url = "2.3.1"
42+
uuid = { version = "1.2.2", features = ["v4"] }
43+
webbrowser = "0.8.2"
4444

4545
[dependencies.shuttle-common]
4646
version = "0.7.2"

‎codegen/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ proc-macro = true
1111

1212
[dependencies]
1313
proc-macro-error = "1.0.4"
14-
proc-macro2 = "1.0.43"
14+
proc-macro2 = "1.0.47"
1515
quote = "1.0.21"
16-
syn = { version = "1.0.99", features = ["full", "extra-traits"] }
16+
syn = { version = "1.0.104", features = ["full", "extra-traits"] }
1717

1818
[dev-dependencies]
19-
pretty_assertions = "1.2.1"
20-
trybuild = "1.0.64"
19+
pretty_assertions = "1.3.0"
20+
trybuild = "1.0.72"

‎common/Cargo.toml

+11-11
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ description = "Common library for the shuttle platform (https://www.shuttle.rs/)
77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
10-
anyhow = { version = "1.0.62", optional = true }
11-
async-trait = { version = "0.1.52", optional = true }
12-
axum = { version = "0.5.8", optional = true }
10+
anyhow = { version = "1.0.66", optional = true }
11+
async-trait = { version = "0.1.58", optional = true }
12+
axum = { version = "0.6.0", optional = true }
1313
chrono = { version = "0.4.22", features = ["serde"] }
14-
comfy-table = { version = "6.1.0", optional = true }
14+
comfy-table = { version = "6.1.3", optional = true }
1515
crossterm = { version = "0.25.0", optional = true }
1616
http = { version = "0.2.8", optional = true }
17-
once_cell = "1.13.1"
18-
reqwest = { version = "0.11.11", optional = true }
19-
rustrict = "0.5.0"
20-
serde = { version = "1.0.143", features = ["derive"] }
21-
serde_json = { version = "1.0.85", optional = true }
17+
once_cell = "1.16.0"
18+
reqwest = { version = "0.11.13", optional = true }
19+
rustrict = "0.5.5"
20+
serde = { version = "1.0.148", features = ["derive"] }
21+
serde_json = { version = "1.0.89", optional = true }
2222
strum = { version = "0.24.1", features = ["derive"] }
23-
tracing = "0.1.36"
24-
uuid = { version = "1.1.1", features = ["v4", "serde"] }
23+
tracing = "0.1.37"
24+
uuid = { version = "1.2.2", features = ["v4", "serde"] }
2525

2626
[features]
2727
default = ["models"]

‎deployer/Cargo.toml

+22-22
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,42 @@ edition = "2021"
55
description = "Service with instances created per project for handling the compilation, loading, and execution of Shuttle services"
66

77
[dependencies]
8-
anyhow = "1.0.58"
9-
async-trait = "0.1.56"
10-
axum = { version = "0.5.7", features = ["ws"] }
11-
bytes = "1.1.0"
8+
anyhow = "1.0.66"
9+
async-trait = "0.1.58"
10+
axum = { version = "0.6.0", features = ["ws"] }
11+
bytes = "1.3.0"
1212
cargo = "0.64.0"
13-
cargo_metadata = "0.15.0"
14-
chrono = "0.4.22"
13+
cargo_metadata = "0.15.2"
14+
chrono = "=0.4.22"
1515
clap = { version = "3.2.8", features = ["derive"] }
1616
crossbeam-channel = "0.5.6"
17-
flate2 = "1.0.24"
18-
fqdn = "0.2.2"
19-
futures = "0.3.21"
20-
hyper = { version = "0.14.20", features = ["client", "http1", "http2", "tcp" ] }
17+
flate2 = "1.0.25"
18+
fqdn = "0.2.3"
19+
futures = "0.3.25"
20+
hyper = { version = "0.14.23", features = ["client", "http1", "http2", "tcp" ] }
2121
# not great, but waiting for WebSocket changes to be merged
2222
hyper-reverse-proxy = { git = "https://github.com/chesedo/hyper-reverse-proxy", branch = "master" }
23-
once_cell = "1.14.0"
23+
once_cell = "1.16.0"
2424
opentelemetry = { version = "0.18.0", features = ["rt-tokio"] }
2525
opentelemetry-datadog = { version = "0.6.0", features = ["reqwest-client"] }
2626
opentelemetry-http = "0.7.0"
2727
pipe = "0.4.0"
2828
portpicker = "0.1.1"
29-
serde = "1.0.137"
30-
serde_json = "1.0.81"
31-
sqlx = { version = "0.6.0", features = ["runtime-tokio-native-tls", "sqlite", "chrono", "json", "migrate", "uuid"] }
29+
serde = "1.0.148"
30+
serde_json = "1.0.89"
31+
sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls", "sqlite", "chrono", "json", "migrate", "uuid"] }
3232
strum = { version = "0.24.1", features = ["derive"] }
3333
tar = "0.4.38"
34-
thiserror = "1.0.24"
35-
tokio = { version = "1.19.2", features = ["fs"] }
34+
thiserror = "1.0.37"
35+
tokio = { version = "1.22.0", features = ["fs"] }
3636
toml = "0.5.9"
37-
tonic = "0.8.0"
38-
tower = { version = "0.4.12", features = ["make"] }
37+
tonic = "0.8.3"
38+
tower = { version = "0.4.13", features = ["make"] }
3939
tower-http = { version = "0.3.4", features = ["auth", "trace"] }
40-
tracing = "0.1.35"
40+
tracing = "0.1.37"
4141
tracing-opentelemetry = "0.18.0"
42-
tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
43-
uuid = { version = "1.1.2", features = ["v4"] }
42+
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
43+
uuid = { version = "1.2.2", features = ["v4"] }
4444

4545
[dependencies.shuttle-common]
4646
version = "0.7.2"
@@ -57,7 +57,7 @@ path = "../service"
5757
features = ["loader"]
5858

5959
[dev-dependencies]
60-
ctor = "0.1.22"
60+
ctor = "0.1.26"
6161
hex = "0.4.3"
6262
rand = "0.8.5"
6363
tempdir = "0.3.7"

‎gateway/Cargo.toml

+24-24
Original file line numberDiff line numberDiff line change
@@ -6,52 +6,52 @@ publish = false
66

77
[dependencies]
88
acme2 = "0.5.1"
9-
async-trait = "0.1.52"
10-
axum = { version = "0.5.8", features = [ "headers" ] }
9+
async-trait = "0.1.58"
10+
axum = { version = "0.6.0", features = [ "headers" ] }
1111
axum-server = { version = "0.4.4", features = [ "tls-rustls" ] }
12-
base64 = "0.13"
13-
bollard = "0.13"
14-
chrono = "0.4"
15-
clap = { version = "4.0.0", features = [ "derive" ] }
16-
fqdn = "0.2.2"
17-
futures = "0.3.21"
12+
base64 = "0.13.1"
13+
bollard = "0.13.0"
14+
chrono = "0.4.22"
15+
clap = { version = "4.0.27", features = [ "derive" ] }
16+
fqdn = "0.2.3"
17+
futures = "0.3.25"
1818
http = "0.2.8"
19-
hyper = { version = "0.14.19", features = [ "stream" ] }
19+
hyper = { version = "0.14.23", features = [ "stream" ] }
2020
# not great, but waiting for WebSocket changes to be merged
2121
hyper-reverse-proxy = { git = "https://github.com/chesedo/hyper-reverse-proxy", branch = "bug/host_header" }
22-
instant-acme = "0.1.0"
22+
instant-acme = "0.1.1"
2323
lazy_static = "1.4.0"
24-
once_cell = "1.14.0"
24+
once_cell = "1.16.0"
2525
opentelemetry = { version = "0.18.0", features = ["rt-tokio"] }
2626
opentelemetry-datadog = { version = "0.6.0", features = ["reqwest-client"] }
2727
opentelemetry-http = "0.7.0"
2828
pem = "1.1.0"
2929
rand = "0.8.5"
3030
rcgen = "0.10.0"
31-
rustls = { version = "0.20.6" }
32-
rustls-pemfile = { version = "1.0.1" }
33-
serde = { version = "1.0.137", features = [ "derive" ] }
34-
serde_json = "1.0.81"
31+
rustls = "0.20.7"
32+
rustls-pemfile = "1.0.1"
33+
serde = { version = "1.0.148", features = [ "derive" ] }
34+
serde_json = "1.0.89"
3535
sqlx = { version = "0.5.11", features = [ "sqlite", "json", "runtime-tokio-rustls", "migrate" ] }
3636
strum = { version = "0.24.1", features = ["derive"] }
37-
tokio = { version = "1.17", features = [ "full" ] }
37+
tokio = { version = "1.22.0", features = [ "full" ] }
3838
tower = { version = "0.4.13", features = [ "steer" ] }
3939
tower-http = { version = "0.3.4", features = ["trace"] }
40-
tracing = "0.1.35"
40+
tracing = "0.1.37"
4141
tracing-opentelemetry = "0.18.0"
42-
tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
43-
uuid = { version = "1.2.1", features = [ "v4" ] }
42+
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
43+
uuid = { version = "1.2.2", features = [ "v4" ] }
4444

4545
[dependencies.shuttle-common]
4646
version = "0.7.2"
4747
path = "../common"
4848
features = ["backend"]
4949

5050
[dev-dependencies]
51-
anyhow = "1"
52-
base64 = "0.13"
53-
colored = "2"
54-
portpicker = "0.1"
55-
snailquote = "0.3"
51+
anyhow = "1.0.66"
52+
base64 = "0.13.1"
53+
colored = "2.0.0"
54+
portpicker = "0.1.1"
55+
snailquote = "0.3.1"
5656
tempfile = "3.3.0"
5757

‎proto/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ publish = false
66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

88
[dependencies]
9-
prost = "0.11.0"
10-
tonic = "0.8.0"
9+
prost = "0.11.2"
10+
tonic = "0.8.3"
1111

1212
[dependencies.shuttle-common]
1313
version = "0.7.2"
1414
path = "../common"
1515

1616
[build-dependencies]
17-
tonic-build = "0.8.0"
17+
tonic-build = "0.8.3"

‎provisioner/Cargo.toml

+16-16
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,30 @@ publish = false
77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
10-
aws-config = "0.47.0"
11-
aws-sdk-rds = "0.17.0"
12-
aws-smithy-types = "0.47.0"
10+
aws-config = "0.51.0"
11+
aws-sdk-rds = "0.21.0"
12+
aws-smithy-types = "0.51.0"
1313
clap = { version = "3.2.17", features = ["derive", "env"] }
14-
fqdn = "0.2.2"
15-
mongodb = "2.3.0"
16-
prost = "0.11.0"
14+
fqdn = "0.2.3"
15+
mongodb = "2.3.1"
16+
prost = "0.11.2"
1717
rand = "0.8.5"
18-
sqlx = { version = "0.6.1", features = ["postgres", "runtime-tokio-native-tls"] }
19-
thiserror = "1.0.32"
20-
tokio = { version = "1.20.1", features = ["macros", "rt-multi-thread"] }
21-
tonic = "0.8.0"
22-
tracing = "0.1.36"
23-
tracing-subscriber = "0.3.15"
18+
sqlx = { version = "0.6.2", features = ["postgres", "runtime-tokio-native-tls"] }
19+
thiserror = "1.0.37"
20+
tokio = { version = "1.22.0", features = ["macros", "rt-multi-thread"] }
21+
tonic = "0.8.3"
22+
tracing = "0.1.37"
23+
tracing-subscriber = "0.3.16"
2424

2525
[dependencies.shuttle-proto]
2626
version = "0.7.2"
2727
path = "../proto"
2828

2929
[dev-dependencies]
30-
ctor = "0.1.23"
31-
once_cell = "1.13.1"
30+
ctor = "0.1.26"
31+
once_cell = "1.16.0"
3232
portpicker = "0.1.1"
33-
serde_json = "1.0.83"
33+
serde_json = "1.0.89"
3434

3535
[build-dependencies]
36-
tonic-build = "0.8.0"
36+
tonic-build = "0.8.3"

‎resources/aws-rds/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ keywords = ["shuttle-service", "rds"]
1111
async-trait = "0.1.56"
1212
paste = "1.0.7"
1313
shuttle-service = { path = "../../service", version = "0.7.2", default-features = false }
14-
sqlx = { version = "0.6.0", features = ["runtime-tokio-native-tls"] }
14+
sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls"] }
1515
tokio = { version = "1.19.2", features = ["rt"] }
1616

1717
[features]

‎resources/shared-db/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ keywords = ["shuttle-service", "database"]
1111
async-trait = "0.1.56"
1212
mongodb = { version = "2.3.0", optional = true }
1313
shuttle-service = { path = "../../service", version = "0.7.2", default-features = false }
14-
sqlx = { version = "0.6.1", features = ["runtime-tokio-native-tls"], optional = true }
14+
sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls"], optional = true }
1515
tokio = { version = "1.19.2", features = ["rt"] }
1616

1717
[features]

‎service/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
//!
110110
//! ```toml
111111
//! shuttle-shared-db = { version = "0.7.2", features = ["postgres"] }
112-
//! sqlx = { version = "0.6.1", features = ["runtime-tokio-native-tls", "postgres"] }
112+
//! sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls", "postgres"] }
113113
//! ```
114114
//!
115115
//! Now update the `#[shuttle_service::main]` function to take in a `PgPool`:

‎service/tests/resources/sleep-async/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ crate-type = ["cdylib"]
99
[workspace]
1010

1111
[dependencies]
12-
tokio = { version = "1.0", features = ["time"]}
12+
tokio = { version = "1.22.0", features = ["time"] }
1313
shuttle-service = { path = "../../../" }

‎service/tests/resources/sqlx-pool/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ crate-type = ["cdylib"]
1111
[dependencies]
1212
shuttle-service = { path = "../../../" }
1313
shuttle-shared-db = { path = "../../../../resources/shared-db", features = ["postgres"] }
14-
sqlx = { version = "0.6", features = [ "runtime-tokio-native-tls" ] }
14+
sqlx = { version = "0.6.2", features = [ "runtime-tokio-native-tls" ] }

0 commit comments

Comments
 (0)