diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 76326823..8df2f95e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,7 +15,6 @@ jobs: fail-fast: false matrix: ruby: - - "3.1" - "3.2" - "3.3" - "3.4" @@ -27,10 +26,6 @@ jobs: - rails_80 - rails_81 exclude: - - ruby: "3.1" - rails: rails_80 - - ruby: "3.1" - rails: rails_81 - ruby: "3.4" rails: rails_70 - ruby: "4.0" diff --git a/CHANGELOG.md b/CHANGELOG.md index c0fd0203..a5ac9e3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Unreleased + +* Drop Ruby 3.1 support + ## Version 2.1.0 * Support for setting the parent controller class [#903][] diff --git a/gemfiles/rails_70/Gemfile b/gemfiles/rails_70/Gemfile index 18e1665f..9aea814e 100644 --- a/gemfiles/rails_70/Gemfile +++ b/gemfiles/rails_70/Gemfile @@ -13,7 +13,4 @@ group :development do 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_70/Gemfile.lock b/gemfiles/rails_70/Gemfile.lock index 22ef7f44..594777a7 100644 --- a/gemfiles/rails_70/Gemfile.lock +++ b/gemfiles/rails_70/Gemfile.lock @@ -115,16 +115,18 @@ GEM method_source (1.1.0) mini_mime (1.1.5) mini_portile2 (2.8.9) - minitest (5.27.0) + minitest (6.0.2) + drb (~> 2.0) + prism (~> 1.5) minitest-reporters (1.7.1) ansi builder minitest (>= 5.0) ruby-progressbar - mocha (3.0.1) + mocha (3.0.2) ruby2_keywords (>= 0.0.5) mutex_m (0.3.0) - net-imap (0.5.13) + net-imap (0.6.3) date net-protocol net-pop (0.1.2) @@ -134,19 +136,20 @@ GEM net-smtp (0.5.1) net-protocol nio4r (2.7.5) - nokogiri (1.18.10) + nokogiri (1.19.1) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.18.10-aarch64-linux-gnu) + nokogiri (1.19.1-aarch64-linux-gnu) racc (~> 1.4) - nokogiri (1.18.10-arm64-darwin) + nokogiri (1.19.1-arm64-darwin) racc (~> 1.4) - nokogiri (1.18.10-x86_64-darwin) + nokogiri (1.19.1-x86_64-darwin) racc (~> 1.4) - nokogiri (1.18.10-x86_64-linux-gnu) + nokogiri (1.19.1-x86_64-linux-gnu) racc (~> 1.4) + prism (1.9.0) racc (1.8.1) - rack (2.2.21) + rack (2.2.22) rack-test (2.2.0) rack (>= 1.3) rails (7.0.10) @@ -171,8 +174,8 @@ GEM activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.2) - loofah (~> 2.21) + rails-html-sanitizer (1.7.0) + loofah (~> 2.25) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) railties (7.0.10) actionpack (= 7.0.10) @@ -207,7 +210,7 @@ GEM base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.18) + zeitwerk (2.7.5) PLATFORMS aarch64-linux @@ -226,7 +229,6 @@ DEPENDENCIES simplecov simplecov-cobertura warning - zeitwerk (~> 2.6.18) BUNDLED WITH - 2.6.9 + 4.0.7 diff --git a/gemfiles/rails_71/Gemfile b/gemfiles/rails_71/Gemfile index ad179a11..8bd52bce 100644 --- a/gemfiles/rails_71/Gemfile +++ b/gemfiles/rails_71/Gemfile @@ -13,10 +13,4 @@ group :development do gem 'simplecov', require: false gem 'simplecov-cobertura' gem 'warning' - - # FIXME: remove this dependency when Ruby 3.1 support will be dropped - gem "erb", "~> 4.0" - - # FIXME: relax this dependency when Ruby 3.1 support will be dropped - gem "zeitwerk", "~> 2.6.18" end diff --git a/gemfiles/rails_71/Gemfile.lock b/gemfiles/rails_71/Gemfile.lock index 7fa5e090..2f5a9177 100644 --- a/gemfiles/rails_71/Gemfile.lock +++ b/gemfiles/rails_71/Gemfile.lock @@ -96,13 +96,12 @@ GEM builder (3.3.0) cgi (0.5.1) concurrent-ruby (1.3.6) - connection_pool (2.5.5) + connection_pool (3.0.2) crass (1.0.6) date (3.5.1) docile (1.4.1) drb (2.2.3) - erb (4.0.4) - cgi (>= 0.3.3) + erb (6.0.2) erubi (1.13.1) globalid (1.3.0) activesupport (>= 6.1) @@ -112,8 +111,9 @@ GEM i18n (1.14.8) concurrent-ruby (~> 1.0) io-console (0.8.2) - irb (1.16.0) + irb (1.17.0) pp (>= 0.6.0) + prism (>= 1.3.0) rdoc (>= 4.0.0) reline (>= 0.4.2) logger (1.7.0) @@ -129,16 +129,18 @@ GEM marcel (1.1.0) mini_mime (1.1.5) mini_portile2 (2.8.9) - minitest (5.27.0) + minitest (6.0.2) + drb (~> 2.0) + prism (~> 1.5) minitest-reporters (1.7.1) ansi builder minitest (>= 5.0) ruby-progressbar - mocha (3.0.1) + mocha (3.0.2) ruby2_keywords (>= 0.0.5) mutex_m (0.3.0) - net-imap (0.5.13) + net-imap (0.6.3) date net-protocol net-pop (0.1.2) @@ -148,25 +150,26 @@ GEM net-smtp (0.5.1) net-protocol nio4r (2.7.5) - nokogiri (1.18.10) + nokogiri (1.19.1) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.18.10-aarch64-linux-gnu) + nokogiri (1.19.1-aarch64-linux-gnu) racc (~> 1.4) - nokogiri (1.18.10-arm64-darwin) + nokogiri (1.19.1-arm64-darwin) racc (~> 1.4) - nokogiri (1.18.10-x86_64-darwin) + nokogiri (1.19.1-x86_64-darwin) racc (~> 1.4) - nokogiri (1.18.10-x86_64-linux-gnu) + nokogiri (1.19.1-x86_64-linux-gnu) racc (~> 1.4) pp (0.6.3) prettyprint prettyprint (0.2.0) + prism (1.9.0) psych (5.3.1) date stringio racc (1.8.1) - rack (3.2.4) + rack (3.2.5) rack-session (2.1.1) base64 (>= 0.1.0) rack (>= 3.0.0) @@ -196,8 +199,8 @@ GEM activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.2) - loofah (~> 2.21) + rails-html-sanitizer (1.7.0) + loofah (~> 2.25) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) railties (7.1.6) actionpack (= 7.1.6) @@ -210,7 +213,7 @@ GEM tsort (>= 0.2) zeitwerk (~> 2.6) rake (13.3.1) - rdoc (7.1.0) + rdoc (7.2.0) erb psych (>= 4.0.0) tsort @@ -243,7 +246,7 @@ GEM base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.18) + zeitwerk (2.7.5) PLATFORMS aarch64-linux @@ -253,7 +256,6 @@ PLATFORMS x86_64-linux DEPENDENCIES - erb (~> 4.0) inherited_resources! minitest minitest-reporters @@ -263,7 +265,6 @@ DEPENDENCIES simplecov simplecov-cobertura warning - zeitwerk (~> 2.6.18) BUNDLED WITH - 2.6.9 + 4.0.7 diff --git a/gemfiles/rails_72/Gemfile b/gemfiles/rails_72/Gemfile index 44f8322a..78d6e220 100644 --- a/gemfiles/rails_72/Gemfile +++ b/gemfiles/rails_72/Gemfile @@ -13,10 +13,4 @@ group :development do gem 'simplecov', require: false gem 'simplecov-cobertura' gem 'warning' - - # FIXME: remove this dependency when Ruby 3.1 support will be dropped - gem "erb", "~> 4.0" - - # FIXME: relax this dependency when Ruby 3.1 support will be dropped - gem "zeitwerk", "~> 2.6.18" end diff --git a/gemfiles/rails_72/Gemfile.lock b/gemfiles/rails_72/Gemfile.lock index 8a745068..df0d4922 100644 --- a/gemfiles/rails_72/Gemfile.lock +++ b/gemfiles/rails_72/Gemfile.lock @@ -90,13 +90,12 @@ GEM builder (3.3.0) cgi (0.5.1) concurrent-ruby (1.3.6) - connection_pool (2.5.5) + connection_pool (3.0.2) crass (1.0.6) date (3.5.1) docile (1.4.1) drb (2.2.3) - erb (4.0.4) - cgi (>= 0.3.3) + erb (6.0.2) erubi (1.13.1) globalid (1.3.0) activesupport (>= 6.1) @@ -106,8 +105,9 @@ GEM i18n (1.14.8) concurrent-ruby (~> 1.0) io-console (0.8.2) - irb (1.16.0) + irb (1.17.0) pp (>= 0.6.0) + prism (>= 1.3.0) rdoc (>= 4.0.0) reline (>= 0.4.2) logger (1.7.0) @@ -123,15 +123,17 @@ GEM marcel (1.1.0) mini_mime (1.1.5) mini_portile2 (2.8.9) - minitest (5.27.0) + minitest (6.0.2) + drb (~> 2.0) + prism (~> 1.5) minitest-reporters (1.7.1) ansi builder minitest (>= 5.0) ruby-progressbar - mocha (3.0.1) + mocha (3.0.2) ruby2_keywords (>= 0.0.5) - net-imap (0.5.13) + net-imap (0.6.3) date net-protocol net-pop (0.1.2) @@ -141,25 +143,26 @@ GEM net-smtp (0.5.1) net-protocol nio4r (2.7.5) - nokogiri (1.18.10) + nokogiri (1.19.1) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.18.10-aarch64-linux-gnu) + nokogiri (1.19.1-aarch64-linux-gnu) racc (~> 1.4) - nokogiri (1.18.10-arm64-darwin) + nokogiri (1.19.1-arm64-darwin) racc (~> 1.4) - nokogiri (1.18.10-x86_64-darwin) + nokogiri (1.19.1-x86_64-darwin) racc (~> 1.4) - nokogiri (1.18.10-x86_64-linux-gnu) + nokogiri (1.19.1-x86_64-linux-gnu) racc (~> 1.4) pp (0.6.3) prettyprint prettyprint (0.2.0) + prism (1.9.0) psych (5.3.1) date stringio racc (1.8.1) - rack (3.2.4) + rack (3.2.5) rack-session (2.1.1) base64 (>= 0.1.0) rack (>= 3.0.0) @@ -189,8 +192,8 @@ GEM activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.2) - loofah (~> 2.21) + rails-html-sanitizer (1.7.0) + loofah (~> 2.25) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) railties (7.2.3) actionpack (= 7.2.3) @@ -203,7 +206,7 @@ GEM tsort (>= 0.2) zeitwerk (~> 2.6) rake (13.3.1) - rdoc (7.1.0) + rdoc (7.2.0) erb psych (>= 4.0.0) tsort @@ -237,7 +240,7 @@ GEM base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.18) + zeitwerk (2.7.5) PLATFORMS aarch64-linux @@ -247,7 +250,6 @@ PLATFORMS x86_64-linux DEPENDENCIES - erb (~> 4.0) inherited_resources! minitest minitest-reporters @@ -257,7 +259,6 @@ DEPENDENCIES simplecov simplecov-cobertura warning - zeitwerk (~> 2.6.18) BUNDLED WITH - 2.6.9 + 4.0.7 diff --git a/inherited_resources.gemspec b/inherited_resources.gemspec index 7279f737..48c5c901 100644 --- a/inherited_resources.gemspec +++ b/inherited_resources.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.metadata = { "rubygems_mfa_required" => "true" } - s.required_ruby_version = '>= 3.1' + s.required_ruby_version = '>= 3.2' s.add_dependency("actionpack", ">= 7.0") s.add_dependency("has_scope", ">= 0.6")