diff options
| author |  Nathaniel Manista <nathaniel@google.com> | 2016-12-16 21:21:14 +0000 |
|---|---|---|
| committer | Nathaniel Manista <nathaniel@google.com> | 2016-12-16 23:48:52 +0000 |
| commit | 8f7b0b48bf75b652653cb0391fff06c5160e46fa (patch) | |
| tree | 3d57d49ad90086e0b5e29c72e6a47e956fffc4ea /grpc.gemspec | |
| parent | b229094678502e2606164a3240dbc8375ad403b5 (diff) | |
| parent | 3fa20cffc6d7f46a6df262a0c8e155619bb7ed39 (diff) | |
v1.0.x → master upmerge
Manual changes:
- Fixed use of Exception.message in _invalid_metadata_test.py
- Fixed merge of one_failed_as_unavailable in rpc_server_spec.rb
- Added "set -e" to generate_build_additions.sh
Diffstat (limited to 'grpc.gemspec')
| -rwxr-xr-x | grpc.gemspec | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/grpc.gemspec b/grpc.gemspec index 6019b97f67..9cafd1f2f9 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.2' + s.add_dependency 'google-protobuf', '~> 3.1.0' s.add_dependency 'googleauth', '~> 0.5.1' s.add_development_dependency 'bundler', '~> 1.9' |