From 664f077be3c05721a779cd1271924d497c9a644f Mon Sep 17 00:00:00 2001 From: Koxiaet <38139193+Koxiaet@users.noreply.github.com> Date: Thu, 15 Oct 2020 20:48:06 +0100 Subject: [PATCH] Update dependencies and make examples submodule --- .gitmodules | 3 +++ Cargo.toml | 20 ++++++++++---------- benchmark/Cargo.toml | 4 ++-- derive/Cargo.toml | 2 +- examples | 1 + integrations/actix-web/Cargo.toml | 2 +- integrations/rocket/Cargo.toml | 2 +- integrations/rocket/src/lib.rs | 2 -- integrations/tide/Cargo.toml | 2 +- integrations/warp/Cargo.toml | 2 +- 10 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 .gitmodules create mode 160000 examples diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..b0fb2eee --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "examples"] + path = examples + url = https://github.com/async-graphql/examples diff --git a/Cargo.toml b/Cargo.toml index 77cdf91c..96a87a15 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,18 +29,18 @@ async-graphql-value = { path = "value", version = "=2.0.3" } async-graphql-parser = { path = "parser", version = "=2.0.3" } async-stream = "0.3" -async-trait = "0.1.30" +async-trait = "0.1.41" fnv = "1.0.6" -futures = "0.3.5" -indexmap = "1.3.2" +futures = "0.3.6" +indexmap = "1.6.0" itertools = "0.9.0" once_cell = "1.3.1" -pin-project-lite = "0.1.7" -regex = "1.3.5" -serde = { version = "1.0.104", features = ["derive"] } +pin-project-lite = "0.1.10" +regex = "1.4.1" +serde = { version = "1.0.117", features = ["derive"] } serde_json = "1.0.48" -spin = "0.5.2" -thiserror = "1.0.11" +spin = "0.6.0" +thiserror = "1.0.21" static_assertions = "1.1.0" # Feature optional dependencies @@ -49,7 +49,7 @@ bson = { version = "1.0.0", optional = true } chrono = { version = "0.4.15", optional = true } chrono-tz = { version = "0.5.1", optional = true } log = { version = "0.4.11", optional = true } -tracing = { version = "0.1.19", optional = true } +tracing = { version = "0.1.21", optional = true } url = { version = "2.1.1", optional = true } num-traits = { version = "0.2.12", optional = true } lru = { version = "0.6.0", optional = true } @@ -60,7 +60,7 @@ tempfile = { version = "3.1.0", optional = true } blocking = { version = "1.0.0", optional = true } [dev-dependencies] -async-std = { version = "1.5.0", features = ["attributes"] } +async-std = { version = "1.6.5", features = ["attributes"] } [package.metadata.docs.rs] features = ["nightly"] diff --git a/benchmark/Cargo.toml b/benchmark/Cargo.toml index c2a76259..0d15143a 100644 --- a/benchmark/Cargo.toml +++ b/benchmark/Cargo.toml @@ -5,8 +5,8 @@ authors = ["sunli ", "Koxiaet"] edition = "2018" [dependencies] -async-std = { version = "1.5.0", features = ["attributes"] } -futures = "0.3.4" +async-std = { version = "1.6.5", features = ["attributes"] } +futures = "0.3.6" serde_json = "*" async-graphql-parser = { path = "../parser" } async-graphql = { path = ".." } diff --git a/derive/Cargo.toml b/derive/Cargo.toml index 2c8f565e..0d84e6fc 100644 --- a/derive/Cargo.toml +++ b/derive/Cargo.toml @@ -18,7 +18,7 @@ proc-macro = true [dependencies] async-graphql-parser = { path = "../parser", version = "=2.0.3" } proc-macro2 = "1.0.6" -syn = { version = "1.0.20", features = ["full", "extra-traits", "visit-mut"] } +syn = { version = "1.0.44", features = ["full", "extra-traits", "visit-mut"] } quote = "1.0.3" Inflector = "0.11.4" proc-macro-crate = "0.1.4" diff --git a/examples b/examples new file mode 160000 index 00000000..cb336084 --- /dev/null +++ b/examples @@ -0,0 +1 @@ +Subproject commit cb3360847366d2fd70a33eb5f9df60e90e8979da diff --git a/integrations/actix-web/Cargo.toml b/integrations/actix-web/Cargo.toml index 137a845c..bd6e2565 100644 --- a/integrations/actix-web/Cargo.toml +++ b/integrations/actix-web/Cargo.toml @@ -17,7 +17,7 @@ async-graphql = { path = "../..", version = "=2.0.3" } actix = "0.10.0" actix-http = "2.0.0" -actix-web = { version = "3.0.2", default-features = false } +actix-web = { version = "3.1.0", default-features = false } actix-web-actors = "3.0.0" async-channel = "1.5.1" futures-util = { version = "0.3.6", default-features = false } diff --git a/integrations/rocket/Cargo.toml b/integrations/rocket/Cargo.toml index a6e99a8d..ac3b658d 100644 --- a/integrations/rocket/Cargo.toml +++ b/integrations/rocket/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Daniel Wiesenberg "] edition = "2018" description = "async-graphql for Rocket.rs" # Waiting for Rocket 0.5 release. -#publish = true +publish = false license = "MIT/Apache-2.0" documentation = "https://docs.rs/async-graphql/" homepage = "https://github.com/async-graphql/async-graphql" diff --git a/integrations/rocket/src/lib.rs b/integrations/rocket/src/lib.rs index ac71ef09..704d796a 100644 --- a/integrations/rocket/src/lib.rs +++ b/integrations/rocket/src/lib.rs @@ -28,8 +28,6 @@ use query_deserializer::QueryDeserializer; mod query_deserializer; -pub use rocket; - /// A batch request which can be extracted from a request's body. /// /// # Examples diff --git a/integrations/tide/Cargo.toml b/integrations/tide/Cargo.toml index 1158b70e..4b437159 100644 --- a/integrations/tide/Cargo.toml +++ b/integrations/tide/Cargo.toml @@ -20,5 +20,5 @@ tide = { version = "0.13.0", default-features = false, features = ["h1-server"] [dev-dependencies] # Surf lacks multipart support reqwest = { version = "0.10.8", default-features = false, features = ["json"] } -tokio = { version = "0.2.22", default-features = false, features = ["rt-threaded", "macros"] } +tokio = { version = "0.3.0", default-features = false, features = ["macros"] } serde_json = "1.0.59" diff --git a/integrations/warp/Cargo.toml b/integrations/warp/Cargo.toml index eb9ed958..ed068b8e 100644 --- a/integrations/warp/Cargo.toml +++ b/integrations/warp/Cargo.toml @@ -19,4 +19,4 @@ futures-util = { version = "0.3.6", default-features = false } serde_json = "1.0.59" [dev-dependencies] -tokio = { version = "0.2", default-features = false, features = ["macros"] } +tokio = { version = "0.3.0", default-features = false, features = ["macros"] }