diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cc6a1e4..a03d926 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,29 +24,9 @@ jobs: strategy: matrix: - gemfile: ['rails_5.2', 'rails_6.0', 'rails_6.1', 'rails_7.0'] + gemfile: ['rails_6.0', 'rails_6.1', 'rails_7.0'] - ruby: ['2.4', '2.5', '2.6', '2.7', '3.0', '3.1'] - - exclude: - # Rails 5.2 requires Ruby < 3.0 - # https://github.com/rails/rails/issues/40938 - - ruby: '3.0' - gemfile: 'rails_5.2' - - ruby: '3.1' - gemfile: 'rails_5.2' - # Rails >= 6 requires Ruby >= 2.5 - - ruby: '2.4' - gemfile: 'rails_6.0' - - ruby: '2.4' - gemfile: 'rails_6.1' - # Rails >= 7 requires Ruby >= 2.7 - - ruby: '2.4' - gemfile: 'rails_7.0' - - ruby: '2.5' - gemfile: 'rails_7.0' - - ruby: '2.6' - gemfile: 'rails_7.0' + ruby: ['2.7', '3.0', '3.1', '3.2'] env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile diff --git a/.ruby-version b/.ruby-version index 57cf282..944880f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.5 +3.2.0 diff --git a/README.md b/README.md index d9167d1..02857d2 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,9 @@ ActiveModel + Redis with the aim to mimic ActiveRecord where possible. ## Requirements -Modis 4.0+ supports Rails 5.2 and higher, including Rails 6.1, as well as Ruby 2.3 and above, including Ruby 3.0. Tests are also being run with JRuby. For details please check the current CI setup. +Modis policy is to support only those versions of Ruby and Rails which are not yet End of Life. + +Modis 4.0+ supports Rails 6.0 and higher, as well as Ruby 2.7 and above. Tests are also being run with JRuby. For details please check the current CI setup. For releases supporting older Rails versions such as 4.2-5.1 please check out the 3.x releases. diff --git a/modis.gemspec b/modis.gemspec index d9f87b6..9a22849 100644 --- a/modis.gemspec +++ b/modis.gemspec @@ -18,10 +18,10 @@ Gem::Specification.new do |gem| gem.test_files = gem.files.grep(%r{^(test|spec|features)/}) gem.require_paths = ["lib"] - gem.required_ruby_version = ">= 2.3.0" + gem.required_ruby_version = ">= 2.7.0" - gem.add_runtime_dependency 'activemodel', '>= 5.2' - gem.add_runtime_dependency 'activesupport', '>= 5.2' + gem.add_runtime_dependency 'activemodel', '>= 6.0' + gem.add_runtime_dependency 'activesupport', '>= 6.0' gem.add_runtime_dependency 'redis', '>= 3.0' gem.add_runtime_dependency 'connection_pool', '>= 2'