kotovalexarian-likes-github
/
fog--fog
mirror of https://github.com/fog/fog.git
1
0
Fork 0
Code Releases Activity

Fixing gemspec conflicts with 1.9

This commit is contained in:
Artem Yakimenko 2016-10-14 10:01:38 +11:00 committed by Artem Yakimenko
parent 5cb43829c0
commit ccf768cec8
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -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

6
fog.gemspec
View File

@ -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)