Skip to content

Commit f0cd8ee

Browse files
Merge pull request #262 from puppetlabs/dependabot/bundler/rake-tw-13.0
Update rake requirement from ~> 10.0 to ~> 13.0
2 parents 4b31229 + 695de6d commit f0cd8ee

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

Gemfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,19 @@ group :tests do
1818
# these require special dependencies to have everything load properly
1919

2020
# `codecov` 0.1.17 introduced usage of %i[] which is not recognised by JRuby 1.7
21-
if RUBY_PLATFORM == 'java' && Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.3.0')
21+
if RUBY_PLATFORM == 'java' && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')
2222
gem 'codecov', '= 0.1.16'
2323
else
2424
gem 'codecov'
2525
end
2626

2727
# `rake` dropped support for older versions of ruby a while back
28-
if RUBY_PLATFORM == 'java'
29-
gem 'rake', '~> 10.0'
28+
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.1.0')
29+
gem 'rake', '11.3.0'
30+
elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.0')
31+
gem 'rake', '12.3.3'
3032
else
31-
gem 'rake', '~> 12.3'
33+
gem 'rake', '~> 13.0'
3234
end
3335

3436
# rubocop is special, as usual
@@ -48,9 +50,9 @@ group :tests do
4850
end
4951

5052
# JRuby 1.7 does not like json 2.3.0, jruby 9.1.9.0 has RUBY_VERSION == '2.3.3'
51-
gem 'json', '2.2.0' if RUBY_PLATFORM == 'java' && Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.3.0')
53+
gem 'json', '2.2.0' if RUBY_PLATFORM == 'java' && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')
5254
# the last version of parallel to support ruby 2.1
53-
gem 'parallel', '1.13.0' if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.2.0')
55+
gem 'parallel', '1.13.0' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.0')
5456

5557
# license_finder does not install on windows using older versions of rubygems.
5658
# ruby 2.4 is confirmed working on appveyor and we only need to run it on the newest gemset anyways

0 commit comments

Comments
 (0)