Skip to content

Commit

Permalink
Merge pull request #49 from HAIL9000/maint/master/move_hocon_gem
Browse files Browse the repository at this point in the history
(maint) Move the hocon gem to development
  • Loading branch information
hunner committed Nov 11, 2016
2 parents eb4a7dd + d79c82f commit fa5c6e3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ spec/spec_helper.rb:
allow_deprecations: true
Gemfile:
optional:
':default':
':development':
- gem: hocon
version: '~> 1.1'
5 changes: 1 addition & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ group :development do
gem 'rubocop-rspec', '~> 1.6', :require => false if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3.0')
gem 'pry', :require => false
gem 'json_pure', '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
gem 'hocon', '~> 1.1', :require => false
end

group :system_tests do
Expand All @@ -61,10 +62,6 @@ group :system_tests do
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
end

group :default do
gem 'hocon', '~> 1.1', :require => false
end

gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])

# Only explicitly specify Facter/Hiera if a version has been specified.
Expand Down

0 comments on commit fa5c6e3

Please sign in to comment.