Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13493 from mehrdada/bump-protobuf-3.5.0

Browse Source 
Bump third_party/protobuf submodule to v3.5.0
pull/12849/head^2
Mehrdad Afshari 7 years ago committed by GitHub
parent 6fc02c6a2b 28661ea6e1
commit de93112a3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      WORKSPACE
  2. 2
      third_party/protobuf
  3. 2
      tools/codegen/core/gen_nano_proto.sh
  4. 4
      tools/distrib/python/grpcio_tools/protoc_lib_deps.py
  5. 2
      tools/run_tests/sanity/check_submodules.sh

4
WORKSPACE
Unescape View File

@ -73,8 +73,8 @@ new_http_archive(
http_archive( http_archive(
name = "com_google_protobuf", name = "com_google_protobuf",
strip_prefix = "protobuf-80a37e0782d2d702d52234b62dd4b9ec74fd2c95", strip_prefix = "protobuf-2761122b810fe8861004ae785cc3ab39f384d342",
url = "https://github.com/google/protobuf/archive/80a37e0782d2d702d52234b62dd4b9ec74fd2c95.tar.gz", url = "https://github.com/google/protobuf/archive/2761122b810fe8861004ae785cc3ab39f384d342.tar.gz",
) )
new_http_archive( new_http_archive(

2
third_party/protobuf vendored

@ -1 +1 @@
Subproject commit 80a37e0782d2d702d52234b62dd4b9ec74fd2c95 Subproject commit 2761122b810fe8861004ae785cc3ab39f384d342

2
tools/codegen/core/gen_nano_proto.sh
Unescape View File

@ -68,7 +68,7 @@ popd
# this should be the same version as the submodule we compile against # this should be the same version as the submodule we compile against
# ideally we'd update this as a template to ensure that # ideally we'd update this as a template to ensure that
pip install protobuf==3.2.0 pip install protobuf==3.5.0.post1
pushd "$(dirname $INPUT_PROTO)" > /dev/null pushd "$(dirname $INPUT_PROTO)" > /dev/null

4
tools/distrib/python/grpcio_tools/protoc_lib_deps.py
View File

File diff suppressed because one or more lines are too long

2
tools/run_tests/sanity/check_submodules.sh
Unescape View File

@ -31,7 +31,7 @@ cat << EOF | awk '{ print $1 }' | sort > $want_submodules
886e7d75368e3f4fab3f4d0d3584e4abfc557755 third_party/boringssl-with-bazel (version_for_cocoapods_7.0-857-g886e7d7) 886e7d75368e3f4fab3f4d0d3584e4abfc557755 third_party/boringssl-with-bazel (version_for_cocoapods_7.0-857-g886e7d7)
30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e third_party/gflags (v2.2.0) 30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e third_party/gflags (v2.2.0)
ec44c6c1675c25b9827aacd08c02433cccde7780 third_party/googletest (release-1.8.0) ec44c6c1675c25b9827aacd08c02433cccde7780 third_party/googletest (release-1.8.0)
80a37e0782d2d702d52234b62dd4b9ec74fd2c95 third_party/protobuf (v3.4.0) 2761122b810fe8861004ae785cc3ab39f384d342 third_party/protobuf (v3.5.0)
cacf7f1d4e3d44d871b605da3b647f07d718623f third_party/zlib (v1.2.11) cacf7f1d4e3d44d871b605da3b647f07d718623f third_party/zlib (v1.2.11)
3be1924221e1326df520f8498d704a5c4c8d0cce third_party/cares/cares (cares-1_13_0) 3be1924221e1326df520f8498d704a5c4c8d0cce third_party/cares/cares (cares-1_13_0)
73594cde8c9a52a102c4341c244c833aa61b9c06 third_party/bloaty 73594cde8c9a52a102c4341c244c833aa61b9c06 third_party/bloaty

Write Preview
Loading…
Cancel
Save