From b005b49b1785d4c5da703f77d4966dfdfae86b6d Mon Sep 17 00:00:00 2001 From: Hermann Mayer Date: Fri, 3 Jan 2025 14:15:15 +0100 Subject: [PATCH] Raised the minimum Ruby/Rails versions. Signed-off-by: Hermann Mayer --- .github/workflows/test.yml | 2 +- .rubocop.yml | 2 +- Appraisals | 6 ------ CHANGELOG.md | 2 +- countless.gemspec | 4 ++-- gemfiles/rails_5.2.gemfile | 21 --------------------- 6 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 gemfiles/rails_5.2.gemfile diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4febaa3..03fdee3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: fail-fast: false matrix: ruby: ['2.7', '3.0', '3.1'] - rails: ['5.2', '6.1', '7.1'] + rails: ['6.1', '7.1'] env: BUNDLE_GEMFILE: 'gemfiles/rails_${{ matrix.rails }}.gemfile' steps: diff --git a/.rubocop.yml b/.rubocop.yml index 45c9bfc..ff56508 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -9,7 +9,7 @@ AllCops: SuggestExtensions: false DisplayCopNames: true TargetRubyVersion: 2.7 - TargetRailsVersion: 5.2 + TargetRailsVersion: 6.1 Exclude: - bin/**/* - vendor/**/* diff --git a/Appraisals b/Appraisals index 15aa0af..14cdee6 100644 --- a/Appraisals +++ b/Appraisals @@ -1,11 +1,5 @@ # frozen_string_literal: true -appraise 'rails-5.2' do - gem 'activejob', '~> 5.2.0' - gem 'activerecord', '~> 5.2.0' - gem 'activesupport', '~> 5.2.0' -end - appraise 'rails-6.1' do gem 'activejob', '~> 6.1.0' gem 'activerecord', '~> 6.1.0' diff --git a/CHANGELOG.md b/CHANGELOG.md index ce3626b..19bfba7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ### next -* TODO: Replace this bullet point with an actual description of a change. +* Raised minimum supported Ruby/Rails version to 2.7/6.1 (#5) ### 1.3.4 (15 August 2024) diff --git a/countless.gemspec b/countless.gemspec index b37fe01..9383f86 100644 --- a/countless.gemspec +++ b/countless.gemspec @@ -34,6 +34,6 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.7' - spec.add_runtime_dependency 'activesupport', '>= 5.2' - spec.add_runtime_dependency 'zeitwerk', '~> 2.6' + spec.add_dependency 'activesupport', '>= 6.1' + spec.add_dependency 'zeitwerk', '~> 2.6' end diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile deleted file mode 100644 index 293e09b..0000000 --- a/gemfiles/rails_5.2.gemfile +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal", "~> 2.4" -gem "benchmark-ips", "~> 2.10" -gem "bundler", "~> 2.3" -gem "guard-rspec", "~> 4.7" -gem "irb", "~> 1.2" -gem "rspec", "~> 3.12" -gem "rubocop", "~> 1.28" -gem "rubocop-rails", "~> 2.14" -gem "rubocop-rspec", "~> 2.10" -gem "simplecov", ">= 0.22" -gem "yard", ">= 0.9.28" -gem "yard-activesupport-concern", ">= 0.0.1" -gem "activejob", "~> 5.2.0" -gem "activerecord", "~> 5.2.0" -gem "activesupport", "~> 5.2.0" - -gemspec path: "../"