diff options
author | Jisi Liu <liujisi@google.com> | 2018-02-26 10:05:09 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-26 10:05:09 -0800 |
commit | bb40c0c0c4482cd97e250b24379c1b594ecc0a12 (patch) | |
tree | 139ffeb582df16a54f9f0ab5800a0793ef0e7cf7 /ruby | |
parent | a6037c5230c0ccb6531f80cef909dbfe37257884 (diff) | |
parent | 91317c291ec819d13c83f924b39f7769fe479673 (diff) | |
download | protobuf-bb40c0c0c4482cd97e250b24379c1b594ecc0a12.tar.gz protobuf-bb40c0c0c4482cd97e250b24379c1b594ecc0a12.tar.bz2 protobuf-bb40c0c0c4482cd97e250b24379c1b594ecc0a12.zip |
Merge pull request #4291 from google/3.5.x
Merge 3.5.x to master
Diffstat (limited to 'ruby')
-rw-r--r-- | ruby/Rakefile | 4 | ||||
-rw-r--r-- | ruby/google-protobuf.gemspec | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ruby/Rakefile b/ruby/Rakefile index e30a75a3..7aecfe85 100644 --- a/ruby/Rakefile +++ b/ruby/Rakefile @@ -64,13 +64,13 @@ else task 'gem:windows' do require 'rake_compiler_dock' - RakeCompilerDock.sh "bundle && IN_DOCKER=true rake cross native gem RUBY_CC_VERSION=2.4.0:2.3.0:2.2.2:2.1.5:2.0.0" + RakeCompilerDock.sh "bundle && IN_DOCKER=true rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0" end if RUBY_PLATFORM =~ /darwin/ task 'gem:native' do system "rake genproto" - system "rake cross native gem RUBY_CC_VERSION=2.4.0:2.3.0:2.2.2:2.1.5:2.0.0" + system "rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0" end else task 'gem:native' => [:genproto, 'gem:windows'] diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 998952d0..8fcf85c7 100644 --- a/ruby/google-protobuf.gemspec +++ b/ruby/google-protobuf.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "google-protobuf" - s.version = "3.5.1" + s.version = "3.5.1.2" s.licenses = ["BSD-3-Clause"] s.summary = "Protocol Buffers" s.description = "Protocol Buffers are Google's data interchange format." |