Test against Ruby 3.2 (#305)

* Test against Ruby 3.2 * Fix appraisal versions from upgrading themselves * No longer test against Ruby 2.6 * Remove database alias for Rails 6.0 and Ruby 3.1 due to Pysch changes
ErwinM · Feb 16, 2023 · 944e499 · 944e499
1 parent 01e1c61
commit 944e499
Show file tree

Hide file tree

Showing 17 changed files with 306 additions and 274 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
     name: ruby-${{ matrix.ruby }} ${{ matrix.gemfile }}
     strategy:
       matrix:
-        ruby: [ '2.6', '2.7', '3.0', '3.1']
+        ruby: ['2.7', '3.0', '3.1', '3.2']
         gemfile:
           - rails_5
           - rails_6
@@ -23,17 +23,14 @@ jobs:
           - rails_main
           - sidekiq_7
         exclude:
+          - ruby: '3.0'
+            gemfile: rails_5
           - ruby: '3.1'
             gemfile: rails_5
-          - ruby: '3.0'
+          - ruby: '3.2'
             gemfile: rails_5
-          # Rails 7 requires Ruby 2.7 or higher
-          - ruby: '2.6'
-            gemfile: rails_7
-          - ruby: '2.6'
-            gemfile: rails_main
-          - ruby: '2.6'
-            gemfile: sidekiq_7
+          - ruby: '3.2'
+            gemfile: rails_6
 
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile

diff --git a/Appraisals b/Appraisals
@@ -1,17 +1,17 @@
 appraise "rails-5" do
-  gem "rails", "~> 5.2", ">= 5.2.6"
+  gem "rails", "~> 5.2.0", ">= 5.2.6"
 end
 
 appraise "rails-6" do
-  gem "rails", "~> 6.0", ">= 6.0.4.1"
+  gem "rails", "~> 6.0.0", ">= 6.0.4.1"
 end
 
 appraise "rails-6-1" do
-  gem "rails", "~> 6.1", ">= 6.1.4.1"
+  gem "rails", "~> 6.1.0", ">= 6.1.4.1"
 end
 
 appraise "rails-7" do
-  gem "rails", "~> 7.0", ">= 7.0.0"
+  gem "rails", "~> 7.0.0", ">= 7.0.0"
 end
 
 appraise "rails-main" do

diff --git a/Gemfile b/Gemfile
@@ -11,6 +11,13 @@ gemspec
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
 
+gem "rspec", ">=3.0"
+gem "rspec-rails"
+gem "sqlite3", "~> 1.6.0.rc2"
+gem "sidekiq", "~> 6.1", ">= 6.1.2"
+gem "standard"
+gem "appraisal"
+
 # To use a debugger
 gem "byebug", group: [:development, :test]
 

diff --git a/acts_as_tenant.gemspec b/acts_as_tenant.gemspec
@@ -16,11 +16,4 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "request_store", ">= 1.0.5"
   spec.add_dependency "rails", ">= 5.2"
-
-  spec.add_development_dependency "rspec", ">=3.0"
-  spec.add_development_dependency "rspec-rails"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "sidekiq", "~> 6.1", ">= 6.1.2"
-  spec.add_development_dependency "standard"
-  spec.add_development_dependency "appraisal"
 end
diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile
@@ -2,8 +2,14 @@
 
 source "https://rubygems.org"
 
+gem "rspec", ">=3.0"
+gem "rspec-rails"
+gem "sqlite3", "~> 1.6.0.rc2"
+gem "sidekiq", "~> 6.1", ">= 6.1.2"
+gem "standard"
+gem "appraisal"
 gem "byebug", group: [:development, :test]
-gem "rails", "~> 5.2", ">= 5.2.6"
+gem "rails", "~> 5.2.0", ">= 5.2.6"
 
 group :development, :test do
   gem "net-imap"

diff --git a/gemfiles/rails_5.gemfile.lock b/gemfiles/rails_5.gemfile.lock
@@ -60,9 +60,9 @@ GEM
     concurrent-ruby (1.1.10)
     connection_pool (2.3.0)
     crass (1.0.6)
-    date (3.3.2)
+    date (3.3.3)
     diff-lcs (1.5.0)
-    erubi (1.11.0)
+    erubi (1.12.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
     i18n (1.12.0)
@@ -72,16 +72,16 @@ GEM
     loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.8.0)
+    mail (2.8.0.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    minitest (5.16.3)
-    net-imap (0.3.2)
+    minitest (5.17.0)
+    net-imap (0.3.4)
       date
       net-protocol
     net-pop (0.1.2)
@@ -91,17 +91,17 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.13.10-arm64-darwin)
+    nokogiri (1.14.0-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-darwin)
+    nokogiri (1.14.0-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-linux)
+    nokogiri (1.14.0-x86_64-linux)
       racc (~> 1.4)
     parallel (1.22.1)
-    parser (3.1.3.0)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
-    racc (1.6.1)
-    rack (2.2.4)
+    racc (1.6.2)
+    rack (2.2.5)
     rack-test (2.0.2)
       rack (>= 1.3)
     rails (5.2.8.1)
@@ -141,10 +141,10 @@ GEM
       rspec-mocks (~> 3.12.0)
     rspec-core (3.12.0)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.1)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.1)
+    rspec-mocks (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-rails (5.1.2)
@@ -156,46 +156,46 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.12.0)
-    rubocop (1.39.0)
+    rubocop (1.42.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.0)
+    rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.15.1)
+    rubocop-performance (1.15.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
     sidekiq (6.5.8)
       connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
       redis (>= 4.5.0, < 5)
-    sprockets (4.1.1)
+    sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.5.4-arm64-darwin)
-    sqlite3 (1.5.4-x86_64-darwin)
-    sqlite3 (1.5.4-x86_64-linux)
-    standard (1.19.1)
+    sqlite3 (1.6.0.rc2-arm64-darwin)
+    sqlite3 (1.6.0.rc2-x86_64-darwin)
+    sqlite3 (1.6.0.rc2-x86_64-linux)
+    standard (1.21.1)
       language_server-protocol (~> 3.17.0.2)
-      rubocop (= 1.39.0)
-      rubocop-performance (= 1.15.1)
+      rubocop (= 1.42.0)
+      rubocop-performance (= 1.15.2)
     thor (1.2.1)
     thread_safe (0.3.6)
     timeout (0.3.1)
     tzinfo (1.2.10)
       thread_safe (~> 0.1)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -204,6 +204,7 @@ PLATFORMS
   arm64-darwin-22
   x86_64-darwin-20
   x86_64-darwin-21
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
@@ -213,12 +214,12 @@ DEPENDENCIES
   net-imap
   net-pop
   net-smtp
-  rails (~> 5.2, >= 5.2.6)
+  rails (~> 5.2.0, >= 5.2.6)
   rspec (>= 3.0)
   rspec-rails
   sidekiq (~> 6.1, >= 6.1.2)
-  sqlite3
+  sqlite3 (~> 1.6.0.rc2)
   standard
 
 BUNDLED WITH
-   2.3.26
+   2.4.3
diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile
@@ -2,8 +2,14 @@
 
 source "https://rubygems.org"
 
+gem "rspec", ">=3.0"
+gem "rspec-rails"
+gem "sqlite3", "~> 1.6.0.rc2"
+gem "sidekiq", "~> 6.1", ">= 6.1.2"
+gem "standard"
+gem "appraisal"
 gem "byebug", group: [:development, :test]
-gem "rails", "~> 6.0", ">= 6.0.4.1"
+gem "rails", "~> 6.0.0", ">= 6.0.4.1"
 
 group :development, :test do
   gem "net-imap"