From 1043298762b229508753381b9788b21e1e96cc70 Mon Sep 17 00:00:00 2001 From: Valter Santos Date: Tue, 12 Nov 2024 15:31:49 +0000 Subject: [PATCH 1/2] Add rails 8 --- .circleci/config.yml | 12 ++++++------ Appraisals | 11 +++++------ CHANGELOG.md | 4 ++++ delayed_job_groups.gemspec | 2 +- gemfiles/{rails_6.1.gemfile => rails_8.0.gemfile} | 5 ++--- lib/delayed/job_groups/version.rb | 2 +- 6 files changed, 19 insertions(+), 17 deletions(-) rename gemfiles/{rails_6.1.gemfile => rails_8.0.gemfile} (51%) diff --git a/.circleci/config.yml b/.circleci/config.yml index cbd1605..8942d86 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -71,15 +71,15 @@ workflows: matrix: parameters: gemfile: - - gemfiles/rails_6.1.gemfile - gemfiles/rails_7.0.gemfile - gemfiles/rails_7.1.gemfile - gemfiles/rails_7.2.gemfile + - gemfiles/rails_8.0.gemfile ruby_version: - - 3.0.7 - - 3.1.6 - - 3.2.5 + - 3.1.5 + - 3.2.4 - 3.3.4 exclude: - - gemfile: gemfiles/rails_7.2.gemfile - ruby_version: 3.0.7 + - gemfile: gemfiles/rails_8.0.gemfile + ruby_version: 3.1.5 + diff --git a/Appraisals b/Appraisals index e3f3fad..bdc574f 100644 --- a/Appraisals +++ b/Appraisals @@ -1,11 +1,5 @@ # frozen_string_literal: true -appraise 'rails-6.1' do - gem 'activerecord', '~> 6.1.7' - gem 'activesupport', '~> 6.1.7' - gem 'sqlite3', '~> 1.7' -end - appraise 'rails-7.0' do gem 'activerecord', '~> 7.0.8' gem 'activesupport', '~> 7.0.8' @@ -21,3 +15,8 @@ appraise 'rails-7.2' do gem 'activerecord', '~> 7.2.1' gem 'activesupport', '~> 7.2.1' end + +appraise 'rails-8.0' do + gem 'activerecord', '~> 8.0.0' + gem 'activesupport', '~> 8.0.0' +end diff --git a/CHANGELOG.md b/CHANGELOG.md index b5da31d..ce0bd88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.12.0 +- Add support for Rails 8.0. +- Drop support for Rails 6.1 + ## 0.11.0 - Add support for Rails 7.2. - diff --git a/delayed_job_groups.gemspec b/delayed_job_groups.gemspec index b8d8d69..955105e 100644 --- a/delayed_job_groups.gemspec +++ b/delayed_job_groups.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 3.0' - spec.add_dependency 'activerecord', '>= 6.1', '< 8.0' + spec.add_dependency 'activerecord', '>= 6.1', '< 8.1' spec.add_dependency 'delayed_job', '>= 4.1' spec.add_dependency 'delayed_job_active_record', '>= 4.1.8' diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_8.0.gemfile similarity index 51% rename from gemfiles/rails_6.1.gemfile rename to gemfiles/rails_8.0.gemfile index 2529cda..f71881d 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_8.0.gemfile @@ -2,8 +2,7 @@ source "https://rubygems.org" -gem "activerecord", "~> 6.1.7" -gem "activesupport", "~> 6.1.7" -gem "sqlite3", "~> 1.7" +gem "activerecord", "~> 8.0.0" +gem "activesupport", "~> 8.0.0" gemspec path: "../" diff --git a/lib/delayed/job_groups/version.rb b/lib/delayed/job_groups/version.rb index 662197b..75a446c 100644 --- a/lib/delayed/job_groups/version.rb +++ b/lib/delayed/job_groups/version.rb @@ -2,6 +2,6 @@ module Delayed module JobGroups - VERSION = '0.11.0' + VERSION = '0.12.0' end end From d3cffa47408207507ca339ced37e9a2d5e5ec3eb Mon Sep 17 00:00:00 2001 From: Valter Santos Date: Tue, 12 Nov 2024 15:49:56 +0000 Subject: [PATCH 2/2] Fix lint --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8942d86..ec94526 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,13 +4,13 @@ jobs: docker: - image: cimg/ruby:3.0.7 environment: - BUNDLE_GEMFILE: gemfiles/rails_6.1.gemfile + BUNDLE_GEMFILE: gemfiles/rails_7.0.gemfile working_directory: ~/delayed_job_groups steps: - checkout - restore_cache: keys: - - v1-gems-ruby-3.0.7-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "gemfiles/rails_6.1.gemfile" }} + - v1-gems-ruby-3.0.7-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "gemfiles/rails_7.0.gemfile - v1-gems-ruby-3.0.7- - run: name: Install Gems @@ -20,7 +20,7 @@ jobs: bundle clean fi - save_cache: - key: v1-gems-ruby-3.0.7-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "gemfiles/rails_6.1.gemfile" }} + key: v1-gems-ruby-3.0.7-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "gemfiles/rails_7.0.gemfile paths: - "vendor/bundle" - "gemfiles/vendor/bundle"