summaryrefslogtreecommitdiff
path: root/tool/bundler
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2021-12-14 21:14:58 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2021-12-15 18:05:18 +0900
commit7e084ed707310139b351f6d30af435676422af62 (patch)
treedb7450ae96ccd8d90287e33412769230da247242 /tool/bundler
parent583e06e28f5ed4078393000f929f4380777ba972 (diff)
Merge RubyGems and Bundler master
Merge from https://github.com/rubygems/rubygems/commit/793ad95ecb40e84a1dcb4cb60f2686843ed90de5
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/5265
Diffstat (limited to 'tool/bundler')
-rw-r--r--tool/bundler/rubocop_gems.rb.lock1
-rw-r--r--tool/bundler/standard_gems.rb.lock1
2 files changed, 2 insertions, 0 deletions
diff --git a/tool/bundler/rubocop_gems.rb.lock b/tool/bundler/rubocop_gems.rb.lock
index 8d1e9c759c..ca0fb5c613 100644
--- a/tool/bundler/rubocop_gems.rb.lock
+++ b/tool/bundler/rubocop_gems.rb.lock
@@ -45,6 +45,7 @@ GEM
PLATFORMS
arm64-darwin-20
+ arm64-darwin-21
universal-java-11
x86_64-darwin-19
x86_64-darwin-20
diff --git a/tool/bundler/standard_gems.rb.lock b/tool/bundler/standard_gems.rb.lock
index 68186165c3..af22080659 100644
--- a/tool/bundler/standard_gems.rb.lock
+++ b/tool/bundler/standard_gems.rb.lock
@@ -51,6 +51,7 @@ GEM
PLATFORMS
arm64-darwin-20
+ arm64-darwin-21
universal-java-11
x86_64-darwin-19
x86_64-darwin-20