From 1594ee7aa30f2a3448715b376f5c7a81fa813d17 Mon Sep 17 00:00:00 2001
From: Ukonn Ra <ukonnra@outlook.com>
Date: Wed, 25 Sep 2019 21:25:34 +0800
Subject: [PATCH] UPDATE: Update the dependency(branch) of the h2 and typer

---
 .gitignore                     |  1 +
 tower-grpc-examples/Cargo.toml | 16 ++++++++--------
 tower-grpc/Cargo.toml          |  6 +++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index a9d37c56..2da6cdeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 target
 Cargo.lock
+.idea
\ No newline at end of file
diff --git a/tower-grpc-examples/Cargo.toml b/tower-grpc-examples/Cargo.toml
index b7bf65b6..cf73ef52 100644
--- a/tower-grpc-examples/Cargo.toml
+++ b/tower-grpc-examples/Cargo.toml
@@ -5,9 +5,9 @@ edition = "2018"
 authors = ["Carl Lerche <me@carllerche.com>"]
 publish = false
 
-# [[bin]]
-# name = "helloworld-server"
-# path = "src/helloworld/server.rs"
+ [[bin]]
+ name = "helloworld-server"
+ path = "src/helloworld/server.rs"
 
 [[bin]]
 name = "helloworld-client"
@@ -30,19 +30,19 @@ path = "src/helloworld/client.rs"
 # path = "src/routeguide/client.rs"
 
 [dependencies]
-futures = { package = "futures-preview", version = "=0.3.0-alpha.17" }
+futures = { package = "futures-preview", version = "=0.3.0-alpha.18" }
 bytes = "0.4"
 env_logger = { version = "0.5", default-features = false }
 log = "0.4"
 http = "0.1"
 prost = "0.5"
-tokio = "=0.2.0-alpha.1"
+tokio = "=0.2.0-alpha.5"
 # tower-request-modifier = { git = "https://github.com/tower-rs/tower-http" }
 # tower-hyper = "0.1"
-tower-h2 = { git = "https://github.com/LucioFranco/h2", branch = "lucio/tower-h2-hack" }
+h2 = { git = "https://github.com/LucioFranco/h2", branch = "0.1.x" }
 # hyper = "0.12"
-tower-grpc = { path = "../tower-grpc" }
-tower-service = { git = "https://github.com/tower-rs/tower", branch = "std-future" }
+tower-grpc = { path = "../tower-grpc", branch = "v0.3.x" }
+tower-service = { git = "https://github.com/tower-rs/tower", branch = "v0.3.x" }
 # tower-util = "0.1"
 
 # For the routeguide example
diff --git a/tower-grpc/Cargo.toml b/tower-grpc/Cargo.toml
index 9ab04d1f..061f0e72 100644
--- a/tower-grpc/Cargo.toml
+++ b/tower-grpc/Cargo.toml
@@ -27,7 +27,7 @@ protobuf = ["prost"]
 [dependencies]
 base64 = "0.10"
 bytes = "0.4.7"
-futures-preview = "=0.3.0-alpha.17"
+futures-preview = "=0.3.0-alpha.18"
 http = "0.1.14"
 h2 = "0.1.11"
 log = "0.4"
@@ -35,8 +35,8 @@ percent-encoding = "1.0.1"
 tower-hyper = { version = "0.1", optional = true }
 http-body = { git = "https://github.com/hyperium/http-body", branch = "std-future" }
 # http-body = { path = "../../http-body" }
-tower-service = { git = "https://github.com/tower-rs/tower", branch = "std-future" }
-tower-util = { git = "https://github.com/tower-rs/tower", branch = "std-future" }
+tower-service = { git = "https://github.com/tower-rs/tower", branch = "v0.3.x" }
+tower-util = { git = "https://github.com/tower-rs/tower", branch = "v0.3.x" }
 
 # For protobuf
 prost = { version = "0.5", optional = true }