Fixing gemspec conflicts with 1.9
This commit is contained in:
parent
5cb43829c0
commit
ccf768cec8
2
Gemfile
2
Gemfile
|
@ -4,7 +4,7 @@ group :development, :test do
|
||||||
# This is here because gemspec doesn't support require: false
|
# This is here because gemspec doesn't support require: false
|
||||||
gem "netrc", :require => false
|
gem "netrc", :require => false
|
||||||
gem "octokit", :require => false
|
gem "octokit", :require => false
|
||||||
gem 'rspec', :require => false
|
gem "rspec", :require => false
|
||||||
end
|
end
|
||||||
|
|
||||||
gemspec
|
gemspec
|
||||||
|
|
|
@ -44,10 +44,12 @@ Gem::Specification.new do |s|
|
||||||
s.rdoc_options = ["--charset=UTF-8"]
|
s.rdoc_options = ["--charset=UTF-8"]
|
||||||
s.extra_rdoc_files = %w[README.md]
|
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-json")
|
||||||
s.add_dependency("fog-xml", "~> 0.1.1")
|
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")
|
s.add_dependency("ipaddress", "~> 0.5")
|
||||||
|
|
||||||
# Modular providers (please keep sorted)
|
# Modular providers (please keep sorted)
|
||||||
|
|
Loading…
Reference in New Issue