diff --git a/Gemfile b/Gemfile index b92d7b4..3bda8ed 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ gem "faraday", "~> 0.5.7" gem "excon", "~> 0.5.6" gem "yajl-ruby", "~> 0.8.1", :require => "yajl" -gem "activesupport", "~> 3.0.4" +gem "activesupport", "~> 3.1.12" gem "i18n", "~> 0.5.0" # ActiveSupport dependency group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 12f340c..838ee8f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,8 @@ GEM remote: http://rubygems.org/ specs: - activesupport (3.0.4) + activesupport (3.1.12) + multi_json (~> 1.0) addressable (2.2.4) diff-lcs (1.1.2) excon (0.5.6) @@ -10,6 +11,7 @@ GEM multipart-post (~> 1.1.0) rack (>= 1.1.0, < 2) i18n (0.5.0) + multi_json (1.14.1) multipart-post (1.1.0) rack (1.2.1) rake (0.8.7) @@ -27,7 +29,7 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 3.0.4) + activesupport (~> 3.1.12) bundler (~> 1.0.0) excon (~> 0.5.6) faraday (~> 0.5.7) diff --git a/pingdom-client.gemspec b/pingdom-client.gemspec index fd391e4..8d93690 100644 --- a/pingdom-client.gemspec +++ b/pingdom-client.gemspec @@ -47,7 +47,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency("faraday", ["~> 0.5.7"]) s.add_runtime_dependency("excon", ["~> 0.5.6"]) s.add_runtime_dependency("yajl-ruby", ["~> 0.8.1"]) - s.add_runtime_dependency("activesupport", ["~> 3.0.4"]) + s.add_runtime_dependency("activesupport", ">= 3.0.4", "< 6.1.0") s.add_runtime_dependency("i18n", ["~> 0.5.0"]) s.add_development_dependency("bundler", ["~> 1.0.0"]) @@ -57,7 +57,7 @@ Gem::Specification.new do |s| s.add_dependency("faraday", ["~> 0.5.7"]) s.add_dependency("excon", ["~> 0.5.6"]) s.add_dependency("yajl-ruby", ["~> 0.8.1"]) - s.add_dependency("activesupport", ["~> 3.0.4"]) + s.add_dependency("activesupport", ">= 3.0.4", "< 6.1.0") s.add_dependency("i18n", ["~> 0.5.0"]) s.add_dependency("bundler", ["~> 1.0.0"]) @@ -68,7 +68,7 @@ Gem::Specification.new do |s| s.add_dependency("faraday", ["~> 0.5.7"]) s.add_dependency("excon", ["~> 0.5.6"]) s.add_dependency("yajl-ruby", ["~> 0.8.1"]) - s.add_dependency("activesupport", ["~> 3.0.4"]) + s.add_dependency("activesupport", ">= 3.0.4", "< 6.1.0") s.add_dependency("i18n", ["~> 0.5.0"]) s.add_dependency("bundler", ["~> 1.0.0"])