diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-02-10 20:13:36 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-02-10 21:28:52 +0100 |
| commit | 32b3f67438cb2793021885b414ff4fe47639734b (patch) | |
| tree | 83742378a6a5db526bb1e78aee5ff9c413b92da2 /templates | |
| parent | 203041148a9e2510b5cad6c038dc53bab0741ac2 (diff) | |
| parent | a8ba0c56158eca15cca58725a49a0ceb7e68e795 (diff) | |
Merge remote-tracking branch 'google/release-0_13' into merge-and-regen
Conflicts:
build.yaml
src/ruby/lib/grpc/version.rb
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/grpc.gemspec.template | 4 | ||||
| -rw-r--r-- | templates/src/ruby/lib/grpc/version.rb.template | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/templates/grpc.gemspec.template b/templates/grpc.gemspec.template index c4987a6725..6cc3e964a3 100644 --- a/templates/grpc.gemspec.template +++ b/templates/grpc.gemspec.template @@ -33,7 +33,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.0alpha.1.1' + s.add_dependency 'google-protobuf', '~> 3.0.0.alpha.5.0.2' s.add_dependency 'googleauth', '~> 0.5.1' s.add_development_dependency 'bundler', '~> 1.9' @@ -41,7 +41,7 @@ s.add_development_dependency 'simplecov', '~> 0.9' s.add_development_dependency 'rake', '~> 10.4' s.add_development_dependency 'rake-compiler', '~> 0.9' - s.add_development_dependency 'rake-compiler-dock', '~> 0.5' + s.add_development_dependency 'rake-compiler-dock', '~> 0.5.1' s.add_development_dependency 'rspec', '~> 3.2' s.add_development_dependency 'rubocop', '~> 0.30.0' s.add_development_dependency 'signet', '~> 0.7.0' diff --git a/templates/src/ruby/lib/grpc/version.rb.template b/templates/src/ruby/lib/grpc/version.rb.template index a47d2d8548..6488614aed 100644 --- a/templates/src/ruby/lib/grpc/version.rb.template +++ b/templates/src/ruby/lib/grpc/version.rb.template @@ -31,5 +31,5 @@ # GRPC contains the General RPC module. module GRPC - VERSION = '${settings.ruby_version}' + VERSION = '${settings.ruby_version.ruby()}' end |