diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-09-22 18:10:26 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-09-22 18:10:26 -0700 |
| commit | 4065944c619506845705df695e46d044d6b93668 (patch) | |
| tree | b4e5bff765b65f01647b3c238e1797ac2b533b51 | |
| parent | 8f2525ffe61743cda970d73c2b5251b09105bd55 (diff) | |
| parent | d1ca40995f789946bbbd8a5920d3a4ede5c6c963 (diff) | |
Merge pull request #8170 from nicolasnoble/upgrading-protobuf-to-3.0.2
Upgrading protobuf to 3.0.2
| -rwxr-xr-x | grpc.gemspec | 2 | ||||
| -rw-r--r-- | templates/grpc.gemspec.template | 2 | ||||
| m--------- | third_party/protobuf | 0 | ||||
| -rwxr-xr-x | tools/run_tests/sanity/check_submodules.sh | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/grpc.gemspec b/grpc.gemspec index 59c27fd782..088b99b1e6 100755 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |s| s.require_paths = %w( src/ruby/bin src/ruby/lib src/ruby/pb ) s.platform = Gem::Platform::RUBY - s.add_dependency 'google-protobuf', '~> 3.0' + s.add_dependency 'google-protobuf', '~> 3.0.2' s.add_dependency 'googleauth', '~> 0.5.1' s.add_development_dependency 'bundler', '~> 1.9' diff --git a/templates/grpc.gemspec.template b/templates/grpc.gemspec.template index f95adaf30f..62d61b75c1 100644 --- a/templates/grpc.gemspec.template +++ b/templates/grpc.gemspec.template @@ -29,7 +29,7 @@ s.require_paths = %w( src/ruby/bin src/ruby/lib src/ruby/pb ) s.platform = Gem::Platform::RUBY - s.add_dependency 'google-protobuf', '~> 3.0' + s.add_dependency 'google-protobuf', '~> 3.0.2' s.add_dependency 'googleauth', '~> 0.5.1' s.add_development_dependency 'bundler', '~> 1.9' diff --git a/third_party/protobuf b/third_party/protobuf -Subproject e8ae137c96444ea313485ed1118c5e43b2099cf +Subproject 1a586735085e817b1f52e53feec92ce418049f6 diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index 04123ee5d8..9954fba659 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -45,7 +45,7 @@ cat << EOF | awk '{ print $1 }' | sort > $want_submodules 05b155ff59114735ec8cd089f669c4c3d8f59029 third_party/gflags (v2.1.0-45-g05b155f) c99458533a9b4c743ed51537e25989ea55944908 third_party/googletest (release-1.7.0) f8ac463766281625ad710900479130c7fcb4d63b third_party/nanopb (nanopb-0.3.4-29-gf8ac463) - e8ae137c96444ea313485ed1118c5e43b2099cf1 third_party/protobuf (v3.0.0-beta-4-74-ge8ae137) + 1a586735085e817b1f52e53feec92ce418049f69 third_party/protobuf (v3.0.2) 50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8) EOF |