diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e49829c..2c50b2b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,6 +33,7 @@ jobs: - gemfiles/activejob_6.1.x.gemfile - gemfiles/activejob_7.0.x.gemfile - gemfiles/activejob_7.1.x.gemfile + - gemfiles/activejob_7.2.x.gemfile - gemfiles/sidekiq_4.x.gemfile - gemfiles/sidekiq_5.x.gemfile - gemfiles/sidekiq_6.x.gemfile @@ -42,6 +43,8 @@ jobs: gemfile: gemfiles/activejob_7.0.x.gemfile - ruby: 2.5.9 gemfile: gemfiles/activejob_7.1.x.gemfile + - ruby: 2.5.9 + gemfile: gemfiles/activejob_7.2.x.gemfile - ruby: 2.5.9 gemfile: gemfiles/sidekiq_6.x.gemfile - ruby: 2.5.9 @@ -50,18 +53,24 @@ jobs: gemfile: gemfiles/activejob_7.0.x.gemfile - ruby: 2.6.10 gemfile: gemfiles/activejob_7.1.x.gemfile + - ruby: 2.6.10 + gemfile: gemfiles/activejob_7.2.x.gemfile - ruby: 2.6.10 gemfile: gemfiles/sidekiq_6.x.gemfile - ruby: 2.6.10 gemfile: gemfiles/sidekiq_7.x.gemfile - ruby: 2.7.7 gemfile: gemfiles/activejob_4.2.x.gemfile + - ruby: 2.7.7 + gemfile: gemfiles/activejob_7.2.x.gemfile - ruby: 2.7.7 gemfile: gemfiles/sidekiq_4.x.gemfile - ruby: 3.0.5 gemfile: gemfiles/activejob_4.2.x.gemfile - ruby: 3.0.5 gemfile: gemfiles/activejob_5.2.x.gemfile + - ruby: 3.0.5 + gemfile: gemfiles/activejob_7.2.x.gemfile - ruby: 3.0.5 gemfile: gemfiles/sidekiq_4.x.gemfile - ruby: 3.0.5 diff --git a/activejob-uniqueness.gemspec b/activejob-uniqueness.gemspec index c0958e9..82c251c 100644 --- a/activejob-uniqueness.gemspec +++ b/activejob-uniqueness.gemspec @@ -28,7 +28,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.5' - spec.add_dependency 'activejob', '>= 4.2', '< 7.2' + spec.add_dependency 'activejob', '>= 4.2', '< 7.3' spec.add_dependency 'redlock', '>= 2.0', '< 3' spec.add_development_dependency 'appraisal', '~> 2.3.0' diff --git a/gemfiles/activejob_7.2.x.gemfile b/gemfiles/activejob_7.2.x.gemfile new file mode 100644 index 0000000..935dcf4 --- /dev/null +++ b/gemfiles/activejob_7.2.x.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "activejob", "~> 7.2" + +gemspec path: "../" diff --git a/lib/active_job/uniqueness/sidekiq_patch.rb b/lib/active_job/uniqueness/sidekiq_patch.rb index b5aa0dc..d0fd9f4 100644 --- a/lib/active_job/uniqueness/sidekiq_patch.rb +++ b/lib/active_job/uniqueness/sidekiq_patch.rb @@ -41,7 +41,7 @@ def remove_job module ScheduledSet def delete(score, job_id) entry = find_job(job_id) - ActiveJob::Uniqueness.unlock_sidekiq_job!(entry.item) if super(score, job_id) + ActiveJob::Uniqueness.unlock_sidekiq_job!(entry.item) if super entry end end @@ -67,7 +67,7 @@ def clear end def delete_by_value(name, value) - ActiveJob::Uniqueness.unlock_sidekiq_job!(Sidekiq.load_json(value)) if super(name, value) + ActiveJob::Uniqueness.unlock_sidekiq_job!(Sidekiq.load_json(value)) if super end end end