From 131a5fec5e8b1e0eabc84648973fcc454ee6b1dc Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Wed, 6 Nov 2019 22:33:49 +0100
Subject: [PATCH 1/2] CI: Use jruby-9.2.9.0

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b55c3552..e032c091 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ rvm:
   - 2.6.5
   - ruby-head
   - rbx-3
-  - jruby-9.2.8.0
+  - jruby-9.2.9.0
   - jruby-head
 
 script: ./.travis.sh
@@ -35,7 +35,7 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: jruby-9.2.8.0
+    - rvm: jruby-9.2.9.0
     - rvm: rbx-3
 
 notifications:

From f01eff9bfc9aac628d4afd1e3e3c3c47087b0062 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Wed, 6 Nov 2019 22:49:56 +0100
Subject: [PATCH 2/2] Gemfile: allow JRuby to install activesupport

---
 Gemfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 7bee5fab..df2f5935 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,6 +26,10 @@ if RUBY_ENGINE == 'jruby'
   gem 'trinidad'
 end
 
+if RUBY_ENGINE == 'jruby' || RUBY_ENGINE == 'ruby'
+  gem "activesupport", "~> 5.1.6"
+end
+
 if RUBY_ENGINE == "ruby"
   gem 'less', '~> 2.0'
   gem 'therubyracer'
@@ -34,7 +38,6 @@ if RUBY_ENGINE == "ruby"
   gem 'bluecloth'
   gem 'rdiscount'
   gem 'RedCloth'
-  gem "activesupport", "~> 5.1.6"
   gem 'puma'
   gem 'yajl-ruby'
   gem 'nokogiri'