diff --git a/.circleci/config.yml b/.circleci/config.yml index 18cce39..35e09da 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,15 +7,15 @@ version: 2.1 jobs: lint: docker: - - image: $SALSIFY_ECR_REPO/ruby_ci:2.7.7 + - image: $SALSIFY_ECR_REPO/ruby_ci:3.0.6 <<: *aws-auth working_directory: ~/delayed_job_groups steps: - checkout - restore_cache: keys: - - v1-gems-ruby-2.7.7-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "Gemfile" }} - - v1-gems-ruby-2.7.7- + - v1-gems-ruby-3.0.6-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "Gemfile" }} + - v1-gems-ruby-3.0.6- - run: name: Install Gems command: | @@ -24,7 +24,7 @@ jobs: bundle clean fi - save_cache: - key: v1-gems-ruby-2.7.7-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "Gemfile" }} + key: v1-gems-ruby-3.0.6-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "Gemfile" }} paths: - "vendor/bundle" - "gemfiles/vendor/bundle" @@ -78,11 +78,9 @@ workflows: matrix: parameters: gemfile: - - "gemfiles/rails_6.0.gemfile" - "gemfiles/rails_6.1.gemfile" - "gemfiles/rails_7.0.gemfile" ruby_version: - - "2.7.7" - "3.0.6" - "3.1.4" - "3.2.2" diff --git a/.gitignore b/.gitignore index 8a2dd4f..b60e537 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ test/tmp test/version_tmp tmp *.gemfile.lock +.ruby-version diff --git a/.rubocop.yml b/.rubocop.yml index ea5950a..2ae6114 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,7 +2,7 @@ inherit_gem: salsify_rubocop: conf/rubocop.yml AllCops: - TargetRubyVersion: 2.7 + TargetRubyVersion: 3.0 Exclude: - 'vendor/**/*' - 'gemfiles/**/*' diff --git a/Appraisals b/Appraisals index 9e9ff7f..08e4131 100644 --- a/Appraisals +++ b/Appraisals @@ -1,10 +1,5 @@ # frozen_string_literal: true -appraise 'rails-6.0' do - gem 'activerecord', '~> 6.0.4' - gem 'activesupport', '~> 6.0.4' -end - appraise 'rails-6.1' do gem 'activerecord', '~> 6.1.5' gem 'activesupport', '~> 6.1.5' diff --git a/CHANGELOG.md b/CHANGELOG.md index f552c75..8f8f620 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ### 0.9.0 - Add a `CompleteStuckJobGroupsJob`, which can be run periodically to close "stuck" job groups +- Drop support for Ruby 2.7 +- Drop support for Rails 6.0 ### 0.8.0 - Drop support for ruby < 2.7 diff --git a/delayed_job_groups.gemspec b/delayed_job_groups.gemspec index 7bea3d6..ac6d28a 100644 --- a/delayed_job_groups.gemspec +++ b/delayed_job_groups.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |spec| spec.test_files = Dir.glob('spec/**/*') spec.require_paths = ['lib'] - spec.required_ruby_version = '>= 2.7' + spec.required_ruby_version = '>= 3.0' spec.add_dependency 'delayed_job', '>= 4.1' spec.add_dependency 'delayed_job_active_record', '>= 4.1' @@ -34,7 +34,7 @@ Gem::Specification.new do |spec| 'for upgrade/installation notes.' spec.add_development_dependency 'appraisal' - spec.add_dependency 'activerecord', '>= 5.2', '< 7.1' + spec.add_dependency 'activerecord', '>= 6.1', '< 7.1' spec.add_development_dependency 'coveralls_reborn', '>= 0.18.0' spec.add_development_dependency 'database_cleaner', '>= 1.2' spec.add_development_dependency 'factory_bot_rails' diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile deleted file mode 100644 index 9b80006..0000000 --- a/gemfiles/rails_6.0.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "activerecord", "~> 6.0.4" -gem "activesupport", "~> 6.0.4" - -gemspec path: "../"