chore: Update Ruby versions (#1549)

thoughtbot · Jun 3, 2023 · d43fbb9 · d43fbb9
1 parent dee0d9f
commit d43fbb9
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 56 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,22 +27,20 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 3.2.1
-          - 3.1.3
-          - 3.0.5
+          - 3.2.2
+          - 3.1.4
+          - 3.0.6
         appraisal:
           - rails_7_0
           - rails_6_1
         adapter:
           - sqlite3
           - postgresql
         exclude:
-          - { ruby: 3.2.1, appraisal: rails_5_2 }
-          - { ruby: 3.2.1, appraisal: rails_6_0 }
-          - { ruby: 3.2.1, appraisal: rails_6_1 }
-          - { ruby: 3.1.3, appraisal: rails_5_2 }
-          - { ruby: 3.0.5, appraisal: rails_5_2 }
-          - { ruby: 3.0.5, appraisal: rails_7_0 }
+          - { ruby: 3.2.2, appraisal: rails_6_1 }
+          - { ruby: 3.1.4, appraisal: rails_5_2 }
+          - { ruby: 3.0.6, appraisal: rails_5_2 }
+          - { ruby: 3.0.6, appraisal: rails_7_0 }
     env:
       DATABASE_ADAPTER: ${{ matrix.adapter }}
       BUNDLE_GEMFILE: gemfiles/${{ matrix.appraisal }}.gemfile

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.2.1
+3.2.2
diff --git a/.tool-versions b/.tool-versions
@@ -1 +1 @@
-ruby 3.2.1
+ruby 3.2.2
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'appraisal', '2.2.0'
+gem 'appraisal', '2.4.0'
 gem 'bundler', '~> 2.0'
 gem 'pry'
 gem 'pry-byebug'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,73 +6,73 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    appraisal (2.2.0)
+    appraisal (2.4.0)
       bundler
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
     byebug (11.1.3)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
-    diff-lcs (1.3)
+    diff-lcs (1.5.0)
     fssm (0.2.10)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
+    json (2.6.3)
     method_source (1.0.0)
     minitest (5.16.3)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    parallel (1.23.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
+      pry (>= 0.13, < 0.15)
     rack (3.0.0)
     rainbow (3.1.1)
     rake (13.0.1)
     redcarpet (3.5.0)
-    regexp_parser (2.5.0)
+    regexp_parser (2.8.0)
     rexml (3.2.5)
     rouge (3.22.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rubocop (1.36.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.52.0)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
     rubocop-packaging (0.5.2)
       rubocop (>= 1.33, < 2.0)
     rubocop-rails (2.16.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-    ruby-progressbar (1.11.0)
-    thor (0.20.0)
+    ruby-progressbar (1.13.0)
+    thor (1.2.2)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
     warnings_logger (0.1.1)
     yard (0.9.25)
     zeus (0.15.14)
@@ -82,7 +82,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (= 2.2.0)
+  appraisal (= 2.4.0)
   bundler (~> 2.0)
   fssm
   pry
@@ -99,4 +99,4 @@ DEPENDENCIES
   zeus
 
 BUNDLED WITH
-   2.4.3
+   2.4.13
diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", "2.2.0"
+gem "appraisal", "2.4.0"
 gem "bundler", "~> 2.0"
 gem "pry"
 gem "pry-byebug"

diff --git a/gemfiles/rails_6_1.gemfile.lock b/gemfiles/rails_6_1.gemfile.lock
@@ -62,7 +62,7 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
-    appraisal (2.2.0)
+    appraisal (2.4.0)
       bundler
       rake
       thor (>= 0.14.0)
@@ -133,12 +133,12 @@ GEM
     parser (3.2.0.0)
       ast (~> 2.4.1)
     pg (1.4.5)
-    pry (0.13.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
+      pry (>= 0.13, < 0.15)
     psych (3.3.4)
     public_suffix (5.0.1)
     puma (5.6.5)
@@ -286,7 +286,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  appraisal (= 2.2.0)
+  appraisal (= 2.4.0)
   bcrypt (~> 3.1.7)
   bootsnap (>= 1.4.4)
   bundler (~> 2.0)

diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", "2.2.0"
+gem "appraisal", "2.4.0"
 gem "bundler", "~> 2.0"
 gem "pry"
 gem "pry-byebug"

diff --git a/gemfiles/rails_7_0.gemfile.lock b/gemfiles/rails_7_0.gemfile.lock
@@ -68,7 +68,7 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
-    appraisal (2.2.0)
+    appraisal (2.4.0)
       bundler
       rake
       thor (>= 0.14.0)
@@ -142,9 +142,9 @@ GEM
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.10.1)
+    pry-byebug (3.8.0)
       byebug (~> 11.0)
-      pry (>= 0.13, < 0.15)
+      pry (~> 0.10)
     public_suffix (5.0.1)
     puma (5.6.5)
       nio4r (~> 2.0)
@@ -282,7 +282,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  appraisal (= 2.2.0)
+  appraisal (= 2.4.0)
   bcrypt (~> 3.1.7)
   bootsnap
   bundler (~> 2.0)
@@ -318,4 +318,4 @@ DEPENDENCIES
   zeus
 
 BUNDLED WITH
-   2.3.22
+   2.4.13
diff --git a/lib/shoulda/matchers/rails_shim.rb b/lib/shoulda/matchers/rails_shim.rb
@@ -1,7 +1,7 @@
 module Shoulda
   module Matchers
     # @private
-    module RailsShim # rubocop:disable Metrics/ModuleLength
+    module RailsShim
       class << self
         def action_pack_version
           Gem::Version.new(::ActionPack::VERSION::STRING)