Merge pull request sinatra#1577 from olleolleolle/patch-4

CI: Use jruby-9.2.9.0
bmizerany · Dec 30, 2019 · 64cf079 · 64cf079
2 parents 7c144ee + f01eff9
commit 64cf079
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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:

diff --git 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'