diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 394001e..7af8218 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@c4e5b1316158f92e3d49443a9d58b31d25ac0f8f # ruby/setup-ruby@v1 see https://github.com/ruby/setup-ruby/tree/v1 with: - ruby-version: 3.4 + ruby-version: 4.0 - name: Install dependencies run: bundle install - name: Run RuboCop against BASE..HEAD changes diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c851f5f..f283479 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,13 +8,10 @@ jobs: fail-fast: false matrix: ruby-version: - - '3.1' - - '3.2' - '3.3' - '3.4' - '4.0' gemfile: - - gemfiles/Gemfile.rails70 - gemfiles/Gemfile.rails71 - gemfiles/Gemfile.rails72 - gemfiles/Gemfile.rails80 @@ -24,16 +21,6 @@ jobs: # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html - ruby-version: '3.1' gemfile: 'gemfiles/Gemfile.rails81' - # rails 8.0 requires ruby >= 3.2 - # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html - - ruby-version: '3.1' - gemfile: 'gemfiles/Gemfile.rails80' - # rails 7.0 requires ruby <= 3.3 - # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html - - ruby-version: '3.4' - gemfile: 'gemfiles/Gemfile.rails70' - - ruby-version: '4.0' - gemfile: 'gemfiles/Gemfile.rails70' name: Ruby ${{ matrix.ruby-version }} / Bundle ${{ matrix.gemfile }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 69d6f6c..7ae703d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## [Unreleased] -*no unreleased changes* +### Fixed +* Drop support for Ruby 3.1 and 3.2, Rails 7.0 ## 7.3.6 / 2026-01-13 ### Added diff --git a/gemfiles/Gemfile.rails70 b/gemfiles/Gemfile.rails70 deleted file mode 100644 index 8eec5b8..0000000 --- a/gemfiles/Gemfile.rails70 +++ /dev/null @@ -1,7 +0,0 @@ -source 'https://rubygems.org' -gemspec path: '..' - -gem 'activesupport', '~> 7.0.0' - -# Latest concurrent-ruby breaks Rails < 7.1. See https://github.com/rails/rails/issues/54260 -gem 'concurrent-ruby', '1.3.4' diff --git a/ndr_dev_support.gemspec b/ndr_dev_support.gemspec index fd6c0a7..d9a9918 100644 --- a/ndr_dev_support.gemspec +++ b/ndr_dev_support.gemspec @@ -13,14 +13,14 @@ Gem::Specification.new do |spec| spec.license = 'MIT' gem_files = %w[CHANGELOG.md CODE_OF_CONDUCT.md LICENSE.txt README.md - config lib ndr_dev_support.gemspec] + SECURITY.md config lib ndr_dev_support.gemspec] spec.files = `git ls-files -z`.split("\x0"). select { |f| gem_files.include?(f.split('/')[0]) } spec.bindir = 'exe' spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ['lib'] - spec.required_ruby_version = '>= 3.1' + spec.required_ruby_version = '>= 3.2' spec.add_dependency 'pry' @@ -39,7 +39,7 @@ Gem::Specification.new do |spec| # Integration test dependencies: spec.add_dependency 'capybara', '>= 3.34' spec.add_dependency 'capybara-screenshot' - spec.add_dependency 'minitest', '~> 5.11' + spec.add_dependency 'minitest', '>= 5.11', '< 7.0' spec.add_dependency 'selenium-webdriver', '~> 4.8' spec.add_dependency 'show_me_the_cookies'