Merge RubyGems-3.4.0 and Bundler-2.4.0

8 files changed, 16 insertions, 4 deletions

diff --git a/tool/bundler/dev_gems.rb b/tool/bundler/dev_gems.rb
index 1603d5f8bc..ef63263414 100644
--- a/tool/bundler/dev_gems.rb
+++ b/tool/bundler/dev_gems.rb
@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "test-unit", "~> 3.0"
 gem "rake", "~> 13.0"
+gem "rb_sys"
 
 gem "webrick", "~> 1.6"
 gem "parallel_tests", "~> 2.29"
diff --git a/tool/bundler/dev_gems.rb.lock b/tool/bundler/dev_gems.rb.lock
index 41e2128bb8..07b6d302ca 100644
--- a/tool/bundler/dev_gems.rb.lock
+++ b/tool/bundler/dev_gems.rb.lock
@@ -10,6 +10,7 @@ GEM
       parallel
     power_assert (2.0.2)
     rake (13.0.6)
+    rb_sys (0.9.52)
     rdiscount (2.2.7)
     ronn (0.7.3)
       hpricot (>= 0.8.2)
@@ -43,6 +44,7 @@ DEPENDENCIES
   parallel (~> 1.19)
   parallel_tests (~> 2.29)
   rake (~> 13.0)
+  rb_sys
   ronn (~> 0.7.3)
   rspec-core (~> 3.12)
   rspec-expectations (~> 3.12)
@@ -52,4 +54,4 @@ DEPENDENCIES
   webrick (~> 1.6)
 
 BUNDLED WITH
-   2.4.0.dev
+   2.4.0
diff --git a/tool/bundler/rubocop_gems.rb b/tool/bundler/rubocop_gems.rb
index 84cb226330..9cb740cd15 100644
--- a/tool/bundler/rubocop_gems.rb
+++ b/tool/bundler/rubocop_gems.rb
@@ -9,3 +9,4 @@ gem "rake"
 gem "rake-compiler"
 gem "rspec"
 gem "test-unit"
+gem "rb_sys"
diff --git a/tool/bundler/rubocop_gems.rb.lock b/tool/bundler/rubocop_gems.rb.lock
index dbb7601a11..e2831aebb3 100644
--- a/tool/bundler/rubocop_gems.rb.lock
+++ b/tool/bundler/rubocop_gems.rb.lock
@@ -14,6 +14,7 @@ GEM
     rake (13.0.6)
     rake-compiler (1.2.0)
       rake
+    rb_sys (0.9.52)
     regexp_parser (2.6.1)
     rexml (3.2.5)
     rspec (3.12.0)
@@ -63,9 +64,10 @@ DEPENDENCIES
   minitest
   rake
   rake-compiler
+  rb_sys
   rspec
   rubocop (~> 1.7)
   test-unit
 
 BUNDLED WITH
-   2.4.0.dev
+   2.4.0
diff --git a/tool/bundler/standard_gems.rb b/tool/bundler/standard_gems.rb
index 1cd189742d..20c1ecd827 100644
--- a/tool/bundler/standard_gems.rb
+++ b/tool/bundler/standard_gems.rb
@@ -9,3 +9,4 @@ gem "rake"
 gem "rake-compiler"
 gem "rspec"
 gem "test-unit"
+gem "rb_sys"
diff --git a/tool/bundler/standard_gems.rb.lock b/tool/bundler/standard_gems.rb.lock
index 198aada23b..a84bdd7619 100644
--- a/tool/bundler/standard_gems.rb.lock
+++ b/tool/bundler/standard_gems.rb.lock
@@ -15,6 +15,7 @@ GEM
     rake (13.0.6)
     rake-compiler (1.2.0)
       rake
+    rb_sys (0.9.52)
     regexp_parser (2.6.1)
     rexml (3.2.5)
     rspec (3.12.0)
@@ -71,9 +72,10 @@ DEPENDENCIES
   minitest
   rake
   rake-compiler
+  rb_sys
   rspec
   standard (~> 1.0)
   test-unit
 
 BUNDLED WITH
-   2.4.0.dev
+   2.4.0
diff --git a/tool/bundler/test_gems.rb b/tool/bundler/test_gems.rb
index 3fb58b9388..9ba5763a3b 100644
--- a/tool/bundler/test_gems.rb
+++ b/tool/bundler/test_gems.rb
@@ -9,3 +9,4 @@ gem "compact_index", "~> 0.13.0"
 gem "sinatra", "~> 2.0"
 gem "rake", "13.0.1"
 gem "builder", "~> 3.2"
+gem "rb_sys"
diff --git a/tool/bundler/test_gems.rb.lock b/tool/bundler/test_gems.rb.lock
index 554fd3ed9e..d961ab9f76 100644
--- a/tool/bundler/test_gems.rb.lock
+++ b/tool/bundler/test_gems.rb.lock
@@ -11,6 +11,7 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rake (13.0.1)
+    rb_sys (0.9.52)
     ruby2_keywords (0.0.5)
     sinatra (2.0.8.1)
       mustermann (~> 1.0)
@@ -36,8 +37,9 @@ DEPENDENCIES
   rack (= 2.0.8)
   rack-test (~> 1.1)
   rake (= 13.0.1)
+  rb_sys
   sinatra (~> 2.0)
   webrick (= 1.7.0)
 
 BUNDLED WITH
-   2.4.0.dev
+   2.4.0