From 07f3cab3dd40dd91df47604ab3dc53fd311d7a60 Mon Sep 17 00:00:00 2001
From: Jason Lunn <jlunn@jungroup.com>
Date: Thu, 29 Sep 2016 00:18:55 -0400
Subject: Set platform to "java" under JRuby

Proposed fix for #1594
---
 ruby/google-protobuf.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec
index 67b15c33..2f7ca3c4 100644
--- a/ruby/google-protobuf.gemspec
+++ b/ruby/google-protobuf.gemspec
@@ -10,6 +10,7 @@ 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/**/*')
-- 
cgit v1.2.3


From d94ff4142ad4776507d3def32d17fe03280dbc01 Mon Sep 17 00:00:00 2001
From: Jason Lunn <jlunn@jungroup.com>
Date: Thu, 29 Sep 2016 02:18:32 -0400
Subject: Delete Gemfile.lock

Avoid [failures in travis](https://travis-ci.org/google/protobuf/jobs/163611664) under jruby
---
 ruby/Gemfile.lock | 30 ------------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 ruby/Gemfile.lock

diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock
deleted file mode 100644
index d0eb9cc4..00000000
--- a/ruby/Gemfile.lock
+++ /dev/null
@@ -1,30 +0,0 @@
-PATH
-  remote: .
-  specs:
-    google-protobuf (3.0.0.alpha.5.0.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    power_assert (0.2.2)
-    rake (10.4.2)
-    rake-compiler (0.9.5)
-      rake
-    rake-compiler-dock (0.5.1)
-    rubygems-tasks (0.2.4)
-    test-unit (3.0.9)
-      power_assert
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  google-protobuf!
-  rake-compiler
-  rake-compiler-dock
-  rubygems-tasks
-  test-unit
-
-BUNDLED WITH
-   1.11.2
-- 
cgit v1.2.3


From ee19a7c346515d7acbef684c42f1343896e7b4e7 Mon Sep 17 00:00:00 2001
From: Jason Lunn <jlunn@jungroup.com>
Date: Thu, 29 Sep 2016 02:33:17 -0400
Subject: Remove hanging reference to Gemfile.lock

---
 Makefile.am | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index a4de1bd3..72386d87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -672,7 +672,6 @@ python_EXTRA_DIST=                                                           \
 
 ruby_EXTRA_DIST=                                                             \
   ruby/Gemfile                                                               \
-  ruby/Gemfile.lock                                                          \
   ruby/.gitignore                                                            \
   ruby/README.md                                                             \
   ruby/Rakefile                                                              \
-- 
cgit v1.2.3


From 6005648c2ce9eb76435f3b2881e2fc1a118b7625 Mon Sep 17 00:00:00 2001
From: Jason Lunn <jlunn@jungroup.com>
Date: Thu, 29 Sep 2016 17:31:11 -0400
Subject: Add development dependency requirements

Uses values from the removed `Gemfile.lock` as a baseline for version requirements, though it has been observed to work with the latest versions of all the referenced gems - see https://travis-ci.org/google/protobuf/builds/163625616 for details
---
 ruby/google-protobuf.gemspec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec
index 2f7ca3c4..c1e02b07 100644
--- a/ruby/google-protobuf.gemspec
+++ b/ruby/google-protobuf.gemspec
@@ -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"
+    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
-- 
cgit v1.2.3