Merge pull request #22 from sul-dlss/travis

Update travis build matrix
sul-dlss · Aug 15, 2016 · 58a5455 · 58a5455
2 parents d636c44 + b3b1e8f
commit 58a5455
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,9 @@
 language: ruby
 script: rake rspec
 rvm:
-  - 2.2.0
-  - 2.1.1
-  - 2.0.0
-  - 1.9.3
-  - ruby-head
-  - jruby-1.7.9-d19 # fails after 1.7.10 for some reason
-#  - jruby-19mode # JRuby in 1.9 mode
-#  - jruby-head
+  - 2.3.1
+  - 2.2.5
+  - 2.1.2
 notifications:
   email:
     - ndushay@stanford.edu

diff --git a/Gemfile b/Gemfile
@@ -5,4 +5,7 @@ gemspec
 
 group :test do
   gem 'coveralls', require: false
-end
+end
+
+# Pin to activesupport 4.x for older versions of ruby
+gem 'activesupport', '~> 4.2' if RUBY_VERSION < '2.2.2'