From 79cd383bdbc5feaf90271d26ea05f7366ae196d7 Mon Sep 17 00:00:00 2001
From: Jeff Widman <jeff@jeffwidman.com>
Date: Fri, 30 Sep 2022 21:17:09 -0700
Subject: [PATCH] Bump Rubygems to `3.3.22`

Bump Rubygems to `3.3.22`:
https://github.com/rubygems/rubygems/blob/master/CHANGELOG.md#3322--2022-09-07

There's some prior history here:
1. Originally bumped from `3.2.20` to `3.3.11` in https://github.com/dependabot/dependabot-core/pull/5035. That changed how bundler
   version detection worked, which caused some problems.
2. We attempted to workaround the issue in
   https://github.com/dependabot/dependabot-core/pull/5044, but that
   wasn't sufficient.
3. So in https://github.com/dependabot/dependabot-core/pull/5048 we
   rolled back to `3.2.20`
4. However, as part of the Ruby 3.1 upgrade, we _have_ to bump to
   Rubygems `>=3.3.3`... so we need to figure out a fix.
5. Now that `updater` is merged into `core`, we can have the full test
   suite checking the results, and don't have to bump in `core`, then
   pull into `updater` and see if it passes a separate CI... the
   two-step dance was the reason why this wasn't caught in the original
   core PR but instead merged and then reverted.
6. I am reasonably sure that @deivid-rodriguez figured out a way around
   the Bundler version difficulty in
   https://github.com/dependabot/dependabot-core/pull/5513, so this PR
   requires that to land first.
7. Originally I had the Rubygems upgrade bundled as part of the Ruby 3.1
   upgrade, but now that we have a better understanding of what's
   happening, we should be fine to do these changes independently...
   which lets us more easily debug if we do happen to encounter problems.
   So I am splitting this out as a separate PR.
---
 Dockerfile                       | 2 +-
 common/dependabot-common.gemspec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 56e505bc2e..b68c489feb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -71,7 +71,7 @@ RUN if ! getent group "$USER_GID"; then groupadd --gid "$USER_GID" dependabot ;
 ARG RUBY_VERSION=2.7.6
 ARG RUBY_INSTALL_VERSION=0.8.3
 
-ARG RUBYGEMS_SYSTEM_VERSION=3.2.20
+ARG RUBYGEMS_SYSTEM_VERSION=3.3.22
 
 ARG BUNDLER_V1_VERSION=1.17.3
 ARG BUNDLER_V2_VERSION=2.3.22
diff --git a/common/dependabot-common.gemspec b/common/dependabot-common.gemspec
index 3dd50ca46f..764900dcea 100644
--- a/common/dependabot-common.gemspec
+++ b/common/dependabot-common.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.files        = []
 
   spec.required_ruby_version = ">= 2.7.0"
-  spec.required_rubygems_version = ">= 2.7.3"
+  spec.required_rubygems_version = ">= 3.3.22"
 
   spec.add_dependency "activesupport", ">= 6.0.0"
   spec.add_dependency "aws-sdk-codecommit", "~> 1.28"