Skip to content

Commit

Permalink
Merge branch 'json-dependency'
Browse files Browse the repository at this point in the history
  • Loading branch information
bobapple committed Jan 4, 2017
2 parents 080cde9 + 921fd40 commit 69bdc45
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
source 'https://rubygems.org'
puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION'].to_s}" : ">= 3.8"
jsonversion = ENV['TRAVIS_RUBY_VERSION'].to_i <= 2 ? "1.8.3" : "~> 2.0"
gem 'puppet', puppetversion

gem 'puppet', ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'].to_s : '>= 3.8'

gem 'puppetlabs_spec_helper', '>= 0.1.0'
gem 'puppet-lint', '>= 0.3.2'
gem 'facter', '>= 1.7.0'
gem 'facterdb', :git => 'https://github.com/jfryman/facterdb', :ref => 'sles-12-support'
gem 'rspec-puppet-facts', '>= 1.6.0'
gem 'json', jsonversion
gem 'json_pure', jsonversion
gem 'metadata-json-lint'

gem 'parallel_tests', RUBY_VERSION < '2.0.0' ? '~> 2.9.0' : '>= 2.10.0'

# json > 2.0.1 is not compatible with Ruby 1.9
if RUBY_VERSION < '2.0.0'
gem 'json', '< 2'
gem 'json_pure', '< 2'
end

0 comments on commit 69bdc45

Please sign in to comment.