Merge pull request #54 from robzolkos/update-testing-matrix

Update testing matrix for new Rubys and Rails

Author: rafaelfranca

.travis.yml

@@ -8,47 +8,26 @@ before_install:
   - gem install bundler
 
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.9
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
 
 gemfile:
   - Gemfile
-  - gemfiles/Gemfile-4-0-stable
-  - gemfiles/Gemfile-4-1-stable
-  - gemfiles/Gemfile-4-2-stable
   - gemfiles/Gemfile-5-0-stable
+  - gemfiles/Gemfile-5-1-stable
+  - gemfiles/Gemfile-5-2-stable
+  - gemfiles/Gemfile-6-0-stable
   - gemfiles/Gemfile-edge
 
 matrix:
   allow_failures:
     - gemfile: gemfiles/Gemfile-edge
   exclude:
-    - rvm: 1.9.3
-      gemfile: Gemfile
-    - rvm: 2.0.0
-      gemfile: Gemfile
-    - rvm: 2.1.9
-      gemfile: Gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/Gemfile-5-0-stable
-    - rvm: 2.0.0
-      gemfile: gemfiles/Gemfile-5-0-stable
-    - rvm: 2.1.9
-      gemfile: gemfiles/Gemfile-5-0-stable
-    - rvm: 1.9.3
+    - rvm: 2.4.6
+      gemfile: gemfiles/Gemfile-6-0-stable
+    - rvm: 2.4.6
       gemfile: gemfiles/Gemfile-edge
-    - rvm: 2.0.0
-      gemfile: gemfiles/Gemfile-edge
-    - rvm: 2.1.9
-      gemfile: gemfiles/Gemfile-edge
-    - rvm: 2.4.0
-      gemfile: gemfiles/Gemfile-4-0-stable
-    - rvm: 2.4.0
-      gemfile: gemfiles/Gemfile-4-1-stable
 
 notifications:
   email: false

actionpack-page_caching.gemspec

@@ -8,14 +8,14 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/rails/actionpack-page_caching"
   gem.license       = "MIT"
 
-  gem.required_ruby_version = '>= 1.9.3'
+  gem.required_ruby_version = '>= 2.4.6'
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.license       = 'MIT'
 
-  gem.add_dependency "actionpack", ">= 4.0.0"
+  gem.add_dependency "actionpack", ">= 5.0.0"
 
   gem.add_development_dependency "mocha"
 end

gemfiles/Gemfile-4-0-stable

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rails", github: "rails/rails", branch: "5-1-stable"

gemfiles/Gemfile-4-1-stable

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rails", github: "rails/rails", branch: "5-2-stable"

gemfiles/Gemfile-4-2-stable

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rails", github: "rails/rails", branch: "6-0-stable"