From 8a35bd96d2d8bbf04055b9d74a225afd20a34cb8 Mon Sep 17 00:00:00 2001
From: dcrosby <dcrosby@meta.com>
Date: Mon, 26 May 2025 13:22:48 -0700
Subject: [PATCH 1/2] [github CI] Update test Rubies

---
 .github/workflows/ci.yml | 2 +-
 Gemfile                  | 2 +-
 between_meals.gemspec    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ecd2cda..d52c138 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.5, 2.6, 2.7]
+        ruby: ["2.7", "3.0", "3.1"]
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
diff --git a/Gemfile b/Gemfile
index 4ac855e..272f17a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,6 +10,6 @@ group :development do
   gem 'rspec-core', '~> 3.11'
   gem 'rspec-expectations', '~> 3.11'
   gem 'rspec-mocks', '~> 3.11'
-  gem 'rubocop', '= 1.3.1'
+  gem 'rubocop', '= 1.25.1'
   gem 'simplecov'
 end
diff --git a/between_meals.gemspec b/between_meals.gemspec
index e10c50a..ff74eb3 100644
--- a/between_meals.gemspec
+++ b/between_meals.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.files = %w{README.md LICENSE} +
     Dir.glob('lib/**/*', File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
 
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.7.0'
   s.add_dependency 'colorize'
   s.add_dependency 'mixlib-shellout'
 end

From de6b9d27c9b302e2878e69d10fd2e09b02207899 Mon Sep 17 00:00:00 2001
From: dcrosby <dcrosby@meta.com>
Date: Mon, 26 May 2025 13:22:49 -0700
Subject: [PATCH 2/2] [rspec] Fix Hg class conformance test

---
 spec/hg_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/hg_spec.rb b/spec/hg_spec.rb
index f131989..60b3cfe 100644
--- a/spec/hg_spec.rb
+++ b/spec/hg_spec.rb
@@ -22,7 +22,7 @@
 
 describe BetweenMeals::Repo::Hg do
   context 'conforms to BetweenMeals::Repo interfaces' do
-    it_behaves_like 'Repo subclass conformance', BetweenMeals::Repo::Git
+    it_behaves_like 'Repo subclass conformance', BetweenMeals::Repo::Hg
   end
   let(:logger) do
     Logger.new('/dev/null')