Merge pull request travis-ci#474 from travis-ci/feature-2.2-support

Fix `json/pure` loading issue and Ruby 2.2 job
mattk42 · Jul 5, 2016 · f1d2552 · f1d2552
2 parents 362c2a7 + 8840611
commit f1d2552
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -39,7 +39,7 @@ end
 
 group :lambda do
   gem 'aws-sdk', '>= 2.0.18.pre'
-  gem 'rubyzip'
+  gem 'rubyzip', '~> 1.1'
 end
 
 group :cloud_files do
@@ -57,7 +57,7 @@ group :gcs do
 end
 
 group :elastic_beanstalk do
-  gem 'rubyzip'
+  gem 'rubyzip', '~> 1.1'
   gem 'aws-sdk-v1'
 end
 

diff --git a/dpl.gemspec b/dpl.gemspec
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'json', '1.8.1'
+  s.add_development_dependency 'json_pure'
   s.add_development_dependency 'coveralls'
 
 

diff --git a/lib/dpl/provider.rb b/lib/dpl/provider.rb
@@ -1,6 +1,7 @@
 require 'dpl/error'
 require 'dpl/version'
 require 'fileutils'
+require 'json/pure'
 
 module DPL
   class Provider