From 225fd826434e3e8683e2db6361c0b997c082d4cb Mon Sep 17 00:00:00 2001 From: Laura Paakkinen Date: Mon, 19 Jun 2017 09:48:49 +0200 Subject: [PATCH 1/2] Update sidekiq dependency to allow sidekiq 5 --- .travis.yml | 1 + sidekiq_status.gemspec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index de5451b..83ae0ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ env: global: - SHOW_SIDEKIQ=true matrix: + - SIDEKIQ_VERSION="~>5.0.3" - SIDEKIQ_VERSION="~>4.2.0" - SIDEKIQ_VERSION="~>4.1.0" - SIDEKIQ_VERSION="~>4.0.2" diff --git a/sidekiq_status.gemspec b/sidekiq_status.gemspec index 225c852..6590368 100644 --- a/sidekiq_status.gemspec +++ b/sidekiq_status.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |gem| gem.require_paths = ["lib"] gem.version = SidekiqStatus::VERSION - gem.add_runtime_dependency("sidekiq", ">= 3.3", "< 5") + gem.add_runtime_dependency("sidekiq", ">= 3.3", "< 6") gem.add_development_dependency("activesupport") gem.add_development_dependency("rspec", '>= 3.4.0') From 14b2d72c22ec5ea0a4e0d65b0cab63b0b49c99ca Mon Sep 17 00:00:00 2001 From: Laura Paakkinen Date: Mon, 19 Jun 2017 14:53:58 +0200 Subject: [PATCH 2/2] Require activesupport for class_attribute --- lib/sidekiq_status/container.rb | 1 + sidekiq_status.gemspec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/sidekiq_status/container.rb b/lib/sidekiq_status/container.rb index 332923c..420009f 100644 --- a/lib/sidekiq_status/container.rb +++ b/lib/sidekiq_status/container.rb @@ -1,4 +1,5 @@ # -*- encoding : utf-8 -*- +require 'active_support/core_ext/class' # Sidekiq extension to track job execution statuses and returning job results back to the client in a convenient manner module SidekiqStatus diff --git a/sidekiq_status.gemspec b/sidekiq_status.gemspec index 6590368..90ec6c3 100644 --- a/sidekiq_status.gemspec +++ b/sidekiq_status.gemspec @@ -16,9 +16,9 @@ Gem::Specification.new do |gem| gem.require_paths = ["lib"] gem.version = SidekiqStatus::VERSION + gem.add_runtime_dependency("activesupport") gem.add_runtime_dependency("sidekiq", ">= 3.3", "< 6") - gem.add_development_dependency("activesupport") gem.add_development_dependency("rspec", '>= 3.4.0') gem.add_development_dependency("rspec-its") gem.add_development_dependency("simplecov")