Merge pull request #21 from justinhoward/fix-ci-matrix

Release v1.0.0: modernize CI matrix and raise Ruby floor to 3.1

Author: justinhoward

.github/workflows/ci.yml

@@ -14,12 +14,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', jruby-head, truffleruby-head]
+        ruby: ['3.1', '3.2', '3.3', '3.4', jruby-head, truffleruby-head]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
-        env:
-          REDIS_VERSION: ${{ matrix.redis }}
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
@@ -29,40 +27,40 @@ jobs:
         env:
           MYSQL_USER: root
           MYSQL_PASSWORD: root
-      - uses: codecov/codecov-action@v3
-        if: matrix.ruby == '3.0'
+      - uses: codecov/codecov-action@v4
+        if: matrix.ruby == '3.4'
         with:
           files: coverage/coverage.xml
       - run: bin/check-version
 
   rubocop:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: '3.4'
           bundler-cache: true
       - run: bundle exec rubocop
 
   yard:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.4'
           bundler-cache: true
       - run: bin/yardoc --fail-on-warning
 
   check_version:
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.4'
           bundler-cache: true
       - run: bin/check-version
 
@@ -71,7 +69,7 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Publish to RubyGems
         run: |
           mkdir -p $HOME/.gem

.rubocop.yml

@@ -3,7 +3,7 @@ require:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 3.1
 
 Gemspec/DeprecatedAttributeAssignment: { Enabled: true }
 Gemspec/RequireMFA: { Enabled: true }

CHANGELOG.md

@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.0] - 2026-05-12
+
+This release marks Cutoff's API as stable. There are no behavior changes
+since 0.5.2.
+
+### Breaking
+
+- Drop support for Ruby < 3.1. The minimum supported Ruby is now 3.1.
+  `required_ruby_version` in the gemspec has been raised accordingly. #21
+  justinhoward
+
+### Changed
+
+- Modernize CI matrix to Ruby 3.1, 3.2, 3.3, 3.4, jruby-head, and
+  truffleruby-head, and update gem dependencies that had rotted out of
+  CI in the interim. #21 justinhoward
+
 ## [0.5.2] - 2022-09-06
 
 ### Changed
@@ -81,7 +98,8 @@ to `Timeout::Error`. `CutoffError` changes from a class to a module.
 - Cutoff class
 - Mysql2 patch
 
-[Unreleased]: https://github.com/justinhoward/cutoff/compare/v0.5.2...HEAD
+[Unreleased]: https://github.com/justinhoward/cutoff/compare/v1.0.0...HEAD
+[1.0.0]: https://github.com/justinhoward/cutoff/compare/v0.5.2...v1.0.0
 [0.5.2]: https://github.com/justinhoward/cutoff/compare/v0.5.1...v0.5.2
 [0.5.1]: https://github.com/justinhoward/cutoff/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/justinhoward/cutoff/compare/v0.4.2...v0.5.0

Gemfile

@@ -8,10 +8,9 @@ gemspec
 # here. This also allows us to use conditional dependencies that depend on the
 # platform
 
-not_jruby = %i[ruby mingw x64_mingw].freeze
+not_jruby = %i[ruby windows].freeze
 
 gem 'actionpack'
-gem 'bundler', '>= 1.17', '< 3'
 gem 'byebug', platforms: not_jruby
 gem 'irb', '~> 1.0'
 # Minimum of 0.5.0 for specific error classes
@@ -25,9 +24,11 @@ gem 'yard', '~> 0.9.25', platforms: not_jruby
 
 gem 'concurrent-ruby'
 
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6')
-  gem 'rubocop', '1.34.1'
-  gem 'rubocop-rspec', '2.12'
-  gem 'simplecov', '~> 0.21.0'
-  gem 'simplecov-cobertura', '~> 2.1'
-end
+gem 'rubocop', '1.34.1'
+gem 'rubocop-rspec', '2.12'
+gem 'simplecov', '~> 0.21.0'
+gem 'simplecov-cobertura', '~> 3.1'
+
+# simplecov-cobertura crashes with REXML::ParseException: Malformed XML on
+# rexml >= 3.4.2. https://github.com/jessebs/simplecov-cobertura/issues/48
+gem 'rexml', '< 3.4.2'

cutoff.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.files = Dir['lib/**/*.rb', '*.md', '*.txt', '.yardopts']
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.3'
+  spec.required_ruby_version = '>= 3.1'
 
   spec.add_development_dependency 'rspec', '~> 3.10'
   spec.add_development_dependency 'rspec-rails', '~> 5.0'

lib/cutoff/version.rb

@@ -3,6 +3,6 @@
 class Cutoff
   # @return [Gem::Version] The current version of the cutoff gem
   def self.version
-    Gem::Version.new('0.5.2')
+    Gem::Version.new('1.0.0')
   end
 end

spec/spec_helper.rb

@@ -27,11 +27,7 @@
 require 'sidekiq/testing'
 
 begin
-  # We don't test Mysql2 on Ruby 2.3 since that would require
-  # installing an old EOL version of OpenSSL
-  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4')
-    require 'cutoff/patch/mysql2'
-  end
+  require 'cutoff/patch/mysql2'
 rescue LoadError
   # Ok if mysql2 isn't available
 end