diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0eb5cdeea..0e8db233b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,12 +27,6 @@ jobs: fail-fast: false matrix: include: - - ruby_version: "3.1" - rails_version: "6.1" - mode: "capture_patch_enabled" - - ruby_version: "3.1" - rails_version: "6.1" - mode: "capture_patch_disabled" - ruby_version: "3.1" rails_version: "7.0" mode: "capture_patch_enabled" diff --git a/Gemfile.lock b/Gemfile.lock index b0541d14e..742099c0a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: view_component (3.14.0) - activesupport (>= 5.2.0, < 8.0) + activesupport (>= 7.0.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index a2aae92d0..b6c922a1e 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -12,13 +12,17 @@ nav_order: 5 ## 4.0.0 +* BREAKING: Require [non-EOL](https://endoflife.date/rails) Rails (`>= 7.0.0`). + + *Joel Hawksley* + * BREAKING: Require [non-EOL](https://www.ruby-lang.org/en/downloads/branches/) Ruby (`>= 3.1.0`). - * Joel Hawksley* + *Joel Hawksley* * Add Kicksite to list of companies using ViewComponent. - *Adil Lari* + *Adil Lari* * Allow overridden slot methods to use `super`. diff --git a/view_component.gemspec b/view_component.gemspec index 3e0cfbde6..13a46a557 100644 --- a/view_component.gemspec +++ b/view_component.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 3.1.0" - spec.add_runtime_dependency "activesupport", [">= 5.2.0", "< 8.0"] + spec.add_runtime_dependency "activesupport", [">= 7.0.0", "< 8.0"] spec.add_runtime_dependency "method_source", "~> 1.0" spec.add_runtime_dependency "concurrent-ruby", "~> 1.0" spec.add_development_dependency "appraisal", "~> 2.4"