From ccf768cec851a6d76238116d2c26f53241d1e0ad Mon Sep 17 00:00:00 2001 From: Artem Yakimenko Date: Fri, 14 Oct 2016 10:01:38 +1100 Subject: [PATCH] Fixing gemspec conflicts with 1.9 --- Gemfile | 2 +- fog.gemspec | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index db20c6fc1..65fec0a45 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ group :development, :test do # This is here because gemspec doesn't support require: false gem "netrc", :require => false gem "octokit", :require => false - gem 'rspec', :require => false + gem "rspec", :require => false end gemspec diff --git a/fog.gemspec b/fog.gemspec index 2c97d30d9..81cef1a11 100644 --- a/fog.gemspec +++ b/fog.gemspec @@ -44,10 +44,12 @@ Gem::Specification.new do |s| s.rdoc_options = ["--charset=UTF-8"] s.extra_rdoc_files = %w[README.md] - s.add_dependency("fog-core", "~> 1.42") + s.add_dependency("fog-core", "~> 1.43") s.add_dependency("fog-json") s.add_dependency("fog-xml", "~> 0.1.1") - + + # JSON locked for Ruby 1.9, remove once deprecated + s.add_dependency("json", ">= 1.8", "< 2.0") s.add_dependency("ipaddress", "~> 0.5") # Modular providers (please keep sorted)