From 2fa786ad9998b7f12cee5adb8dc7630501daf872 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Thu, 17 Mar 2016 19:22:49 +0900 Subject: [PATCH 1/4] Update the list of rubies --- .travis.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d7dd21..0bb6dda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,15 +4,14 @@ rvm: - ree - 1.9.3 - 2.0.0 + - 2.1 + - 2.2 + - 2.3.0 - ruby-head - - jruby-18mode - - jruby-19mode - - jruby-head - - rbx-18mode - - rbx-19mode + - jruby-1.7 + - jruby-9 + - rbx-2 matrix: allow_failures: - rvm: ruby-head - - rvm: jruby-18mode - - rvm: rbx-18mode - - rvm: rbx-19mode + - rvm: rbx-2 From 4a4de1dac4f66c1e85b8af0714842dfdce85f3cf Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Thu, 17 Mar 2016 19:25:40 +0900 Subject: [PATCH 2/4] Cache bundler --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0bb6dda..f550be0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ +sudo: false language: ruby +cache: bundler rvm: - 1.8.7 - ree From 43e88a5a320975f6d0427627db76e945ee7b8839 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Thu, 17 Mar 2016 19:33:53 +0900 Subject: [PATCH 3/4] Update bundler before install --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index f550be0..b778b6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,3 +17,5 @@ matrix: allow_failures: - rvm: ruby-head - rvm: rbx-2 +before_install: + - gem update bundler From 7395ec4b44862369f9cf8b901acd606a6098514c Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Thu, 17 Mar 2016 20:01:23 +0900 Subject: [PATCH 4/4] Use test-unit 2.x for Ruby 1.8 --- http-cookie.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http-cookie.gemspec b/http-cookie.gemspec index b655d86..02cdfd0 100644 --- a/http-cookie.gemspec +++ b/http-cookie.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |gem| gem.add_runtime_dependency("domain_name", ["~> 0.5"]) gem.add_development_dependency("sqlite3", ["~> 1.3.3"]) unless defined?(JRUBY_VERSION) 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("rdoc", ["> 2.4.2"]) gem.add_development_dependency("simplecov", [">= 0"])