diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10fca0d..fef1c3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,6 @@ jobs: - "3.2" - "3.3" rails: - - rails_61 - rails_70 - rails_71 - rails_72 diff --git a/CHANGELOG.md b/CHANGELOG.md index 33faefb..3425609 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 + ## 2.0.2 [☰](https://github.com/activeadmin/arbre/compare/v2.0.1...v2.0.2) * Prefer `require_relative` for internal requires. [#622][] by [@tagliala][] diff --git a/Gemfile.lock b/Gemfile.lock index 623af8b..292bb49 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: arbre (2.0.2) - activesupport (>= 3.0.0) + activesupport (>= 7.0) GEM remote: http://rubygems.org/ @@ -220,7 +220,7 @@ GEM rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (7.0.1) + rspec-rails (7.1.0) actionpack (>= 7.0) activesupport (>= 7.0) railties (>= 7.0) diff --git a/arbre.gemspec b/arbre.gemspec index 2296888..8a86201 100644 --- a/arbre.gemspec +++ b/arbre.gemspec @@ -23,5 +23,5 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 3.1' - s.add_dependency("activesupport", ">= 3.0.0") + s.add_dependency("activesupport", ">= 7.0") end diff --git a/gemfiles/rails_61/Gemfile b/gemfiles/rails_61/Gemfile deleted file mode 100644 index e9e5384..0000000 --- a/gemfiles/rails_61/Gemfile +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true -source 'http://rubygems.org' - -gem 'rake' - -group :test do - gem 'rspec' - gem 'simplecov', require: false - gem 'simplecov-cobertura' - gem 'pry' -end - -group :rails do - gem 'rails', '~> 6.1.0' - gem 'rspec-rails' - gem 'combustion' - gem 'capybara' - - # FIXME: relax this dependency when Ruby 3.1 support will be dropped - gem "zeitwerk", "~> 2.6.18" -end - -gemspec path: "../.." diff --git a/gemfiles/rails_61/Gemfile.lock b/gemfiles/rails_61/Gemfile.lock deleted file mode 100644 index e204310..0000000 --- a/gemfiles/rails_61/Gemfile.lock +++ /dev/null @@ -1,239 +0,0 @@ -PATH - remote: ../.. - specs: - arbre (2.0.2) - activesupport (>= 3.0.0) - -GEM - remote: http://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) - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) - builder (3.3.0) - capybara (3.40.0) - addressable - matrix - mini_mime (>= 0.1.3) - nokogiri (~> 1.11) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (>= 1.5, < 3.0) - xpath (~> 3.2) - coderay (1.1.3) - combustion (1.5.0) - activesupport (>= 3.0.0) - railties (>= 3.0.0) - thor (>= 0.14.6) - concurrent-ruby (1.3.4) - crass (1.0.6) - date (3.4.0) - diff-lcs (1.5.1) - docile (1.4.1) - erubi (1.13.0) - globalid (1.2.1) - activesupport (>= 6.1) - 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) - matrix (0.4.2) - method_source (1.1.0) - mini_mime (1.1.5) - mini_portile2 (2.8.7) - minitest (5.25.1) - 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) - pry (0.14.2) - coderay (~> 1.1) - method_source (~> 1.0) - public_suffix (6.0.1) - 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-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) - regexp_parser (2.9.2) - rexml (3.3.9) - rspec (3.13.0) - rspec-core (~> 3.13.0) - rspec-expectations (~> 3.13.0) - rspec-mocks (~> 3.13.0) - 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.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-rails (6.1.5) - actionpack (>= 6.1) - activesupport (>= 6.1) - railties (>= 6.1) - rspec-core (~> 3.13) - rspec-expectations (~> 3.13) - rspec-mocks (~> 3.13) - rspec-support (~> 3.13) - rspec-support (3.13.1) - 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) - websocket-driver (0.7.6) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - xpath (3.2.0) - nokogiri (~> 1.8) - zeitwerk (2.6.18) - -PLATFORMS - aarch64-linux - arm64-darwin - ruby - x86_64-darwin - x86_64-linux - -DEPENDENCIES - arbre! - capybara - combustion - pry - rails (~> 6.1.0) - rake - rspec - rspec-rails - simplecov - simplecov-cobertura - zeitwerk (~> 2.6.18) - -BUNDLED WITH - 2.5.23 diff --git a/gemfiles/rails_70/Gemfile.lock b/gemfiles/rails_70/Gemfile.lock index e17e150..694cfbe 100644 --- a/gemfiles/rails_70/Gemfile.lock +++ b/gemfiles/rails_70/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: ../.. specs: arbre (2.0.2) - activesupport (>= 3.0.0) + activesupport (>= 7.0) GEM remote: http://rubygems.org/ @@ -185,7 +185,7 @@ GEM rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (7.0.1) + rspec-rails (7.1.0) actionpack (>= 7.0) activesupport (>= 7.0) railties (>= 7.0) diff --git a/gemfiles/rails_71/Gemfile.lock b/gemfiles/rails_71/Gemfile.lock index 0caea4f..a824b3f 100644 --- a/gemfiles/rails_71/Gemfile.lock +++ b/gemfiles/rails_71/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: ../.. specs: arbre (2.0.2) - activesupport (>= 3.0.0) + activesupport (>= 7.0) GEM remote: http://rubygems.org/ @@ -219,7 +219,7 @@ GEM rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (7.0.1) + rspec-rails (7.1.0) actionpack (>= 7.0) activesupport (>= 7.0) railties (>= 7.0) diff --git a/gemfiles/rails_72/Gemfile.lock b/gemfiles/rails_72/Gemfile.lock index 000582b..28ebcc8 100644 --- a/gemfiles/rails_72/Gemfile.lock +++ b/gemfiles/rails_72/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: ../.. specs: arbre (2.0.2) - activesupport (>= 3.0.0) + activesupport (>= 7.0) GEM remote: http://rubygems.org/ @@ -212,7 +212,7 @@ GEM rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (7.0.1) + rspec-rails (7.1.0) actionpack (>= 7.0) activesupport (>= 7.0) railties (>= 7.0)