Merge branch 'update-travis'

This commit is contained in:
Akinori MUSHA 2016-03-17 21:46:15 +09:00
commit 1c4a7bbe4b
2 changed files with 12 additions and 9 deletions

View file

@ -1,18 +1,21 @@
sudo: false
language: ruby language: ruby
cache: bundler
rvm: rvm:
- 1.8.7 - 1.8.7
- ree - ree
- 1.9.3 - 1.9.3
- 2.0.0 - 2.0.0
- 2.1
- 2.2
- 2.3.0
- ruby-head - ruby-head
- jruby-18mode - jruby-1.7
- jruby-19mode - jruby-9
- jruby-head - rbx-2
- rbx-18mode
- rbx-19mode
matrix: matrix:
allow_failures: allow_failures:
- rvm: ruby-head - rvm: ruby-head
- rvm: jruby-18mode - rvm: rbx-2
- rvm: rbx-18mode before_install:
- rvm: rbx-19mode - gem update bundler

View file

@ -27,7 +27,7 @@ Gem::Specification.new do |gem|
gem.add_runtime_dependency("domain_name", ["~> 0.5"]) gem.add_runtime_dependency("domain_name", ["~> 0.5"])
gem.add_development_dependency("sqlite3", ["~> 1.3.3"]) unless defined?(JRUBY_VERSION) gem.add_development_dependency("sqlite3", ["~> 1.3.3"]) unless defined?(JRUBY_VERSION)
gem.add_development_dependency("bundler", [">= 1.2.0"]) gem.add_development_dependency("bundler", [">= 1.2.0"])
gem.add_development_dependency("test-unit", [">= 2.4.3"]) gem.add_development_dependency("test-unit", [">= 2.4.3", *("< 3" if RUBY_VERSION < "1.9")])
gem.add_development_dependency("rake", [">= 0.9.2.2", *("< 11" if RUBY_VERSION < "1.9")]) gem.add_development_dependency("rake", [">= 0.9.2.2", *("< 11" if RUBY_VERSION < "1.9")])
gem.add_development_dependency("rdoc", ["> 2.4.2"]) gem.add_development_dependency("rdoc", ["> 2.4.2"])
gem.add_development_dependency("simplecov", [">= 0"]) gem.add_development_dependency("simplecov", [">= 0"])