diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e874383..c611cb4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,18 +10,13 @@ jobs: fail-fast: false matrix: ruby-version: - - '2.7' - - '3.0' - '3.1' - '3.2' - '3.3' gemfile: - - rails6.0 - rails6.1 - rails7.0 - rails7.1 - include: - - {ruby-version: '2.7', gemfile: rails5.2} env: BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile steps: diff --git a/.ruby-version b/.ruby-version index 6a81b4c..0aec50e 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.8 +3.1.4 diff --git a/CHANGELOG.md b/CHANGELOG.md index e452823..fe503fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +* Dropped support for Ruby < 3.1. +* Dropped support for Rails < 6.1. + ## [2.7.0] - 2023-11-14 * Added support for Rails 7.1 diff --git a/Gemfile b/Gemfile index 31d6d85..033bf94 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,3 @@ source "https://rubygems.org" -eval_gemfile("gemfiles/rails5.2.gemfile") +eval_gemfile("gemfiles/rails6.1.gemfile") diff --git a/charcoal.gemspec b/charcoal.gemspec index 6850427..dbe8475 100644 --- a/charcoal.gemspec +++ b/charcoal.gemspec @@ -7,14 +7,14 @@ Gem::Specification.new("charcoal", Charcoal::VERSION) do |s| s.email = "sdavidovitz@zendesk.com" s.homepage = "https://github.com/zendesk/charcoal" - s.required_ruby_version = ">= 2.7" + s.required_ruby_version = ">= 3.1" s.files = Dir.glob("{lib,config,app}/**/*") s.licenses = ["MIT"] - s.add_runtime_dependency "activesupport", ">= 5.2", "< 7.2" - s.add_runtime_dependency "actionpack", ">= 5.2", "< 7.2" + s.add_runtime_dependency "activesupport", ">= 6.1", "< 7.2" + s.add_runtime_dependency "actionpack", ">= 6.1", "< 7.2" s.add_development_dependency "rake" s.add_development_dependency "yard", ">= 0.9.11" diff --git a/gemfiles/rails5.2.gemfile b/gemfiles/rails5.2.gemfile deleted file mode 100644 index 11c5d8c..0000000 --- a/gemfiles/rails5.2.gemfile +++ /dev/null @@ -1,4 +0,0 @@ -eval_gemfile "common.rb" - -gem "rails", "~> 5.2.0" -gem "actionpack-action_caching" diff --git a/gemfiles/rails6.0.gemfile b/gemfiles/rails6.0.gemfile deleted file mode 100644 index b098679..0000000 --- a/gemfiles/rails6.0.gemfile +++ /dev/null @@ -1,4 +0,0 @@ -eval_gemfile "common.rb" - -gem "rails", "~> 6.0.0" -gem "actionpack-action_caching"