Merge branch 'master' into update-changelog

Author: sanfrancrisko

Gemfile

@@ -18,17 +18,19 @@ group :tests do
   # these require special dependencies to have everything load properly
 
   # `codecov` 0.1.17 introduced usage of %i[] which is not recognised by JRuby 1.7
-  if RUBY_PLATFORM == 'java' && Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.3.0')
+  if RUBY_PLATFORM == 'java' && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')
     gem 'codecov', '= 0.1.16'
   else
     gem 'codecov'
   end
 
   # `rake` dropped support for older versions of ruby a while back
-  if RUBY_PLATFORM == 'java'
-    gem 'rake', '~> 10.0'
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.1.0')
+    gem 'rake', '11.3.0'
+  elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.0')
+    gem 'rake', '12.3.3'
   else
-    gem 'rake', '~> 12.3'
+    gem 'rake', '~> 13.0'
   end
 
   # rubocop is special, as usual
@@ -48,9 +50,9 @@ group :tests do
   end
 
   # JRuby 1.7 does not like json 2.3.0, jruby 9.1.9.0 has RUBY_VERSION == '2.3.3'
-  gem 'json', '2.2.0' if RUBY_PLATFORM == 'java' && Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.3.0')
+  gem 'json', '2.2.0' if RUBY_PLATFORM == 'java' && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')
   # the last version of parallel to support ruby 2.1
-  gem 'parallel', '1.13.0' if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.2.0')
+  gem 'parallel', '1.13.0' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.0')
 
   # license_finder does not install on windows using older versions of rubygems.
   # ruby 2.4 is confirmed working on appveyor and we only need to run it on the newest gemset anyways