Skip to content

Commit

Permalink
Upgrade to hyper 1 and http 1
Browse files Browse the repository at this point in the history 
Upgrades only in Cargo.toml

Co-authored-by: Ivan Krivosheev <py.krivosheev@gmail.com>
Co-authored-by: Allan Zhang <allanzhang7@gmail.com>
  • Loading branch information
@alexrudy @ikrivosheev @allan2
3 people committed Jun 12, 2024
1 parent d1558bd commit 20369f5
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 27 deletions.
16 changes: 9 additions & 7 deletions examples/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,16 +311,18 @@ serde_json = { version = "1.0", optional = true }
tracing = { version = "0.1.16", optional = true }
tracing-subscriber = { version = "0.3", features = ["tracing-log", "fmt"], optional = true }
prost-types = { version = "0.12", optional = true }
http = { version = "0.2", optional = true }
http-body = { version = "0.4.2", optional = true }
hyper = { version = "0.14", optional = true }
http = { version = "1", optional = true }
http-body = { version = "1", optional = true }
http-body-util = { version = "0.1", optional = true }
hyper = { version = "1", optional = true }
hyper-util = { version = "0.1", optional = true }
listenfd = { version = "1.0", optional = true }
bytes = { version = "1", optional = true }
h2 = { version = "0.3", optional = true }
tokio-rustls = { version = "0.24.0", optional = true }
hyper-rustls = { version = "0.24.0", features = ["http2"], optional = true }
rustls-pemfile = { version = "1", optional = true }
tower-http = { version = "0.4", optional = true }
tokio-rustls = { version = "0.26", optional = true, features = ["ring", "tls12"], default-features = false }
hyper-rustls = { version = "0.27.0", features = ["http2", "ring", "tls12"], optional = true, default-features = false }
rustls-pemfile = { version = "2.0.0", optional = true }
tower-http = { version = "0.5", optional = true }

[build-dependencies]
tonic-build = { path = "../tonic-build", features = ["prost"] }
6 changes: 3 additions & 3 deletions interop/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ async-stream = "0.3"
strum = {version = "0.26", features = ["derive"]}
pico-args = {version = "0.5", features = ["eq-separator"]}
console = "0.15"
http = "0.2"
http-body = "0.4.2"
hyper = "0.14"
http = "1"
http-body = "1"
hyper = "1"
prost = "0.12"
tokio = {version = "1.0", features = ["rt-multi-thread", "time", "macros"]}
tokio-stream = "0.1"
Expand Down
8 changes: 5 additions & 3 deletions tests/compression/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ version = "0.1.0"

[dependencies]
bytes = "1"
http = "0.2"
http-body = "0.4"
hyper = "0.14.3"
http = "1"
http-body = "1"
http-body-util = "0.1"
hyper = "1"
hyper-util = "0.1"
paste = "1.0.12"
pin-project = "1.0"
prost = "0.12"
Expand Down
7 changes: 4 additions & 3 deletions tests/integration_tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ tracing-subscriber = {version = "0.3"}

[dev-dependencies]
async-stream = "0.3"
http = "0.2"
http-body = "0.4"
hyper = "0.14"
http = "1"
http-body = "1"
hyper = "1"
hyper-util = "0.1"
tokio-stream = {version = "0.1.5", features = ["net"]}
tower = {version = "0.4", features = []}
tower-http = { version = "0.4", features = ["set-header", "trace"] }
Expand Down
6 changes: 3 additions & 3 deletions tonic-web/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ version = "0.11.0"
base64 = "0.22"
bytes = "1"
tokio-stream = "0.1"
http = "0.2"
http-body = "0.4"
hyper = {version = "0.14", default-features = false, features = ["stream"]}
http = "1"
http-body = "1"
http-body-util = "0.1"
pin-project = "1"
tonic = {version = "0.11", path = "../tonic", default-features = false}
tower-service = "0.3"
Expand Down
5 changes: 4 additions & 1 deletion tonic-web/tests/integration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ license = "MIT"
[dependencies]
base64 = "0.22"
bytes = "1.0"
hyper = "0.14"
http-body = "1"
http-body-util = "0.1"
hyper = "1"
hyper-util = "0.1"
prost = "0.12"
tokio = { version = "1", features = ["macros", "rt", "net"] }
tokio-stream = { version = "0.1", features = ["net"] }
Expand Down
17 changes: 10 additions & 7 deletions tonic/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,11 @@ channel = []
[dependencies]
base64 = "0.22"
bytes = "1.0"
http = "0.2"
http = "1"
tracing = "0.1"

http-body = "0.4.4"
http-body = "1"
http-body-util = "0.1"
percent-encoding = "2.1"
pin-project = "1.0.11"
tower-layer = "0.3"
Expand All @@ -68,11 +69,13 @@ async-trait = {version = "0.1.13", optional = true}

# transport
async-stream = {version = "0.3", optional = true}
h2 = {version = "0.3.24", optional = true}
hyper = {version = "0.14.26", features = ["full"], optional = true}
hyper-timeout = {version = "0.4", optional = true}
tokio = {version = "1.0.1", optional = true}
tokio-stream = "0.1"
h2 = {version = "0.4", optional = true}
hyper = {version = "1", features = ["full"], optional = true}
hyper-util = { version = ">=0.1.4, <0.2", features = ["full"], optional = true }
hyper-timeout = {version = "0.5", optional = true}
socket2 = { version = ">=0.4.7, <0.6.0", optional = true, features = ["all"] }
tokio = {version = "1", default-features = false, optional = true}
tokio-stream = { version = "0.1", features = ["net"] }
tower = {version = "0.4.7", default-features = false, features = ["balance", "buffer", "discover", "limit", "load", "make", "timeout", "util"], optional = true}
axum = {version = "0.6.9", default-features = false, optional = true}

Expand Down

0 comments on commit 20369f5

Please sign in to comment.