Merge pull request #1496 from nadavshatz/add-jruby-to-ci

Run all branches against JRuby on CI

.travis.yml

@@ -9,6 +9,14 @@ rvm:
   - 2.3.0
   - ruby-head
   - rbx-2
+  - jruby-9.0.4.0
+  - jruby-head
+
+jdk:
+  - oraclejdk8
+
+before_install:
+  - '[ "$JRUBY_OPTS" != "" ] && export JRUBY_OPTS="--dev -Xcli.debug=true --debug"'
 
 install: bundle install --path=vendor/bundle --retry=3 --jobs=3
 cache:
@@ -30,10 +38,16 @@ matrix:
     env: RAILS_VERSION=master
   - rvm: 2.1
     env: RAILS_VERSION=master
-  include:
   - rvm: jruby-9.0.4.0
-    env: JRUBY_OPTS='-Xcompat.version=2.0 --server -Xcompile.invokedynamic=false -Xcli.debug=true --debug'
+    env: RAILS_VERSION=master
+  - rvm: jruby-9.0.4.0
+    env: RAILS_VERSION=4.0
+  - rvm: jruby-head
+    env: RAILS_VERSION=master
+  - rvm: jruby-head
+    env: RAILS_VERSION=4.0
   allow_failures:
     - rvm: ruby-head
+    - rvm: jruby-head
     - rvm: rbx-2
   fast_finish: true

CHANGELOG.md

@@ -31,6 +31,7 @@ Fixes:
 - [#1488](https://github.com/rails-api/active_model_serializers/pull/1488) Require ActiveSupport's string inflections (@nate00)
 
 Misc:
+- [#1496](https://github.com/rails-api/active_model_serializers/pull/1496) Run all branches against JRuby on CI (@nadavshatz)
 - [#1559](https://github.com/rails-api/active_model_serializers/pull/1559) Add a deprecation DSL. (@bf4 @groyoh)
 - [#1543](https://github.com/rails-api/active_model_serializers/pull/1543) Add the changes missing from #1535. (@groyoh)
 - [#1535](https://github.com/rails-api/active_model_serializers/pull/1535) Move the adapter and adapter folder to