aboutsummaryrefslogtreecommitdiff
path: root/ruby/google-protobuf.gemspec
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2016-10-04 11:21:34 -0700
committerGitHub <noreply@github.com>2016-10-04 11:21:34 -0700
commit60bc203346e73d0b4b7472af3e660977cfc3485a (patch)
treee031c903df8a4887c6ceb229e04fcc5014b8cc65 /ruby/google-protobuf.gemspec
parent4d8752780715582aec3011e40a45778959acbe24 (diff)
parent6005648c2ce9eb76435f3b2881e2fc1a118b7625 (diff)
downloadprotobuf-60bc203346e73d0b4b7472af3e660977cfc3485a.tar.gz
protobuf-60bc203346e73d0b4b7472af3e660977cfc3485a.tar.bz2
protobuf-60bc203346e73d0b4b7472af3e660977cfc3485a.zip
Merge pull request #2199 from JasonLunn/patch-1
Set platform to "java" under JRuby
Diffstat (limited to 'ruby/google-protobuf.gemspec')
-rw-r--r--ruby/google-protobuf.gemspec9
1 files changed, 5 insertions, 4 deletions
diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec
index 67b15c33..c1e02b07 100644
--- a/ruby/google-protobuf.gemspec
+++ b/ruby/google-protobuf.gemspec
@@ -10,16 +10,17 @@ Gem::Specification.new do |s|
s.require_paths = ["lib"]
s.files = Dir.glob('lib/**/*.rb')
if RUBY_PLATFORM == "java"
+ s.platform = "java"
s.files += ["lib/google/protobuf_java.jar"]
else
s.files += Dir.glob('ext/**/*')
s.extensions= ["ext/google/protobuf_c/extconf.rb"]
- s.add_development_dependency "rake-compiler-dock"
+ s.add_development_dependency "rake-compiler-dock", "~> 0.5.1"
end
s.test_files = ["tests/basic.rb",
"tests/stress.rb",
"tests/generated_code_test.rb"]
- s.add_development_dependency "rake-compiler"
- s.add_development_dependency "test-unit"
- s.add_development_dependency "rubygems-tasks"
+ s.add_development_dependency "rake-compiler", "~> 0.9.5"
+ s.add_development_dependency "test-unit", "~> 3.0.9"
+ s.add_development_dependency "rubygems-tasks", "~> 0.2.4"
end