Skip to content

Commit

Permalink
fix hash and bump 0.5.0-alpha.2 (#348)
Browse files Browse the repository at this point in the history
  • Loading branch information
BusyJay authored Jul 18, 2019
1 parent 8302d59 commit fd9b6c6
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 15 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 0.5.0-alpha.2 - 2019-07-18

- Support using vendored openssl
- Use bindgen to generate code instead

# 0.5.0-alpha.1 - 2019-04-08

- Fix grpc_sys import when secure feature is disabled
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grpcio"
version = "0.5.0-alpha.1"
version = "0.5.0-alpha.2"
edition = "2018"
authors = ["The TiKV Project Developers"]
license = "Apache-2.0"
Expand All @@ -21,7 +21,7 @@ grpcio-sys = { path = "grpc-sys", version = "0.5.0-alpha" }
libc = "0.2"
futures = "^0.1.15"
protobuf = { version = "2.0", optional = true }
prost = { git = "https://github.com/danburkert/prost", rev = "1944c27c3029d01ff216e7b126d846b6cf8c7d77", optional = true }
prost = { version = "0.5", optional = true }
bytes = { version = "0.4.11", optional = true }
log = "0.4"

Expand Down Expand Up @@ -57,7 +57,7 @@ path = "examples/hello_world/server.rs"
serde_json = "1.0"
serde = "1.0"
serde_derive = "1.0"
grpcio-proto = { path = "proto", default-features = false }
grpcio-proto = { path = "proto", version = "0.5.0-alpha.2", default-features = false }
rand = "0.4"
slog = "2.0"
slog-async = "2.1"
Expand Down
8 changes: 4 additions & 4 deletions compiler/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grpcio-compiler"
version = "0.5.0-alpha"
version = "0.5.0-alpha.2"
edition = "2018"
authors = ["The TiKV Project Developers"]
license = "Apache-2.0"
Expand All @@ -18,9 +18,9 @@ prost-codec = ["prost-build", "prost-types", "prost"]

[dependencies]
protobuf = "2"
prost = { git = "https://github.com/danburkert/prost", rev = "1944c27c3029d01ff216e7b126d846b6cf8c7d77", optional = true }
prost-build = { git = "https://github.com/danburkert/prost", rev = "1944c27c3029d01ff216e7b126d846b6cf8c7d77", optional = true }
prost-types = { git = "https://github.com/danburkert/prost", rev = "1944c27c3029d01ff216e7b126d846b6cf8c7d77", optional = true }
prost = { version = "0.5", optional = true }
prost-build = { version = "0.5", optional = true }
prost-types = { version = "0.5", optional = true }
protobuf-codegen = { version = "2", optional = true }
derive-new = "0.5"
tempfile = "3.0"
Expand Down
2 changes: 1 addition & 1 deletion grpc-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grpcio-sys"
version = "0.5.0-alpha"
version = "0.5.0-alpha.2"
authors = ["The TiKV Project Developers"]
license = "Apache-2.0"
keywords = ["grpc", "bindings"]
Expand Down
14 changes: 7 additions & 7 deletions proto/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grpcio-proto"
version = "0.5.0-alpha"
version = "0.5.0-alpha.2"
edition = "2018"
authors = ["The TiKV Project Developers"]
license = "Apache-2.0"
Expand All @@ -19,17 +19,17 @@ prost-codec = ["prost-derive", "bytes", "lazy_static", "grpcio/prost-codec", "pr

[dependencies]
futures = "0.1"
grpcio = { path = "..", features = ["secure"], default-features = false }
grpcio = { path = "..", features = ["secure"], version = "0.5.0-alpha.2", default-features = false }
bytes = { version = "0.4", optional = true }
prost = { git = "https://github.com/danburkert/prost", rev = "1944c27c3029d01ff216e7b126d846b6cf8c7d77", optional = true }
prost-derive = { git = "https://github.com/danburkert/prost", rev = "1944c27c3029d01ff216e7b126d846b6cf8c7d77", optional = true }
prost = { version = "0.5", optional = true }
prost-derive = { version = "0.5", optional = true }
protobuf = "2"
lazy_static = { version = "1.3", optional = true }

[build-dependencies]
protobuf-build = "0.7"
grpcio-compiler = { path = "../compiler", default-features = false }
prost = { git = "https://github.com/danburkert/prost", rev = "1944c27c3029d01ff216e7b126d846b6cf8c7d77", optional = true }
prost-types = { git = "https://github.com/danburkert/prost", rev = "1944c27c3029d01ff216e7b126d846b6cf8c7d77", optional = true }
grpcio-compiler = { path = "../compiler", version = "0.5.0-alpha.2", default-features = false }
prost = { version = "0.5", optional = true }
prost-types = { version = "0.5", optional = true }
protobuf = { version = "2", optional = true }
protobuf-codegen = { version = "2", optional = true }

0 comments on commit fd9b6c6

Please sign in to comment.