Bump bundler and friends

.github/workflows/lint.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
-          bundler: 2.2.24
+          bundler: 2.3.4
           bundler-cache: true
       - run: bin/bundle --jobs=$(nproc) --retry=$(nproc)
       - run: bin/rubocop -P
@@ -29,7 +29,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
-          bundler: 2.2.24
+          bundler: 2.3.4
           bundler-cache: true
       - run: bin/bundle --jobs=$(nproc) --retry=$(nproc)
       - run: bin/reek .

.github/workflows/rspec.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
-          bundler: 2.2.24
+          bundler: 2.3.4
           bundler-cache: true
 
       - name: Install Code Climate reporter
@@ -49,14 +49,14 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ruby: [2.5, 2.6, 2.7, 3.0]
+        ruby: [2.5, 2.6, 2.7, 3.0, 3.1]
 
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler: 2.2.24
+          bundler: 2.3.4
           bundler-cache: true
       - run: bin/appraisal install --jobs=$(nproc) --retry=$(nproc)
       - run: bin/appraisal rspec --require spec_helper --tag ~perf

Gemfile

@@ -8,7 +8,6 @@ gemspec
 LOCAL_GEMS = "Gemfile.local"
 
 gem "appraisal"
-gem "bundler"
 gem "gem-release"
 gem "github-markup"
 gem "rack-test"

gemfiles/sidekiq_5.0.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "bundler"
 gem "gem-release"
 gem "github-markup"
 gem "rack-test"

gemfiles/sidekiq_5.1.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "bundler"
 gem "gem-release"
 gem "github-markup"
 gem "rack-test"

gemfiles/sidekiq_5.2.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "bundler"
 gem "gem-release"
 gem "github-markup"
 gem "rack-test"

gemfiles/sidekiq_6.0.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "bundler"
 gem "gem-release"
 gem "github-markup"
 gem "rack-test"

gemfiles/sidekiq_6.1.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "bundler"
 gem "gem-release"
 gem "github-markup"
 gem "rack-test"

gemfiles/sidekiq_6.2.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "bundler"
 gem "gem-release"
 gem "github-markup"
 gem "rack-test"

gemfiles/sidekiq_develop.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "bundler"
 gem "gem-release"
 gem "github-markup"
 gem "rack-test"

spec/sidekiq_unique_jobs/middleware/client_spec.rb

@@ -81,7 +81,7 @@
     expect(queue_count("customqueue")).to eq(1)
   end
 
-  it "does not queue duplicates when when calling delay" do
+  it "does not queue duplicates when when calling delay", sidekiq_ver: "< 7.0" do
     Array.new(10) { PlainClass.delay(lock: :until_executed, queue: "customqueue").run(1) }
 
     expect(queue_count("customqueue")).to eq(1)

spec/sidekiq_unique_jobs/sidekiq_worker_methods_spec.rb

@@ -40,7 +40,7 @@ def initialize(worker_class)
       it { is_expected.to eq(UntilExecutedJob) }
     end
 
-    context "when NameError is caught" do
+    context "when NameError is caught", ruby_ver: "< 3.0" do
       let(:worker_class)  { "UnknownConstant" }
       let(:error_message) { "this class does not exist" }
 

spec/support/sidekiq_meta.rb

@@ -25,8 +25,10 @@ def sidekiq_redis_driver
     Sidekiq.redis = redis
     flush_redis
 
-    enable_delay = defined?(Sidekiq::Extensions) && Sidekiq::Extensions.respond_to?(:enable_delay!)
-    Sidekiq::Extensions.enable_delay! if enable_delay
+    if SidekiqUniqueJobs::VersionCheck.satisfied?(Sidekiq::VERSION, "< 7.0.0")
+      enable_delay = defined?(Sidekiq::Extensions) && Sidekiq::Extensions.respond_to?(:enable_delay!)
+      Sidekiq::Extensions.enable_delay! if enable_delay
+    end
 
     if (sidekiq = example.metadata.fetch(:sidekiq, :disable))
       sidekiq = :fake if sidekiq == true