Add Rails-7.1 to CI and drop support for Rails < 6.0 (#25)

toptal · Oct 7, 2023 · 108aa62 · 108aa62
1 parent e7d607f
commit 108aa62
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 40 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -10,13 +10,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { ruby: '2.4', rails: '5.0' }
-          - { ruby: '2.5', rails: '5.1' }
-          - { ruby: '2.6', rails: '5.2' }
           - { ruby: '2.7', rails: '6.0' }
           - { ruby: '3.0', rails: '6.1' }
           - { ruby: '3.1', rails: '7.0' }
-          - { ruby: '3.2', rails: '7.0' }
+          - { ruby: '3.2', rails: '7.1' }
     runs-on: ubuntu-latest
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails.${{ matrix.rails }}.gemfile

diff --git a/Appraisals b/Appraisals
@@ -1,4 +1,4 @@
-%w[5.0 5.1 5.2 6.0 6.1 7.0].each do |version|
+%w[6.0 6.1 7.0 7.1].each do |version|
   appraise "rails.#{version}" do
     gem 'activesupport', "~> #{version}.0"
     gem 'activemodel', "~> #{version}.0"

diff --git a/gemfiles/rails.5.1.gemfile b/gemfiles/rails.5.1.gemfile
diff --git a/gemfiles/rails.5.2.gemfile b/gemfiles/rails.5.2.gemfile
diff --git a/gemfiles/rails.5.0.gemfile → gemfiles/rails.7.1.gemfile b/gemfiles/rails.5.0.gemfile → gemfiles/rails.7.1.gemfile
@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activesupport", "~> 5.0.0"
-gem "activemodel", "~> 5.0.0"
-gem "activerecord", "~> 5.0.0"
+gem "activesupport", "~> 7.1.0"
+gem "activemodel", "~> 7.1.0"
+gem "activerecord", "~> 7.1.0"
 
 group :test do
   gem "guard"

diff --git a/granite-form.gemspec b/granite-form.gemspec
@@ -14,8 +14,8 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 2.4.0'
   gem.version = Granite::Form::VERSION
 
-  gem.add_development_dependency 'actionpack', '>= 5.0'
-  gem.add_development_dependency 'activerecord', '>= 5.0'
+  gem.add_development_dependency 'actionpack', '>= 6.0'
+  gem.add_development_dependency 'activerecord', '>= 6.0'
   gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'bump'
   gem.add_development_dependency 'database_cleaner'
@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rubocop', '0.52.1'
   gem.add_development_dependency 'uuidtools'
 
-  gem.add_runtime_dependency 'activemodel', '>= 5.0'
-  gem.add_runtime_dependency 'activesupport', '>= 5.0'
+  gem.add_runtime_dependency 'activemodel', '>= 6.0'
+  gem.add_runtime_dependency 'activesupport', '>= 6.0'
   gem.add_runtime_dependency 'tzinfo'
 end