Add support for rails 8.0, drop support rails < 7

marshall-lee · Nov 8, 2024 · 799c958 · 799c958
1 parent b44cb09
commit 799c958
Show file tree

Hide file tree

Showing 17 changed files with 86 additions and 241 deletions.
diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
@@ -16,49 +16,20 @@ jobs:
           - "3.2"
           - "3.1"
           - "3.0"
-          - "2.7"
-          - "2.6"
         gemfile:
+          - gemfiles/rails_8.0.gemfile
           - gemfiles/rails_7.2.gemfile
           - gemfiles/rails_7.1.gemfile
           - gemfiles/rails_7.0.gemfile
-          - gemfiles/rails_6.1.gemfile
-          - gemfiles/rails_6.0.gemfile
-          - gemfiles/rails_5.2.gemfile
         exclude:
-          - gemfile: gemfiles/rails_7.2.gemfile
-            ruby: "3.0"
-          - gemfile: gemfiles/rails_7.2.gemfile
-            ruby: "2.7"
-          - gemfile: gemfiles/rails_7.2.gemfile
-            ruby: "2.6"
-          - gemfile: gemfiles/rails_7.1.gemfile
-            ruby: "2.6"
-          - gemfile: gemfiles/rails_7.0.gemfile
-            ruby: "2.6"
-          - gemfile: gemfiles/rails_6.1.gemfile
-            ruby: "3.3"
-          - gemfile: gemfiles/rails_6.1.gemfile
-            ruby: "3.2"
-          - gemfile: gemfiles/rails_6.1.gemfile
+          - gemfile: gemfiles/rails_8.0.gemfile
             ruby: "3.1"
-          - gemfile: gemfiles/rails_6.0.gemfile
-            ruby: "3.3"
-          - gemfile: gemfiles/rails_6.0.gemfile
-            ruby: "3.2"
-          - gemfile: gemfiles/rails_6.0.gemfile
-            ruby: "3.1"
-          - gemfile: gemfiles/rails_6.0.gemfile
+          - gemfile: gemfiles/rails_8.0.gemfile
             ruby: "3.0"
-          - gemfile: gemfiles/rails_5.2.gemfile
-            ruby: "3.3"
-          - gemfile: gemfiles/rails_5.2.gemfile
-            ruby: "3.2"
-          - gemfile: gemfiles/rails_5.2.gemfile
-            ruby: "3.1"
-          - gemfile: gemfiles/rails_5.2.gemfile
+          - gemfile: gemfiles/rails_7.2.gemfile
             ruby: "3.0"
 
+
     env:
       BUNDLE_GEMFILE: ${{ format('{0}/{1}', github.workspace, matrix.gemfile) }}
       BUNDLE_PATH: ${{ format('{0}/vendor/bundle', github.workspace) }}

diff --git a/Appraisals b/Appraisals
@@ -1,25 +1,17 @@
 # frozen_string_literal: true
 
-appraise "rails-5.2" do
-  gem 'activemodel', '~> 5.2.8.1'
-end
-
-appraise "rails-6.0" do
-  gem 'activemodel', '~> 6.0.6.1'
-end
-
-appraise "rails-6.1" do
-  gem 'activemodel', '~> 6.1.7.6'
-end
-
 appraise "rails-7.0" do
-  gem 'activemodel', '~> 7.0.8.4'
+  gem 'activemodel', '~> 7.0.8.6'
 end
 
 appraise "rails-7.1" do
-  gem 'activemodel', '~> 7.1.4'
+  gem 'activemodel', '~> 7.1.5'
 end
 
 appraise "rails-7.2" do
-  gem 'activemodel', '~> 7.2.1'
+  gem 'activemodel', '~> 7.2.2'
+end
+
+appraise "rails-8.0" do
+  gem 'activemodel', '~> 8.0.0'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     nested_record (1.1.2)
-      activemodel (> 5.2, < 8.0)
+      activemodel (> 7.0, < 8.1)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activemodel", "~> 7.0.8.4"
+gem "activemodel", "~> 7.0.8.6"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock
@@ -2,14 +2,14 @@ PATH
   remote: ..
   specs:
     nested_record (1.1.2)
-      activemodel (> 5.2, < 8.0)
+      activemodel (> 7.0, < 8.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.8.4)
-      activesupport (= 7.0.8.4)
-    activesupport (7.0.8.4)
+    activemodel (7.0.8.6)
+      activesupport (= 7.0.8.6)
+    activesupport (7.0.8.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -20,20 +20,20 @@ GEM
       thor (>= 0.14.0)
     concurrent-ruby (1.3.4)
     diff-lcs (1.5.1)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     minitest (5.25.1)
     rake (13.2.1)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.1)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
@@ -45,12 +45,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (~> 7.0.8.4)
+  activemodel (~> 7.0.8.6)
   appraisal
   bundler (>= 2)
   nested_record!
   rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.4.20
+   2.5.19
diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activemodel", "~> 7.1.4"
+gem "activemodel", "~> 7.1.5"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock
@@ -2,51 +2,57 @@ PATH
   remote: ..
   specs:
     nested_record (1.1.2)
-      activemodel (> 5.2, < 8.0)
+      activemodel (> 7.0, < 8.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.1.4)
-      activesupport (= 7.1.4)
-    activesupport (7.1.4)
+    activemodel (7.1.5)
+      activesupport (= 7.1.5)
+    activesupport (7.1.5)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
       mutex_m
+      securerandom (>= 0.3)
       tzinfo (~> 2.0)
     appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
     base64 (0.2.0)
+    benchmark (0.4.0)
     bigdecimal (3.1.8)
     concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     diff-lcs (1.5.1)
     drb (2.2.1)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
+    logger (1.6.1)
     minitest (5.25.1)
     mutex_m (0.2.0)
     rake (13.2.1)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.1)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
+    securerandom (0.3.1)
     thor (1.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -55,12 +61,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (~> 7.1.4)
+  activemodel (~> 7.1.5)
   appraisal
   bundler (>= 2)
   nested_record!
   rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.4.20
+   2.5.19
diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activemodel", "~> 7.2.1"
+gem "activemodel", "~> 7.2.2"
 
 gemspec path: "../"