Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-15 01:17:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #972 from chef/chris-rock/json2

Browse source 
Allow JSON 2.x
This commit is contained in:
Christoph Hartmann 2016-08-24 11:36:40 +02:00 committed by GitHub
commit 53a545ed8f
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -8,6 +8,10 @@ if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('1.9.3')
gem 'net-ssh', '~> 2.9'
end
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.1.0')
gem 'json', '~> 1.8'
end
# TODO: ffi 1.9.11 is currently erroneous on windows tests
gem 'ffi', '= 1.9.10'

2
inspec.gemspec
View file

@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'train', '>=0.16.0', '<1.0'
spec.add_dependency 'thor', '~> 0.19'
spec.add_dependency 'json', '~> 1.8'
spec.add_dependency 'json', '>= 1.8', '< 3.0'
spec.add_dependency 'rainbow', '~> 2'
spec.add_dependency 'method_source', '~> 0.8'
spec.add_dependency 'rubyzip', '~> 1.1'