From f4bc73cca3313e43f24a94ce9635f48b4268cd33 Mon Sep 17 00:00:00 2001 From: Thorsten Ball Date: Thu, 15 May 2014 14:48:57 +0200 Subject: [PATCH] Loosen dependency on sidekiq, support sidekiq 3 --- delayed_paperclip.gemspec | 2 +- gemfiles/rails3_1.gemfile.lock | 2 +- gemfiles/rails3_2.gemfile.lock | 2 +- gemfiles/rails4.gemfile.lock | 2 +- spec/integration/sidekiq_spec.rb | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/delayed_paperclip.gemspec b/delayed_paperclip.gemspec index 6706764..a212493 100644 --- a/delayed_paperclip.gemspec +++ b/delayed_paperclip.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'delayed_job' s.add_development_dependency 'delayed_job_active_record' s.add_development_dependency 'resque' - s.add_development_dependency 'sidekiq', '< 3.0' + s.add_development_dependency 'sidekiq' s.add_development_dependency 'appraisal' s.add_development_dependency 'rake' s.add_development_dependency 'bundler' diff --git a/gemfiles/rails3_1.gemfile.lock b/gemfiles/rails3_1.gemfile.lock index 9251358..f99acf7 100644 --- a/gemfiles/rails3_1.gemfile.lock +++ b/gemfiles/rails3_1.gemfile.lock @@ -159,5 +159,5 @@ DEPENDENCIES rake resque rspec - sidekiq (< 3.0) + sidekiq sqlite3 diff --git a/gemfiles/rails3_2.gemfile.lock b/gemfiles/rails3_2.gemfile.lock index db1f2ba..349c9e7 100644 --- a/gemfiles/rails3_2.gemfile.lock +++ b/gemfiles/rails3_2.gemfile.lock @@ -157,5 +157,5 @@ DEPENDENCIES rake resque rspec - sidekiq (< 3.0) + sidekiq sqlite3 diff --git a/gemfiles/rails4.gemfile.lock b/gemfiles/rails4.gemfile.lock index 1b8acff..23f2047 100644 --- a/gemfiles/rails4.gemfile.lock +++ b/gemfiles/rails4.gemfile.lock @@ -153,5 +153,5 @@ DEPENDENCIES rake resque rspec - sidekiq (< 3.0) + sidekiq sqlite3 diff --git a/spec/integration/sidekiq_spec.rb b/spec/integration/sidekiq_spec.rb index ef151c2..da8c743 100644 --- a/spec/integration/sidekiq_spec.rb +++ b/spec/integration/sidekiq_spec.rb @@ -1,5 +1,5 @@ require 'spec_helper' -require 'sidekiq' +require 'sidekiq/api' describe "Sidekiq" do @@ -45,4 +45,4 @@ def jobs_count Sidekiq::Queue.new(:paperclip).size end -end \ No newline at end of file +end