From fe2b2bca0754817c6decbfb33df081c57e9cfd7a Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Wed, 4 Jan 2017 15:57:41 -0600
Subject: [PATCH] Update build matrix

Dropped Rails 4.2 because it doesn't work with Ruby 2.4 due to:
https://github.com/flori/json/issues/311
---
 .travis.yml             | 8 +++-----
 Gemfile                 | 3 +++
 gemfiles/gemfile.rails4 | 5 -----
 3 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 gemfiles/gemfile.rails4

diff --git a/.travis.yml b/.travis.yml
index 5e74334..72d9082 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,6 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2.1
-gemfile:
-  - gemfiles/gemfile.rails4
+  - 2.4.0
+  - 2.3.3
+  - 2.2.6
diff --git a/Gemfile b/Gemfile
index 33140b0..c48ddc5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,9 @@ source "https://rubygems.org"
 
 gemspec
 
+gem 'activesupport', ENV.fetch('AS_VERSION', '5.0.1')
+
+
 group :development, :test do
   gem 'simplecov', :platform => :mri_19
   gem 'simplecov-rcov', :platform => :mri_19
diff --git a/gemfiles/gemfile.rails4 b/gemfiles/gemfile.rails4
deleted file mode 100644
index c607b2f..0000000
--- a/gemfiles/gemfile.rails4
+++ /dev/null
@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../"
-
-gem 'activesupport', '4.2.4'