Skip to content

Commit

Permalink
chore: upgrade workspace dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
oddgrd committed Nov 30, 2022
1 parent de2b037 commit 527da7b
Show file tree
Hide file tree
Showing 14 changed files with 618 additions and 569 deletions.
961 changes: 505 additions & 456 deletions Cargo.lock

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions admin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ version = "0.1.0"
edition = "2021"

[dependencies]
anyhow = "1.0.62"
clap = { version = "4.0.0", features = [ "derive", "env" ] }
anyhow = "1.0.66"
clap = { version = "4.0.27", features = [ "derive", "env" ] }
dirs = "4.0.0"
reqwest = { version = "0.11.11", features = ["json"] }
serde = { version = "1.0.143", features = ["derive"] }
serde_json = "1.0.83"
tokio = { version = "1.20.1", features = ["macros", "rt-multi-thread"] }
reqwest = { version = "0.11.13", features = ["json"] }
serde = { version = "1.0.148", features = ["derive"] }
serde_json = "1.0.89"
tokio = { version = "1.22.0", features = ["macros", "rt-multi-thread"] }
toml = "0.5.9"
tracing = "0.1.35"
tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
tracing = "0.1.37"
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }

[dependencies.shuttle-common]
version = "0.7.2"
Expand Down
40 changes: 20 additions & 20 deletions cargo-shuttle/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,40 +7,40 @@ description = "A cargo command for the shuttle platform (https://www.shuttle.rs/
homepage = "https://www.shuttle.rs"

[dependencies]
anyhow = "1.0.62"
async-trait = "0.1.57"
anyhow = "1.0.66"
async-trait = "0.1.58"
bollard = "0.13.0"
cargo = "0.64.0"
cargo-edit = { version = "0.10.4", features = ["cli"] }
cargo_metadata = "0.15.0"
chrono = "0.4.22"
cargo-edit = { version = "0.11.6", features = ["cli"] }
cargo_metadata = "0.15.2"
chrono = "=0.4.22"
clap = { version = "3.2.17", features = ["derive", "env"] }
clap_complete = "3.2.5"
crossbeam-channel = "0.5.6"
crossterm = "0.25.0"
dirs = "4.0.0"
flate2 = "1.0.24"
futures = "0.3.23"
flate2 = "1.0.25"
futures = "0.3.25"
headers = "0.3.8"
indoc = "1.0.7"
log = "0.4.17"
portpicker = "0.1.1"
reqwest = { version = "0.11.11", features = ["json"] }
reqwest-middleware = "0.1.6"
reqwest-retry = "0.1.5"
serde = { version = "1.0.143", features = ["derive"] }
serde_json = "1.0.83"
sqlx = { version = "0.6.1", features = ["runtime-tokio-native-tls", "postgres"] }
reqwest = { version = "0.11.13", features = ["json"] }
reqwest-middleware = "0.2.0"
reqwest-retry = "0.2.0"
serde = { version = "1.0.148", features = ["derive"] }
serde_json = "1.0.89"
sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls", "postgres"] }
tar = "0.4.38"
tokio = { version = "1.20.1", features = ["macros"] }
tokio = { version = "1.22.0", features = ["macros"] }
tokio-tungstenite = { version = "0.17.2", features = ["native-tls"] }
toml = "0.5.9"
toml_edit = "0.14.4"
tracing = "0.1.35"
tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
url = "2.2.2"
uuid = { version = "1.1.2", features = ["v4"] }
webbrowser = "0.7.1"
toml_edit = "0.15.0"
tracing = "0.1.37"
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
url = "2.3.1"
uuid = { version = "1.2.2", features = ["v4"] }
webbrowser = "0.8.2"

[dependencies.shuttle-common]
version = "0.7.2"
Expand Down
8 changes: 4 additions & 4 deletions codegen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ proc-macro = true

[dependencies]
proc-macro-error = "1.0.4"
proc-macro2 = "1.0.43"
proc-macro2 = "1.0.47"
quote = "1.0.21"
syn = { version = "1.0.99", features = ["full", "extra-traits"] }
syn = { version = "1.0.104", features = ["full", "extra-traits"] }

[dev-dependencies]
pretty_assertions = "1.2.1"
trybuild = "1.0.64"
pretty_assertions = "1.3.0"
trybuild = "1.0.72"
22 changes: 11 additions & 11 deletions common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ description = "Common library for the shuttle platform (https://www.shuttle.rs/)
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
anyhow = { version = "1.0.62", optional = true }
async-trait = { version = "0.1.52", optional = true }
axum = { version = "0.5.8", optional = true }
anyhow = { version = "1.0.66", optional = true }
async-trait = { version = "0.1.58", optional = true }
axum = { version = "0.6.0", optional = true }
chrono = { version = "0.4.22", features = ["serde"] }
comfy-table = { version = "6.1.0", optional = true }
comfy-table = { version = "6.1.3", optional = true }
crossterm = { version = "0.25.0", optional = true }
http = { version = "0.2.8", optional = true }
once_cell = "1.13.1"
reqwest = { version = "0.11.11", optional = true }
rustrict = "0.5.0"
serde = { version = "1.0.143", features = ["derive"] }
serde_json = { version = "1.0.85", optional = true }
once_cell = "1.16.0"
reqwest = { version = "0.11.13", optional = true }
rustrict = "0.5.5"
serde = { version = "1.0.148", features = ["derive"] }
serde_json = { version = "1.0.89", optional = true }
strum = { version = "0.24.1", features = ["derive"] }
tracing = "0.1.36"
uuid = { version = "1.1.1", features = ["v4", "serde"] }
tracing = "0.1.37"
uuid = { version = "1.2.2", features = ["v4", "serde"] }

[features]
default = ["models"]
Expand Down
44 changes: 22 additions & 22 deletions deployer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,42 +5,42 @@ edition = "2021"
description = "Service with instances created per project for handling the compilation, loading, and execution of Shuttle services"

[dependencies]
anyhow = "1.0.58"
async-trait = "0.1.56"
axum = { version = "0.5.7", features = ["ws"] }
bytes = "1.1.0"
anyhow = "1.0.66"
async-trait = "0.1.58"
axum = { version = "0.6.0", features = ["ws"] }
bytes = "1.3.0"
cargo = "0.64.0"
cargo_metadata = "0.15.0"
chrono = "0.4.22"
cargo_metadata = "0.15.2"
chrono = "=0.4.22"
clap = { version = "3.2.8", features = ["derive"] }
crossbeam-channel = "0.5.6"
flate2 = "1.0.24"
fqdn = "0.2.2"
futures = "0.3.21"
hyper = { version = "0.14.20", features = ["client", "http1", "http2", "tcp" ] }
flate2 = "1.0.25"
fqdn = "0.2.3"
futures = "0.3.25"
hyper = { version = "0.14.23", features = ["client", "http1", "http2", "tcp" ] }
# not great, but waiting for WebSocket changes to be merged
hyper-reverse-proxy = { git = "https://github.com/chesedo/hyper-reverse-proxy", branch = "master" }
once_cell = "1.14.0"
once_cell = "1.16.0"
opentelemetry = { version = "0.18.0", features = ["rt-tokio"] }
opentelemetry-datadog = { version = "0.6.0", features = ["reqwest-client"] }
opentelemetry-http = "0.7.0"
pipe = "0.4.0"
portpicker = "0.1.1"
serde = "1.0.137"
serde_json = "1.0.81"
sqlx = { version = "0.6.0", features = ["runtime-tokio-native-tls", "sqlite", "chrono", "json", "migrate", "uuid"] }
serde = "1.0.148"
serde_json = "1.0.89"
sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls", "sqlite", "chrono", "json", "migrate", "uuid"] }
strum = { version = "0.24.1", features = ["derive"] }
tar = "0.4.38"
thiserror = "1.0.24"
tokio = { version = "1.19.2", features = ["fs"] }
thiserror = "1.0.37"
tokio = { version = "1.22.0", features = ["fs"] }
toml = "0.5.9"
tonic = "0.8.0"
tower = { version = "0.4.12", features = ["make"] }
tonic = "0.8.3"
tower = { version = "0.4.13", features = ["make"] }
tower-http = { version = "0.3.4", features = ["auth", "trace"] }
tracing = "0.1.35"
tracing = "0.1.37"
tracing-opentelemetry = "0.18.0"
tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
uuid = { version = "1.1.2", features = ["v4"] }
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
uuid = { version = "1.2.2", features = ["v4"] }

[dependencies.shuttle-common]
version = "0.7.2"
Expand All @@ -57,7 +57,7 @@ path = "../service"
features = ["loader"]

[dev-dependencies]
ctor = "0.1.22"
ctor = "0.1.26"
hex = "0.4.3"
rand = "0.8.5"
tempdir = "0.3.7"
48 changes: 24 additions & 24 deletions gateway/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,52 @@ publish = false

[dependencies]
acme2 = "0.5.1"
async-trait = "0.1.52"
axum = { version = "0.5.8", features = [ "headers" ] }
async-trait = "0.1.58"
axum = { version = "0.6.0", features = [ "headers" ] }
axum-server = { version = "0.4.4", features = [ "tls-rustls" ] }
base64 = "0.13"
bollard = "0.13"
chrono = "0.4"
clap = { version = "4.0.0", features = [ "derive" ] }
fqdn = "0.2.2"
futures = "0.3.21"
base64 = "0.13.1"
bollard = "0.13.0"
chrono = "0.4.22"
clap = { version = "4.0.27", features = [ "derive" ] }
fqdn = "0.2.3"
futures = "0.3.25"
http = "0.2.8"
hyper = { version = "0.14.19", features = [ "stream" ] }
hyper = { version = "0.14.23", features = [ "stream" ] }
# not great, but waiting for WebSocket changes to be merged
hyper-reverse-proxy = { git = "https://github.com/chesedo/hyper-reverse-proxy", branch = "bug/host_header" }
instant-acme = "0.1.0"
instant-acme = "0.1.1"
lazy_static = "1.4.0"
once_cell = "1.14.0"
once_cell = "1.16.0"
opentelemetry = { version = "0.18.0", features = ["rt-tokio"] }
opentelemetry-datadog = { version = "0.6.0", features = ["reqwest-client"] }
opentelemetry-http = "0.7.0"
pem = "1.1.0"
rand = "0.8.5"
rcgen = "0.10.0"
rustls = { version = "0.20.6" }
rustls-pemfile = { version = "1.0.1" }
serde = { version = "1.0.137", features = [ "derive" ] }
serde_json = "1.0.81"
rustls = "0.20.7"
rustls-pemfile = "1.0.1"
serde = { version = "1.0.148", features = [ "derive" ] }
serde_json = "1.0.89"
sqlx = { version = "0.5.11", features = [ "sqlite", "json", "runtime-tokio-rustls", "migrate" ] }
strum = { version = "0.24.1", features = ["derive"] }
tokio = { version = "1.17", features = [ "full" ] }
tokio = { version = "1.22.0", features = [ "full" ] }
tower = { version = "0.4.13", features = [ "steer" ] }
tower-http = { version = "0.3.4", features = ["trace"] }
tracing = "0.1.35"
tracing = "0.1.37"
tracing-opentelemetry = "0.18.0"
tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
uuid = { version = "1.2.1", features = [ "v4" ] }
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
uuid = { version = "1.2.2", features = [ "v4" ] }

[dependencies.shuttle-common]
version = "0.7.2"
path = "../common"
features = ["backend"]

[dev-dependencies]
anyhow = "1"
base64 = "0.13"
colored = "2"
portpicker = "0.1"
snailquote = "0.3"
anyhow = "1.0.66"
base64 = "0.13.1"
colored = "2.0.0"
portpicker = "0.1.1"
snailquote = "0.3.1"
tempfile = "3.3.0"

6 changes: 3 additions & 3 deletions proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
prost = "0.11.0"
tonic = "0.8.0"
prost = "0.11.2"
tonic = "0.8.3"

[dependencies.shuttle-common]
version = "0.7.2"
path = "../common"

[build-dependencies]
tonic-build = "0.8.0"
tonic-build = "0.8.3"
32 changes: 16 additions & 16 deletions provisioner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,30 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
aws-config = "0.47.0"
aws-sdk-rds = "0.17.0"
aws-smithy-types = "0.47.0"
aws-config = "0.51.0"
aws-sdk-rds = "0.21.0"
aws-smithy-types = "0.51.0"
clap = { version = "3.2.17", features = ["derive", "env"] }
fqdn = "0.2.2"
mongodb = "2.3.0"
prost = "0.11.0"
fqdn = "0.2.3"
mongodb = "2.3.1"
prost = "0.11.2"
rand = "0.8.5"
sqlx = { version = "0.6.1", features = ["postgres", "runtime-tokio-native-tls"] }
thiserror = "1.0.32"
tokio = { version = "1.20.1", features = ["macros", "rt-multi-thread"] }
tonic = "0.8.0"
tracing = "0.1.36"
tracing-subscriber = "0.3.15"
sqlx = { version = "0.6.2", features = ["postgres", "runtime-tokio-native-tls"] }
thiserror = "1.0.37"
tokio = { version = "1.22.0", features = ["macros", "rt-multi-thread"] }
tonic = "0.8.3"
tracing = "0.1.37"
tracing-subscriber = "0.3.16"

[dependencies.shuttle-proto]
version = "0.7.2"
path = "../proto"

[dev-dependencies]
ctor = "0.1.23"
once_cell = "1.13.1"
ctor = "0.1.26"
once_cell = "1.16.0"
portpicker = "0.1.1"
serde_json = "1.0.83"
serde_json = "1.0.89"

[build-dependencies]
tonic-build = "0.8.0"
tonic-build = "0.8.3"
2 changes: 1 addition & 1 deletion resources/aws-rds/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ keywords = ["shuttle-service", "rds"]
async-trait = "0.1.56"
paste = "1.0.7"
shuttle-service = { path = "../../service", version = "0.7.2", default-features = false }
sqlx = { version = "0.6.0", features = ["runtime-tokio-native-tls"] }
sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls"] }
tokio = { version = "1.19.2", features = ["rt"] }

[features]
Expand Down
2 changes: 1 addition & 1 deletion resources/shared-db/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ keywords = ["shuttle-service", "database"]
async-trait = "0.1.56"
mongodb = { version = "2.3.0", optional = true }
shuttle-service = { path = "../../service", version = "0.7.2", default-features = false }
sqlx = { version = "0.6.1", features = ["runtime-tokio-native-tls"], optional = true }
sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls"], optional = true }
tokio = { version = "1.19.2", features = ["rt"] }

[features]
Expand Down
2 changes: 1 addition & 1 deletion service/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
//!
//! ```toml
//! shuttle-shared-db = { version = "0.7.2", features = ["postgres"] }
//! sqlx = { version = "0.6.1", features = ["runtime-tokio-native-tls", "postgres"] }
//! sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls", "postgres"] }
//! ```
//!
//! Now update the `#[shuttle_service::main]` function to take in a `PgPool`:
Expand Down
2 changes: 1 addition & 1 deletion service/tests/resources/sleep-async/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ crate-type = ["cdylib"]
[workspace]

[dependencies]
tokio = { version = "1.0", features = ["time"]}
tokio = { version = "1.22.0", features = ["time"] }
shuttle-service = { path = "../../../" }
2 changes: 1 addition & 1 deletion service/tests/resources/sqlx-pool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ crate-type = ["cdylib"]
[dependencies]
shuttle-service = { path = "../../../" }
shuttle-shared-db = { path = "../../../../resources/shared-db", features = ["postgres"] }
sqlx = { version = "0.6", features = [ "runtime-tokio-native-tls" ] }
sqlx = { version = "0.6.2", features = [ "runtime-tokio-native-tls" ] }

0 comments on commit 527da7b

Please sign in to comment.