Merge pull request #177 from betesh/support-rails5.1

Add rails 5.1 and 5.2 to travis
heartcombo · Mar 24, 2017 · 153f2c6 · 153f2c6
2 parents 4956c57 + 8816315
commit 153f2c6
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,10 +9,24 @@ rvm:
   - 2.3.0
 gemfile:
   - Gemfile
+  - gemfiles/Gemfile-rails.5.2.x
+  - gemfiles/Gemfile-rails.5.1.x
   - gemfiles/Gemfile-rails.5.0.x
   - gemfiles/Gemfile-rails.4.2.x
 matrix:
   exclude:
+  - rvm: 1.9.3
+    gemfile: gemfiles/Gemfile-rails.5.2.x
+  - rvm: 2.0.0
+    gemfile: gemfiles/Gemfile-rails.5.2.x
+  - rvm: 2.1.5
+    gemfile: gemfiles/Gemfile-rails.5.2.x
+  - rvm: 1.9.3
+    gemfile: gemfiles/Gemfile-rails.5.1.x
+  - rvm: 2.0.0
+    gemfile: gemfiles/Gemfile-rails.5.1.x
+  - rvm: 2.1.5
+    gemfile: gemfiles/Gemfile-rails.5.1.x
   - rvm: 1.9.3
     gemfile: gemfiles/Gemfile-rails.5.0.x
   - rvm: 2.0.0

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     responders (2.3.0)
-      railties (>= 4.2.0, < 5.1)
+      railties (>= 4.2.0, < 5.3)
 
 GEM
   remote: https://rubygems.org/
@@ -61,8 +61,8 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.2.2)
-    thor (0.19.1)
+    rake (12.0.0)
+    thor (0.19.4)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -77,4 +77,4 @@ DEPENDENCIES
   responders!
 
 BUNDLED WITH
-   1.12.5
+   1.13.7
diff --git a/gemfiles/Gemfile-rails.5.0.x b/gemfiles/Gemfile-rails.5.0.x
@@ -2,8 +2,8 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'activemodel', github: 'rails/rails'
-gem 'railties', github: 'rails/rails'
+gem 'activemodel', github: 'rails/rails', branch: '5-0-stable'
+gem 'railties', github: 'rails/rails', branch: '5-0-stable'
 gem 'mocha'
 gem 'rails-controller-testing'
 gem 'rack', github: 'rack/rack'
diff --git a/gemfiles/Gemfile-rails.5.1.x b/gemfiles/Gemfile-rails.5.1.x
@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activemodel', github: 'rails/rails', branch: '5-1-stable'
+gem 'railties', github: 'rails/rails', branch: '5-1-stable'
+gem 'mocha'
+gem 'rails-controller-testing'
+gem 'rack', github: 'rack/rack'
diff --git a/gemfiles/Gemfile-rails.5.2.x b/gemfiles/Gemfile-rails.5.2.x
@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activemodel', github: 'rails/rails'
+gem 'railties', github: 'rails/rails'
+gem 'mocha'
+gem 'rails-controller-testing'
+gem 'rack', github: 'rack/rack'
diff --git a/responders.gemspec b/responders.gemspec
@@ -18,5 +18,5 @@ Gem::Specification.new do |s|
   s.files         = Dir["CHANGELOG.md", "MIT-LICENSE", "README.md", "lib/**/*"]
   s.require_paths = ["lib"]
 
-  s.add_dependency "railties", ">= 4.2.0", "< 5.1"
+  s.add_dependency "railties", ">= 4.2.0", "< 5.3"
 end