diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2017-02-13 14:46:30 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 14:46:30 -0800 |
| commit | d47fb8d69e20f5ca2d4760e59d1c7fcf4cbbca63 (patch) | |
| tree | 1e2ed23b10192237f4bcb1ee89132d73d93fa060 | |
| parent | 124a2f6dbc4741ceb7eac129864977a13f6702cc (diff) | |
| parent | 82c7017891c54f80da7ca9be2a5eef2b49f66376 (diff) | |
| download | protobuf-d47fb8d69e20f5ca2d4760e59d1c7fcf4cbbca63.tar.gz protobuf-d47fb8d69e20f5ca2d4760e59d1c7fcf4cbbca63.tar.bz2 protobuf-d47fb8d69e20f5ca2d4760e59d1c7fcf4cbbca63.zip | |
Merge pull request #2675 from haberman/ruby24
Ruby: build packages for Ruby 2.4.
| -rw-r--r-- | ruby/Rakefile | 4 | ||||
| -rw-r--r-- | ruby/google-protobuf.gemspec | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ruby/Rakefile b/ruby/Rakefile index 40d0a314..a329a777 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.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.4.0:2.3.0:2.2.2:2.1.5:2.0.0" end if RUBY_PLATFORM =~ /darwin/ task 'gem:native' do system "rake genproto" - system "rake cross native gem RUBY_CC_VERSION=2.3.0:2.2.2:2.1.5:2.0.0" + system "rake cross native gem RUBY_CC_VERSION=2.4.0:2.3.0:2.2.2:2.1.5:2.0.0" end else task 'gem:native' => [:genproto, 'gem:windows'] diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 97bf9970..ff787916 100644 --- a/ruby/google-protobuf.gemspec +++ b/ruby/google-protobuf.gemspec @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.name = "google-protobuf" s.version = "3.2.0" - s.licenses = ["BSD"] + s.licenses = ["BSD-3-Clause"] s.summary = "Protocol Buffers" s.description = "Protocol Buffers are Google's data interchange format." s.homepage = "https://developers.google.com/protocol-buffers" @@ -15,12 +15,12 @@ Gem::Specification.new do |s| else s.files += Dir.glob('ext/**/*') s.extensions= ["ext/google/protobuf_c/extconf.rb"] - s.add_development_dependency "rake-compiler-dock", "~> 0.5.1" + s.add_development_dependency "rake-compiler-dock", "~> 0.6.0" end s.test_files = ["tests/basic.rb", "tests/stress.rb", "tests/generated_code_test.rb"] s.add_development_dependency "rake-compiler", "~> 0.9.5" - s.add_development_dependency "test-unit", "~> 3.0.9" + s.add_development_dependency "test-unit", '~> 3.0', '>= 3.0.9' s.add_development_dependency "rubygems-tasks", "~> 0.2.4" end |