diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1febce98..6c74c1d4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,7 +19,6 @@ jobs: - "3.2" - "3.3" rails: - - rails_61 - rails_70 - rails_71 - rails_72 diff --git a/CHANGELOG.md b/CHANGELOG.md index ef0adeee..61dc3f70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +* Remove support for Ruby `< 3.1`. +* Remove support for Rails `< 7.0`. +* Test against Rails 8.0. + ## Version 2.0.1 * Prefer `require_relative` for internal requires [#939][]. @@ -241,3 +245,4 @@ _No changes_. [#921]: https://github.com/activeadmin/inherited_resources/pull/921 [#933]: https://github.com/activeadmin/inherited_resources/pull/933 [#939]: https://github.com/activeadmin/inherited_resources/pull/939 +[#942]: https://github.com/activeadmin/inherited_resources/pull/942 diff --git a/gemfiles/rails_61/Gemfile b/gemfiles/rails_61/Gemfile deleted file mode 100644 index d4a2d5f3..00000000 --- a/gemfiles/rails_61/Gemfile +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true -source 'https://rubygems.org' - -gemspec path: '../..' - -group :development do - gem 'rails', '~> 6.1.0' - - gem 'mocha' - gem 'minitest' - gem 'minitest-reporters' - gem 'rails-controller-testing' - gem 'simplecov', require: false - gem 'simplecov-cobertura' - gem 'warning' - - # FIXME: relax this dependency when Ruby 3.1 support will be dropped - gem "zeitwerk", "~> 2.6.18" -end diff --git a/gemfiles/rails_61/Gemfile.lock b/gemfiles/rails_61/Gemfile.lock deleted file mode 100644 index 7c31b055..00000000 --- a/gemfiles/rails_61/Gemfile.lock +++ /dev/null @@ -1,216 +0,0 @@ -PATH - remote: ../.. - specs: - inherited_resources (2.0.1) - actionpack (>= 6.0) - has_scope (>= 0.6) - railties (>= 6.0) - responders (>= 2) - -GEM - remote: https://rubygems.org/ - specs: - actioncable (6.1.7.10) - actionpack (= 6.1.7.10) - activesupport (= 6.1.7.10) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.10) - actionpack (= 6.1.7.10) - activejob (= 6.1.7.10) - activerecord (= 6.1.7.10) - activestorage (= 6.1.7.10) - activesupport (= 6.1.7.10) - mail (>= 2.7.1) - actionmailer (6.1.7.10) - actionpack (= 6.1.7.10) - actionview (= 6.1.7.10) - activejob (= 6.1.7.10) - activesupport (= 6.1.7.10) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (6.1.7.10) - actionview (= 6.1.7.10) - activesupport (= 6.1.7.10) - rack (~> 2.0, >= 2.0.9) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.10) - actionpack (= 6.1.7.10) - activerecord (= 6.1.7.10) - activestorage (= 6.1.7.10) - activesupport (= 6.1.7.10) - nokogiri (>= 1.8.5) - actionview (6.1.7.10) - activesupport (= 6.1.7.10) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7.10) - activesupport (= 6.1.7.10) - globalid (>= 0.3.6) - activemodel (6.1.7.10) - activesupport (= 6.1.7.10) - activerecord (6.1.7.10) - activemodel (= 6.1.7.10) - activesupport (= 6.1.7.10) - activestorage (6.1.7.10) - actionpack (= 6.1.7.10) - activejob (= 6.1.7.10) - activerecord (= 6.1.7.10) - activesupport (= 6.1.7.10) - marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (6.1.7.10) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) - ansi (1.5.0) - builder (3.3.0) - concurrent-ruby (1.3.4) - crass (1.0.6) - date (3.4.0) - docile (1.4.1) - erubi (1.13.0) - globalid (1.2.1) - activesupport (>= 6.1) - has_scope (0.8.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - i18n (1.14.6) - concurrent-ruby (~> 1.0) - loofah (2.23.1) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - mail (2.8.1) - mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp - marcel (1.0.4) - method_source (1.1.0) - mini_mime (1.1.5) - mini_portile2 (2.8.7) - minitest (5.25.1) - minitest-reporters (1.7.1) - ansi - builder - minitest (>= 5.0) - ruby-progressbar - mocha (2.5.0) - ruby2_keywords (>= 0.0.5) - net-imap (0.5.1) - date - net-protocol - net-pop (0.1.2) - net-protocol - net-protocol (0.2.2) - timeout - net-smtp (0.5.0) - net-protocol - nio4r (2.7.4) - nokogiri (1.16.7) - mini_portile2 (~> 2.8.2) - racc (~> 1.4) - nokogiri (1.16.7-aarch64-linux) - racc (~> 1.4) - nokogiri (1.16.7-arm64-darwin) - racc (~> 1.4) - nokogiri (1.16.7-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.16.7-x86_64-linux) - racc (~> 1.4) - racc (1.8.1) - rack (2.2.10) - rack-test (2.1.0) - rack (>= 1.3) - rails (6.1.7.10) - actioncable (= 6.1.7.10) - actionmailbox (= 6.1.7.10) - actionmailer (= 6.1.7.10) - actionpack (= 6.1.7.10) - actiontext (= 6.1.7.10) - actionview (= 6.1.7.10) - activejob (= 6.1.7.10) - activemodel (= 6.1.7.10) - activerecord (= 6.1.7.10) - activestorage (= 6.1.7.10) - activesupport (= 6.1.7.10) - bundler (>= 1.15.0) - railties (= 6.1.7.10) - sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.5) - actionpack (>= 5.0.1.rc1) - actionview (>= 5.0.1.rc1) - activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.2.0) - activesupport (>= 5.0.0) - minitest - nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - railties (6.1.7.10) - actionpack (= 6.1.7.10) - activesupport (= 6.1.7.10) - method_source - rake (>= 12.2) - thor (~> 1.0) - rake (13.2.1) - responders (3.1.1) - actionpack (>= 5.2) - railties (>= 5.2) - rexml (3.3.9) - ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (2.1.0) - rexml - simplecov (~> 0.19) - simplecov-html (0.13.1) - simplecov_json_formatter (0.1.4) - sprockets (4.2.1) - concurrent-ruby (~> 1.0) - rack (>= 2.2.4, < 4) - sprockets-rails (3.5.2) - actionpack (>= 6.1) - activesupport (>= 6.1) - sprockets (>= 3.0.0) - thor (1.3.2) - timeout (0.4.2) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - warning (1.4.0) - websocket-driver (0.7.6) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - zeitwerk (2.6.18) - -PLATFORMS - aarch64-linux - arm64-darwin - ruby - x86_64-darwin - x86_64-linux - -DEPENDENCIES - inherited_resources! - minitest - minitest-reporters - mocha - rails (~> 6.1.0) - rails-controller-testing - simplecov - simplecov-cobertura - warning - zeitwerk (~> 2.6.18) - -BUNDLED WITH - 2.5.23 diff --git a/inherited_resources.gemspec b/inherited_resources.gemspec index 99de676f..05ba0862 100644 --- a/inherited_resources.gemspec +++ b/inherited_resources.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 3.1' s.add_dependency("responders", ">= 2") - s.add_dependency("actionpack", ">= 6.0") - s.add_dependency("railties", ">= 6.0") + s.add_dependency("actionpack", ">= 7.0") + s.add_dependency("railties", ">= 7.0") s.add_dependency("has_scope", ">= 0.6") end