Merge pull request #18 from why404/master

避免gems依赖包冲突,调整为x.y(不加.z)更为宽松的依赖策略
This commit is contained in:
xushiwei
2012-09-12 06:25:36 -07:00
3 changed files with 12 additions and 12 deletions
+6 -6
View File
@@ -1,11 +1,11 @@
PATH
remote: .
specs:
qiniu-rs (3.0.5)
json (~> 1.7.5)
qiniu-rs (3.0.6)
json (~> 1.7)
mime-types (~> 1.19)
rest-client (~> 1.6.7)
ruby-hmac (~> 0.4.0)
rest-client (~> 1.6)
ruby-hmac (~> 0.4)
GEM
remote: https://rubygems.org/
@@ -22,7 +22,7 @@ GEM
rspec-expectations (~> 2.11.0)
rspec-mocks (~> 2.11.0)
rspec-core (2.11.1)
rspec-expectations (2.11.2)
rspec-expectations (2.11.3)
diff-lcs (~> 1.1.3)
rspec-mocks (2.11.2)
ruby-hmac (0.4.0)
@@ -31,7 +31,7 @@ PLATFORMS
ruby
DEPENDENCIES
fakeweb (~> 1.3.0)
fakeweb (~> 1.3)
qiniu-rs!
rake (~> 0.9)
rspec (~> 2.11)
+1 -1
View File
@@ -2,6 +2,6 @@
module Qiniu
module RS
VERSION = "3.0.5"
VERSION = "3.0.6"
end
end
+5 -5
View File
@@ -19,10 +19,10 @@ Gem::Specification.new do |gem|
# specify any dependencies here; for example:
gem.add_development_dependency "rake", "~> 0.9"
gem.add_development_dependency "rspec", "~> 2.11"
gem.add_development_dependency "fakeweb", "~> 1.3.0"
gem.add_runtime_dependency "json", "~> 1.7.5"
gem.add_runtime_dependency "rest-client", "~> 1.6.7"
gem.add_development_dependency "fakeweb", "~> 1.3"
gem.add_runtime_dependency "json", "~> 1.7"
gem.add_runtime_dependency "rest-client", "~> 1.6"
gem.add_runtime_dependency "mime-types", "~> 1.19"
gem.add_runtime_dependency "ruby-hmac", "~> 0.4.0"
gem.add_runtime_dependency "jruby-openssl", "~> 0.7.7" if RUBY_PLATFORM == "java"
gem.add_runtime_dependency "ruby-hmac", "~> 0.4"
gem.add_runtime_dependency "jruby-openssl", "~> 0.7" if RUBY_PLATFORM == "java"
end