Merge branch 'merge-14'

knu · Feb 3, 2016 · 5e8fc41 · 5e8fc41
2 parents f65a42a + 7357985
commit 5e8fc41
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,13 @@
 language: ruby
+sudo: false
 rvm:
   - 1.8.7
   - ree
   - 1.9.3
-  - 2.0.0
-  - 2.1.6
-  - 2.2.2
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3.0
   - ruby-head
   - rbx-18mode
   - rbx-19mode
@@ -14,5 +16,7 @@ matrix:
     - rvm: ruby-head
     - rvm: rbx-18mode
     - rvm: rbx-19mode
+before_install:
+  - gem install bundler
 before_script:
   - rake compile
diff --git a/unf_ext.gemspec b/unf_ext.gemspec
@@ -29,10 +29,12 @@ Gem::Specification.new do |gem|
     # Cap dependency on activesupport with < 4.0 on behalf of
     # shoulda-matchers to satisfy bundler.
     gem.add_development_dependency("activesupport", ["< 4.0"])
+    gem.add_development_dependency("test-unit", ["= 3.1.5"])
+  else
+    gem.add_development_dependency("test-unit")
   end
   gem.add_development_dependency("rake", [">= 0.9.2.2"])
   gem.add_development_dependency("rdoc", ["> 2.4.2"])
   gem.add_development_dependency("bundler", [">= 1.2"])
   gem.add_development_dependency("rake-compiler", [">= 0.7.9"])
-  gem.add_development_dependency 'test-unit'
 end