Merge pull request #114 from contentful/dl/update-http-gem

Update dependency versions
contentful · Dec 22, 2016 · 9a2264a · 9a2264a
2 parents 9ad54f6 + ad6a96f
commit 9a2264a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Change Log
 
 ## Unreleased
+### Added
+* Update dependency versions
 
 ## 1.2.0
 ### Added

diff --git a/contentful.gemspec b/contentful.gemspec
@@ -15,11 +15,19 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^spec/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'http', '~> 1.0'
+  if RUBY_VERSION.start_with?('1.')
+    gem.add_dependency 'http', '> 0.8', '< 2'
+    gem.add_dependency 'json', '~> 1.0'
+    gem.add_development_dependency'term-ansicolor', '~> 1.3.0'
+    gem.add_development_dependency 'public_suffix', '< 1.5'
+  else
+    gem.add_dependency 'http', '> 0.8', '< 3.0'
+  end
+
   gem.add_dependency 'multi_json', '~> 1'
 
   gem.add_development_dependency 'bundler', '~> 1.5'
-  gem.add_development_dependency 'rake', '~> 10'
+  gem.add_development_dependency 'rake', '< 11.0'
   gem.add_development_dependency 'rubygems-tasks', '~> 0.2'
 
   gem.add_development_dependency 'guard'