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

Jump to bottom

update dependencies #1311

Merged
merged 5 commits into from Jun 27, 2022
Merged

update dependencies #1311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d232418
update dependencies
Geal Jun 27, 2022
0db1446
licenses
Geal Jun 27, 2022
a5cd4e7
Merge branch 'main' into geal/update-dependencies2
Geal Jun 27, 2022
0b53672
Merge branch 'main' into geal/update-dependencies2
Geal Jun 27, 2022
40cde5a
update miette
Geal Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
308 changes: 186 additions & 122 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions apollo-router-benchmarks/Cargo.toml
View file
Open in desktop
Expand Up @@ -17,8 +17,8 @@ serde_json = { version = "1.0.81", features = ["preserve_order"] }
serde_json_bytes = { version = "0.2.0", features = ["preserve_order"] }
tokio = { version = "1", features = ["full"] }
tracing-subscriber = { version = "0.3.11", features = ["json", "env-filter"] }
async-trait = "0.1.53"
tower = "0.4.12"
async-trait = "0.1.56"
tower = "0.4.13"


[[bench]]
Expand Down
4 changes: 2 additions & 2 deletions apollo-router-scaffold/Cargo.toml
View file
Open in desktop
Expand Up @@ -7,12 +7,12 @@ license = "Elastic-2.0"
publish = false

[dependencies]
anyhow = "1.0.57"
anyhow = "1.0.58"
clap = { version = "=3.1.18", features = ["derive"] }
cargo-scaffold = { version = "0.8.4", default-features = false }
regex = "1"
str_inflector = "0.12.0"
toml = "0.5.8"
toml = "0.5.9"
[dev-dependencies]
tempfile = "3.3.0"
copy_dir = "0.1.2"
2 changes: 1 addition & 1 deletion apollo-router-scaffold/templates/base/Cargo.toml
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ name = "router"
path = "src/main.rs"

[dependencies]
anyhow = "1.0.57"
anyhow = "1.0.58"
{{#if integration_test}}
apollo-router = { path ="{{integration_test}}apollo-router" }
{{else}}
Expand Down
2 changes: 1 addition & 1 deletion apollo-router-scaffold/templates/base/xtask/Cargo.toml
View file
Open in desktop
Expand Up @@ -16,5 +16,5 @@ apollo-router-scaffold = { git="https://github.com/apollographql/router.git", br
apollo-router-scaffold = { git="https://github.com/apollographql/router.git", tag="v0.9.5"}
{{/if}}
{{/if}}
anyhow = "=1.0.57"
anyhow = "=1.0.58"
clap = "=3.1.18"
50 changes: 25 additions & 25 deletions apollo-router/Cargo.toml
View file
Open in desktop
Expand Up @@ -17,13 +17,13 @@ path = "src/main.rs"
failfast = []

[dependencies]
anyhow = "1.0.57"
anyhow = "1.0.58"
apollo-parser = "0.2.8"
apollo-spaceport = { path = "../apollo-spaceport" }
apollo-uplink = { path = "../uplink" }
async-trait = "0.1.53"
async-trait = "0.1.56"
atty = "0.2.14"
axum = { version = "0.5.4", features = ["headers", "json", "original-uri"] }
axum = { version = "0.5.9", features = ["headers", "json", "original-uri"] }
backtrace = "0.3.65"
buildstructor = "0.3.2"
bytes = "1.1.0"
Expand All @@ -32,35 +32,35 @@ clap = { version = "=3.1.18", default-features = false, features = [
"derive",
"std",
] }
dashmap = { version = "5.1.0", features = ["serde"] }
deadpool = { version = "0.9.4", features = ["rt_tokio_1"] }
dashmap = { version = "5.3.4", features = ["serde"] }
deadpool = { version = "0.9.5", features = ["rt_tokio_1"] }
derivative = "2.2.0"
derive_more = { version = "0.99.17", default-features = false, features = [
"from",
"display",
] }
directories = "4.0.1"
displaydoc = "0.2"
envmnt = "0.9.1"
envmnt = "0.10.0"
futures = { version = "0.3.21", features = ["thread-pool"] }
hex = "0.4.3"
hotwatch = "0.4.6"
http = "0.2.7"
http-body = "0.4.4"
http = "0.2.8"
http-body = "0.4.5"
humantime = "2.1.0"
humantime-serde = "1.1.1"
hyper = { version = "0.14.18", features = ["server", "client"] }
hyper = { version = "0.14.19", features = ["server", "client"] }
hyper-rustls = { version = "0.23.0", features = ["http1", "http2"] }
include_dir = "0.7.2"
indexmap = "1.8.1"
itertools = "0.10.3"
jsonschema = { version = "0.16.0", default-features = false }
lazy_static = "1.4.0"
libc = "0.2.125"
lru = "0.7.5"
mockall = "0.11.0"
moka = { version = "0.8.4", features = ["future", "futures-util"] }
miette = { version = "4.7.1", features = ["fancy"] }
libc = "0.2.126"
lru = "0.7.7"
mockall = "0.11.1"
moka = { version = "0.8.5", features = ["future", "futures-util"] }
miette = { version = "5.1.0", features = ["fancy"] }
mime = "0.3.16"
multimap = "0.8.3"
once_cell = "1.9.0"
Expand Down Expand Up @@ -95,7 +95,7 @@ prometheus = "0.13"
# Pinned to git revision until next rhai release
rhai = { git="https://github.com/rhaiscript/rhai.git", features = ["sync", "serde", "internals"], rev="6120b7a01a84a8d35d21fcdf2c44432455b68cdb" }
regex = "1.5.6"
reqwest = { version = "0.11.10", default-features = false, features = [
reqwest = { version = "0.11.11", default-features = false, features = [
"rustls-tls",
"json",
"stream",
Expand All @@ -112,17 +112,17 @@ startup = "0.1.1"
static_assertions = "1.1.0"
sys-info = "0.9.1"
thiserror = "1.0.31"
tokio = { version = "1.18.2", features = ["full"] }
tokio-util = { version = "0.7.1", features = ["net", "codec"] }
tokio = { version = "1.19.2", features = ["full"] }
tokio-util = { version = "0.7.3", features = ["net", "codec"] }
tonic = { version = "0.6.2", features = ["transport", "tls"] }
tower = { version = "0.4.12", features = ["full"] }
tower-http = { version = "0.3.3", features = ["trace", "cors", "compression-br", "compression-deflate", "compression-gzip", "decompression-br", "decompression-deflate", "decompression-gzip"] }
tower-service = "0.3.1"
tower = { version = "0.4.13", features = ["full"] }
tower-http = { version = "0.3.4", features = ["trace", "cors", "compression-br", "compression-deflate", "compression-gzip", "decompression-br", "decompression-deflate", "decompression-gzip"] }
tower-service = "0.3.2"
tower-test = "0.4.0"
tracing = "0.1.34"
tracing-core = "0.1.26"
tracing-futures = { version = "0.2.5", features = ["futures-03"] }
tracing-opentelemetry = "0.17.2"
tracing-opentelemetry = "0.17.3"
tracing-subscriber = { version = "0.3.11", features = ["env-filter", "json"] }
url = { version = "2.2.2", features = ["serde"] }
urlencoding = "2.1.0"
Expand All @@ -139,8 +139,8 @@ uname = "0.1.1"
insta = "1.14.0"
jsonpath_lib = "0.3.0"
maplit = "1.0.2"
mockall = "0.11.0"
reqwest = { version = "0.11.10", default-features = false, features = [
mockall = "0.11.1"
reqwest = { version = "0.11.11", default-features = false, features = [
"json",
"stream",
] }
Expand All @@ -154,8 +154,8 @@ tracing-subscriber = { version = "0.3", default-features = false, features = [
"env-filter",
"fmt",
] }
tracing-test = "0.2.1"
uuid = { version = "1.0.0", features = ["serde", "v4"] }
tracing-test = "0.2.2"
uuid = { version = "1.1.2", features = ["serde", "v4"] }
url = "2.2.2"
walkdir = "2.3.2"
[[test]]
Expand Down
6 changes: 3 additions & 3 deletions apollo-spaceport/Cargo.toml
View file
Open in desktop
Expand Up @@ -14,15 +14,15 @@ clap = { version = "=3.1.18", default-features = false, features = ["std", "deri
flate2 = "1.0.23"
prost = "0.9.0"
prost-types = "0.9.0"
reqwest = { version = "0.11.10", default_features = false, features = [
reqwest = { version = "0.11.11", default_features = false, features = [
"rustls-tls",
"json",
] }
serde = {version = "1.0.137", features = ["derive"] }
sys-info = "0.9.1"
tonic = "0.6.2"
tokio = { version = "1.18.2", features = ["macros", "rt-multi-thread"] }
tokio-stream = { version = "0.1.8", features = ["net"] }
tokio-stream = { version = "0.1.9", features = ["net"] }
tracing = "0.1.34"
tracing-subscriber = { version = "0.3.11", features = ["env-filter", "json"] }

Expand All @@ -33,7 +33,7 @@ uname = "0.1.1"
uname = "0.1.1"

[build-dependencies]
reqwest = { version = "0.11.10", default-features = false, features = [
reqwest = { version = "0.11.11", default-features = false, features = [
"rustls-tls",
"blocking",
] }
Expand Down
6 changes: 3 additions & 3 deletions fuzz/Cargo.toml
View file
Open in desktop
Expand Up @@ -11,11 +11,11 @@ cargo-fuzz = true

[dependencies]
libfuzzer-sys = "0.4"
apollo-smith = { version = "0.1.2", features = ["parser-impl"] }
apollo-parser = "0.2.5"
apollo-smith = { version = "0.1.3", features = ["parser-impl"] }
apollo-parser = "0.2.8"
env_logger = "0.9.0"
log = "0.4.17"
reqwest = { version = "0.11.10", features = ["json", "blocking"] }
reqwest = { version = "0.11.11", features = ["json", "blocking"] }
serde_json = "1.0.81"


Expand Down