From d29c1174540b24467f9ef334b0d56c40d5fb26a6 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Wed, 8 Feb 2017 19:52:53 +0100
Subject: [PATCH] Travis: new JRuby, develop on 2.4.0 (#476)

* Travis: new JRuby, develop on 2.4.0
* CircleCI: ensure new rubygems
* Rubocop: RegexpMatch too edgy; long blocks OK in specs
* Travis: JRuby head fails bundle install
* Travis: Allow failures for jruby-head
---
 .rubocop.yml  | 9 ++++++++-
 .ruby-version | 2 +-
 .travis.yml   | 5 ++++-
 circle.yml    | 3 +++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index aca7f42..77ccddb 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -10,6 +10,9 @@ AllCops:
 Metrics/LineLength:
   Enabled: false
 
+Performance/RegexpMatch:
+  Enabled: false
+
 #http://viget.com/extend/just-use-double-quoted-ruby-strings
 Style/StringLiterals:
   EnforcedStyle: double_quotes
@@ -66,4 +69,8 @@ Style/NumericPredicate:
   Enabled: false
 
 Style/SafeNavigation:
-  Enabled: false
\ No newline at end of file
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
diff --git a/.ruby-version b/.ruby-version
index a625450..9183195 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.3.1
\ No newline at end of file
+2.4.0
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 9580a47..ba33eeb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ matrix:
     - rvm: 2.1
     - rvm: 2.3.3
     - rvm: 2.4.0
-    - rvm: jruby-9.1.6.0
+    - rvm: jruby-9.1.7.0
       jdk: oraclejdk8
       env:
         - JRUBY_OPTS=--debug
@@ -24,6 +24,9 @@ matrix:
       jdk: oraclejdk8
       env:
         - JRUBY_OPTS=--debug
+        - DEBUG=1
+  allow_failures:
+    - rvm: jruby-head
 
 addons:
   code_climate:
diff --git a/circle.yml b/circle.yml
index 88aef1c..9d17065 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,3 +1,6 @@
+dependencies:
+  pre:
+    - gem update --system
 notify:
   webhooks:
     # A list of hook hashes, containing the url field