From 0e08897f1525d8cefed9c70a699107e1fb2e6e4f Mon Sep 17 00:00:00 2001 From: David Genord II Date: Fri, 27 Dec 2024 10:27:41 -0500 Subject: [PATCH 1/3] Add ruby 3.4 to the build matrix --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43bf8912..91fdc95d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: ['3.2', '3.3', jruby-9.4, jruby-head, ruby-head] + ruby: ['3.2', '3.3', '3.4', jruby-9.4, jruby-head, ruby-head] rails_version: - '7.0.0' - '7.1.0' From b6bacbc905adf46ae3ffef637471662173648dff Mon Sep 17 00:00:00 2001 From: David Genord II Date: Fri, 27 Dec 2024 10:53:12 -0500 Subject: [PATCH 2/3] Update dependencies for things moving out of stdlib --- Gemfile | 1 + delayed_job.gemspec | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index 72280c43..9042bd35 100644 --- a/Gemfile +++ b/Gemfile @@ -77,6 +77,7 @@ group :test do gem 'base64' gem 'bigdecimal' gem 'mutex_m' + gem 'ostruct' end if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] >= '6.0.0' gem 'zeitwerk', :require => false diff --git a/delayed_job.gemspec b/delayed_job.gemspec index e6bc24b4..c68295ee 100644 --- a/delayed_job.gemspec +++ b/delayed_job.gemspec @@ -2,6 +2,8 @@ Gem::Specification.new do |spec| spec.add_dependency 'activesupport', ['>= 3.0', '< 9.0'] + spec.add_dependency 'benchmark' + spec.add_dependency 'logger' spec.authors = ['Brandon Keepers', 'Brian Ryckbost', 'Chris Gaffney', 'David Genord II', 'Erik Michaels-Ober', 'Matt Griffin', 'Steve Richert', 'Tobias Lütke'] spec.description = 'Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks.' spec.email = ['brian@collectiveidea.com'] From b9ca8317e382f9a578d89b7367309df91e234ce3 Mon Sep 17 00:00:00 2001 From: David Genord II Date: Fri, 27 Dec 2024 11:08:10 -0500 Subject: [PATCH 3/3] Use older logger in old ruby --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index 9042bd35..1e699372 100644 --- a/Gemfile +++ b/Gemfile @@ -78,6 +78,8 @@ group :test do gem 'bigdecimal' gem 'mutex_m' gem 'ostruct' + elsif Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.2.100') + gem 'logger', '< 1.3' end if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] >= '6.0.0' gem 'zeitwerk', :require => false