Skip to content

Commit eeb69a1

Browse files
authored
Merge pull request #173 from da-ar/master_latest
(maint) Fixup Gemfile for JRuby 1.7 installs
2 parents 7180586 + 580c96e commit eeb69a1

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ matrix:
2020
cache:
2121
bundler: true
2222
directories: ~/.rvm
23-
before_install: rvm use jruby-1.7.26 --install --binary --fuzzy
23+
before_install: rvm use jruby-1.7.26 --install --binary --fuzzy && gem install bundler -v '~> 1.7.0'
2424
# disable coverage on jruby9k as this confuses codecov
2525
- env: RVM="jruby-9.1.9.0" PUPPET_GEM_VERSION='~> 5' JRUBY_OPTS="--debug"
2626
before_cache: pushd ~/.rvm && rm -rf archives rubies/ruby-2.2.7 rubies/ruby-2.3.4 && popd

Gemfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@ gemspec
77

88
group :tests do
99
gem 'codecov'
10-
# license_finder does not install on windows using older versions of rubygems.
11-
# ruby 2.4 is confirmed working on appveyor.
12-
gem 'license_finder' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
1310
gem 'rake', '~> 10.0'
1411
gem 'rspec', '~> 3.0'
1512
# rubocop 0.58 throws when testing against ruby 2.1, so pin to the latest,
1613
# unless we're dealing with jruby...
1714
if RUBY_PLATFORM == 'java'
1815
# load any rubocop version that works on java for the Rakefile
16+
gem 'parser', '2.3.3.1'
1917
gem 'rubocop', '0.41.2'
2018
elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.0')
2119
gem 'rubocop', '0.57.2'
@@ -27,6 +25,9 @@ group :tests do
2725
# This needs to be removed once we drop puppet4 support.
2826
gem 'rubocop', '~> 0.57.0'
2927
gem 'rubocop-rspec'
28+
# license_finder does not install on windows using older versions of rubygems.
29+
# ruby 2.4 is confirmed working on appveyor.
30+
gem 'license_finder' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
3031
end
3132
gem 'simplecov-console'
3233
# the test gems required for module testing

0 commit comments

Comments
 (0)