From 838d91aca3c90b06d3c294e9edd8f215e754f138 Mon Sep 17 00:00:00 2001 From: tottoto Date: Mon, 27 Feb 2023 23:33:14 +0900 Subject: [PATCH] chore: Update to tower-http 0.4 (#1296) * chore: Update to tower-http 0.4 * chore(tonic): Update to axum 0.6.9 --- examples/Cargo.toml | 4 ++-- tests/compression/Cargo.toml | 2 +- tests/integration_tests/Cargo.toml | 2 +- tonic-web/Cargo.toml | 2 +- tonic/Cargo.toml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/Cargo.toml b/examples/Cargo.toml index facb577..3868925 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -250,7 +250,7 @@ tower = ["dep:futures", "dep:hyper", "dep:tower", "dep:http"] json-codec = ["dep:serde", "dep:serde_json", "dep:bytes"] compression = ["tonic/gzip"] tls = ["tonic/tls"] -tls-rustls = ["dep:hyper", "dep:hyper-rustls", "dep:tower", "tower-http/add-extension", "dep:rustls-pemfile", "dep:tokio-rustls"] +tls-rustls = ["dep:hyper", "dep:hyper-rustls", "dep:tower", "tower-http/util", "tower-http/add-extension", "dep:rustls-pemfile", "dep:tokio-rustls"] dynamic-load-balance = ["dep:tower"] timeout = ["tokio/time", "dep:tower"] tls-client-auth = ["tonic/tls"] @@ -287,7 +287,7 @@ h2 = { version = "0.3", optional = true } tokio-rustls = { version = "0.23", optional = true } hyper-rustls = { version = "0.23", features = ["http2"], optional = true } rustls-pemfile = { version = "1", optional = true } -tower-http = { version = "0.3", optional = true } +tower-http = { version = "0.4", optional = true } [build-dependencies] tonic-build = { path = "../tonic-build", features = ["prost"] } diff --git a/tests/compression/Cargo.toml b/tests/compression/Cargo.toml index 43e64b1..4c1e713 100644 --- a/tests/compression/Cargo.toml +++ b/tests/compression/Cargo.toml @@ -17,7 +17,7 @@ prost = "0.11" tokio = {version = "1.0", features = ["macros", "rt-multi-thread", "net"]} tonic = {path = "../../tonic", features = ["gzip"]} tower = {version = "0.4", features = []} -tower-http = {version = "0.3", features = ["map-response-body", "map-request-body"]} +tower-http = {version = "0.4", features = ["map-response-body", "map-request-body"]} [build-dependencies] tonic-build = {path = "../../tonic-build" } diff --git a/tests/integration_tests/Cargo.toml b/tests/integration_tests/Cargo.toml index d9c20b5..3bf2613 100644 --- a/tests/integration_tests/Cargo.toml +++ b/tests/integration_tests/Cargo.toml @@ -23,7 +23,7 @@ http-body = "0.4" hyper = "0.14" tokio-stream = {version = "0.1.5", features = ["net"]} tower = {version = "0.4", features = []} -tower-http = { version = "0.3", features = ["set-header", "trace"] } +tower-http = { version = "0.4", features = ["set-header", "trace"] } tower-service = "0.3" tracing-subscriber = {version = "0.3", features = ["env-filter"]} diff --git a/tonic-web/Cargo.toml b/tonic-web/Cargo.toml index 33ea562..b4c2bd9 100644 --- a/tonic-web/Cargo.toml +++ b/tonic-web/Cargo.toml @@ -25,7 +25,7 @@ pin-project = "1" tonic = {version = "0.8", path = "../tonic", default-features = false} tower-service = "0.3" tower-layer = "0.3" -tower-http = { version = "0.3", features = ["cors"] } +tower-http = { version = "0.4", features = ["cors"] } tracing = "0.1" [dev-dependencies] diff --git a/tonic/Cargo.toml b/tonic/Cargo.toml index 4213104..54a48e4 100644 --- a/tonic/Cargo.toml +++ b/tonic/Cargo.toml @@ -74,7 +74,7 @@ hyper-timeout = {version = "0.4", optional = true} tokio = {version = "1.0.1", features = ["net", "time", "macros"], optional = true} tokio-stream = "0.1" tower = {version = "0.4.7", default-features = false, features = ["balance", "buffer", "discover", "limit", "load", "make", "timeout", "util"], optional = true} -axum = {version = "0.6", default_features = false, optional = true} +axum = {version = "0.6.9", default_features = false, optional = true} # rustls async-stream = { version = "0.3", optional = true }