From 03e81b797010680b354bf02907056215353b3ef1 Mon Sep 17 00:00:00 2001 From: Greg Date: Fri, 13 Jan 2017 15:19:58 -0800 Subject: [PATCH 1/3] adding support for rails 5 --- autobots.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autobots.gemspec b/autobots.gemspec index a10e485..5fa5757 100644 --- a/autobots.gemspec +++ b/autobots.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_dependency "bulk_cache_fetcher", '~> 0.0.3' - spec.add_dependency "activesupport", '~> 4.0' + spec.add_dependency "activesupport", '>= 4.0' spec.add_dependency "active_model_serializers", '~> 0.8.0' spec.add_development_dependency "bundler", "~> 1.6" From 13ccee5a1cb952add8bb1ad3ded09a7da82d15ee Mon Sep 17 00:00:00 2001 From: Greg Date: Mon, 16 Jan 2017 15:30:12 -0800 Subject: [PATCH 2/3] adding rails 5 to travis testing matrix --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 313594e..b34b301 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,3 +6,4 @@ env: matrix: - "RAILS_VERSION=4.0.0" - "RAILS_VERSION=4.1.0" + - "RAILS_VERSION=5.0.0" From 3de4ecf2f9cd5301da756ae09ae08dd5d299d8ab Mon Sep 17 00:00:00 2001 From: Greg Date: Fri, 20 Jan 2017 12:58:06 -0800 Subject: [PATCH 3/3] trying to get the test matrix to include rails 5, but only for ruby 2.3 --- .travis.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b34b301..e6d43c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,14 @@ language: ruby rvm: - 2.0.0 - 2.1.0 + - 2.3.0 env: - matrix: - - "RAILS_VERSION=4.0.0" - - "RAILS_VERSION=4.1.0" - - "RAILS_VERSION=5.0.0" + - RAILS_VERSION=4.0.0 + - RAILS_VERSION=4.1.0 + - RAILS_VERSION=5.0.0 +matrix: + exclude: + - rvm: 2.0.0 + env: RAILS_VERSION=5.0.0 + - rvm: 2.1.0 + env: RAILS_VERSION=5.0.0 \ No newline at end of file