From 183fe94ec968b66b0bc53b0407fb1afb4cee8d02 Mon Sep 17 00:00:00 2001
From: Yuki Nishijima <yk.nishijima@gmail.com>
Date: Sat, 16 Mar 2019 13:50:26 -0400
Subject: [PATCH 1/3] Test against Ruby 2.6 and Rails 5.2

---
 .travis.yml          |  4 ++++
 gemfiles/5.2.gemfile | 12 ++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 gemfiles/5.2.gemfile

diff --git a/.travis.yml b/.travis.yml
index 27f409d..2e76755 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,11 +9,13 @@ rvm:
   - 2.3
   - 2.4
   - 2.5
+  - 2.6
 
 env:
   - RAILS_VERSION=4.2
   - RAILS_VERSION=5.0
   - RAILS_VERSION=5.1
+  - RAILS_VERSION=5.2
 
 matrix:
   exclude:
@@ -21,5 +23,7 @@ matrix:
       env: RAILS_VERSION=5.0
     - rvm: 2.2
       env: RAILS_VERSION=5.1
+    - rvm: 2.2
+      env: RAILS_VERSION=5.2
 
 sudo: false
diff --git a/gemfiles/5.2.gemfile b/gemfiles/5.2.gemfile
new file mode 100644
index 0000000..1fcd42c
--- /dev/null
+++ b/gemfiles/5.2.gemfile
@@ -0,0 +1,12 @@
+gem 'puma'
+gem 'jquery-rails'
+gem 'jquery-ui-rails'
+gem 'ancestry'
+gem 'sqlite3'
+
+gem 'activeadmin'
+gem 'devise'
+gem 'rails', '~> 5.2.0'
+gem 'sass-rails'
+
+# vim: ft=ruby

From 5b1a547e74f82c947b84358e0d9b1b4181499d7e Mon Sep 17 00:00:00 2001
From: Yuki Nishijima <yk.nishijima@gmail.com>
Date: Sat, 16 Mar 2019 16:17:20 -0400
Subject: [PATCH 2/3] Exclude builds for newer Rubies and old Rails versions

 * Rails 4.2 supports versions between 1.9 and 2.4: https://github.com/rails/rails/blob/406e2f46/.travis.yml#L26-L31
 * Rails 5.0 supports versions between 2.2 and 2.4: https://github.com/rails/rails/blob/ecd965e7/.travis.yml#L46-L48
---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 2e76755..82cf996 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,5 +25,13 @@ matrix:
       env: RAILS_VERSION=5.1
     - rvm: 2.2
       env: RAILS_VERSION=5.2
+    - rvm: 2.5
+      env: RAILS_VERSION=4.2
+    - rvm: 2.5
+      env: RAILS_VERSION=5.0
+    - rvm: 2.6
+      env: RAILS_VERSION=4.2
+    - rvm: 2.6
+      env: RAILS_VERSION=5.0
 
 sudo: false

From b33abb7204840cb3134535f89a8f82bef800b80d Mon Sep 17 00:00:00 2001
From: Yuki Nishijima <yk.nishijima@gmail.com>
Date: Sat, 16 Mar 2019 16:22:03 -0400
Subject: [PATCH 3/3] Fix failind builds caused by dependencies

 * Use sqlite3 version ~> 1.3.6: https://github.com/rails/rails/issues/35153#issuecomment-460455573
 * Add puma that is now required by Capybara
---
 gemfiles/4.2.gemfile | 3 ++-
 gemfiles/5.0.gemfile | 3 ++-
 gemfiles/5.1.gemfile | 2 +-
 gemfiles/5.2.gemfile | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gemfiles/4.2.gemfile b/gemfiles/4.2.gemfile
index 2ca256f..9c5192a 100644
--- a/gemfiles/4.2.gemfile
+++ b/gemfiles/4.2.gemfile
@@ -1,7 +1,8 @@
+gem 'puma'
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
 gem 'ancestry'
-gem 'sqlite3'
+gem 'sqlite3', '~> 1.3.6'
 
 gem 'activeadmin'
 gem 'devise'
diff --git a/gemfiles/5.0.gemfile b/gemfiles/5.0.gemfile
index 564e8fc..3e51040 100644
--- a/gemfiles/5.0.gemfile
+++ b/gemfiles/5.0.gemfile
@@ -1,7 +1,8 @@
+gem 'puma'
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
 gem 'ancestry'
-gem 'sqlite3'
+gem 'sqlite3', '~> 1.3.6'
 
 gem 'activeadmin'
 gem 'devise'
diff --git a/gemfiles/5.1.gemfile b/gemfiles/5.1.gemfile
index 5216d25..da4fdb6 100644
--- a/gemfiles/5.1.gemfile
+++ b/gemfiles/5.1.gemfile
@@ -2,7 +2,7 @@ gem 'puma'
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
 gem 'ancestry'
-gem 'sqlite3'
+gem 'sqlite3', '~> 1.3.6'
 
 gem 'activeadmin'
 gem 'devise'
diff --git a/gemfiles/5.2.gemfile b/gemfiles/5.2.gemfile
index 1fcd42c..690a919 100644
--- a/gemfiles/5.2.gemfile
+++ b/gemfiles/5.2.gemfile
@@ -2,7 +2,7 @@ gem 'puma'
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
 gem 'ancestry'
-gem 'sqlite3'
+gem 'sqlite3', '~> 1.3.6'
 
 gem 'activeadmin'
 gem 'devise'