Merge pull request #374 from dentarg/ci/fixes

Fix CI failures

.travis.yml

@@ -2,27 +2,35 @@ bundler_args: --without development --retry=3 --jobs=3
 cache: bundler
 language: ruby
 rvm:
-  - jruby-9.1.17.0
-  - jruby-9.2.6.0
-  - truffleruby
+  - jruby-9.2.9.0
+  - truffleruby-19.3.0.2
   - ruby-head
   - ruby-head-clang
   - 2.0.0
   - 2.1.10
   - 2.2.10
   - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.2
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
   - 2.7.0
 matrix:
   include:
-    - gemfile: gemfiles/Gemfile.public_suffix_2
-      rvm: 2.5.5
+    - rvm: jruby-9.1.17.0
+      env: BUNDLER_VERSION=2.0.2
+    - rvm: 2.5.5
+      gemfile: gemfiles/Gemfile.public_suffix_2
   allow_failures:
     - rvm: ruby-head
     - rvm: ruby-head-clang
   fast_finish: true
 before_install:
   - sudo apt-get update
   - sudo apt-get install libidn11-dev
+  # https://docs.travis-ci.com/user/languages/ruby/#bundler-20
+  - if [ -n "${BUNDLER_VERSION+x}" ];
+    then
+      gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true;
+      gem uninstall --all --executables bundler || true;
+      gem install bundler -v ${BUNDLER_VERSION};
+    fi

Gemfile

@@ -27,6 +27,10 @@ group :test, :development do
   else
     gem 'rack', :require => false
   end
+
+  # Remove when truffleruby 19.3.1 is out, see
+  # https://github.com/oracle/truffleruby/issues/1857#issuecomment-567976167
+  gem 'json', '~> 2.2.0' if RUBY_ENGINE == 'truffleruby'
 end
 
 gem 'idn-ruby', :platform => [:mri_20, :mri_21, :mri_22, :mri_23, :mri_24]