From 885b1aa78593612dd7b3b220a7214388ffe53519 Mon Sep 17 00:00:00 2001
From: Esun Kim <veblush@google.com>
Date: Mon, 16 Dec 2019 10:27:30 -0800
Subject: [PATCH] Change bundler version

---
 examples/ruby/grpc-demo.gemspec                  | 2 +-
 grpc.gemspec                                     | 2 +-
 templates/grpc.gemspec.template                  | 2 +-
 test/distrib/ruby/distribtest.gemspec            | 2 +-
 tools/run_tests/artifacts/build_artifact_ruby.sh | 6 ++++++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/examples/ruby/grpc-demo.gemspec b/examples/ruby/grpc-demo.gemspec
index 90f75fbb2b7..703d391fcb1 100644
--- a/examples/ruby/grpc-demo.gemspec
+++ b/examples/ruby/grpc-demo.gemspec
@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'grpc', '~> 1.0'
   s.add_dependency 'multi_json', '~> 1.13.1'
-  s.add_development_dependency 'bundler', '~> 1.7'
+  s.add_development_dependency 'bundler', '>= 1.9'
 end
diff --git a/grpc.gemspec b/grpc.gemspec
index 65a9c4f9f06..90a3aaeab76 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'google-protobuf', '~> 3.8'
   s.add_dependency 'googleapis-common-protos-types', '~> 1.0'
 
-  s.add_development_dependency 'bundler',            '~> 1.9'
+  s.add_development_dependency 'bundler',            '>= 1.9'
   s.add_development_dependency 'facter',             '~> 2.4'
   s.add_development_dependency 'logging',            '~> 2.0'
   s.add_development_dependency 'simplecov',          '~> 0.14.1'
diff --git a/templates/grpc.gemspec.template b/templates/grpc.gemspec.template
index db062bd28e2..59ff6c93a67 100644
--- a/templates/grpc.gemspec.template
+++ b/templates/grpc.gemspec.template
@@ -34,7 +34,7 @@
     s.add_dependency 'google-protobuf', '~> 3.8'
     s.add_dependency 'googleapis-common-protos-types', '~> 1.0'
 
-    s.add_development_dependency 'bundler',            '~> 1.9'
+    s.add_development_dependency 'bundler',            '>= 1.9'
     s.add_development_dependency 'facter',             '~> 2.4'
     s.add_development_dependency 'logging',            '~> 2.0'
     s.add_development_dependency 'simplecov',          '~> 0.14.1'
diff --git a/test/distrib/ruby/distribtest.gemspec b/test/distrib/ruby/distribtest.gemspec
index f11f5218d5b..13d370f04e8 100644
--- a/test/distrib/ruby/distribtest.gemspec
+++ b/test/distrib/ruby/distribtest.gemspec
@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'public_suffix', '< 3.0'
   s.add_dependency 'jwt', '< 2.0'
 
-  s.add_development_dependency 'bundler', '~> 1.7'
+  s.add_development_dependency 'bundler', '>= 1.9'
 end
diff --git a/tools/run_tests/artifacts/build_artifact_ruby.sh b/tools/run_tests/artifacts/build_artifact_ruby.sh
index 09423ce5391..b0eecf2562d 100755
--- a/tools/run_tests/artifacts/build_artifact_ruby.sh
+++ b/tools/run_tests/artifacts/build_artifact_ruby.sh
@@ -37,6 +37,12 @@ if [ "$SYSTEM" == "MINGW32" ] ; then
 fi
 
 set +ex
+
+# To workaround the problem with bundler 2.1.0 and rubygems-bundler 1.4.5
+# https://github.com/bundler/bundler/issues/7488
+rvm @global
+gem uninstall rubygems-bundler
+
 rvm use default
 gem install bundler -v 1.17.3