Merge f68ad4a into e0be63c

.travis.yml

@@ -1,9 +1,8 @@
-# Send builds to container-based infrastructure
-# http://docs.travis-ci.com/user/workers/container-based-infrastructure/
-sudo: false
 language: ruby
-cache:
-- bundler
+cache: bundler
+
+sudo: false
+
 rvm:
   - 2.3
   - 2.4
@@ -15,6 +14,7 @@ gemfile:
   - gemfiles/rails_5_0.gemfile
   - gemfiles/rails_5_1.gemfile
   - gemfiles/rails_5_2.gemfile
+  - gemfiles/rails_6_0.gemfile
   - gemfiles/railsmaster.gemfile
 
 notifications:
@@ -27,5 +27,17 @@ matrix:
       gemfile: gemfiles/railsmaster.gemfile
     - rvm: 2.4
       gemfile: gemfiles/railsmaster.gemfile
+    - rvm: 2.3
+      gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: 2.4
+      gemfile: gemfiles/rails_6_0.gemfile
   allow_failures:
     - rvm: ruby-head
+
+before_install:
+  - ls /home/travis/.rvm/gems/
+  - rm /home/travis/.rvm/gems/ruby-2.4.6@global/specifications/bundler-2.0.1.gemspec || true
+  - rm /home/travis/.rvm/gems/ruby-2.5.5@global/specifications/bundler-2.0.1.gemspec || true
+  - gem uninstall bundler || true
+  - gem install bundler -v '1.17.3'
+  - bundler --version

Appraisals

@@ -1,21 +1,31 @@
 # frozen_string_literal: true
 
 appraise "rails_4_2" do
-  version = "~> 4.2.0"
-  gem "activerecord", version
+  gem "rails", "~> 4.2.0"
+  gem "sqlite3", "~> 1.3.0"
 end
 
 appraise "rails_5_0" do
-  version = "~> 5.0.0"
-  gem "activerecord", version
+  gem "rails", "~> 5.0.0"
+  gem "sqlite3", "~> 1.3.0"
 end
 
 appraise "rails_5_1" do
-  version = "~> 5.1.0"
-  gem "activerecord", version
+  gem "rails", "~> 5.1.0"
+  gem "sqlite3", "~> 1.4.0"
 end
 
 appraise "rails_5_2" do
-  version = "~> 5.2.0"
-  gem "activerecord", version
+  gem "rails", "~> 5.2.0"
+  gem "sqlite3", "~> 1.4.0"
+end
+
+appraise "rails_6_0" do
+  gem "rails", "~> 6.0.0.rc1"
+  gem "sqlite3", "~> 1.4.0"
+end
+
+appraise "railsmaster" do
+  gem "rails", github: "rails/rails"
+  gem "sqlite3", "~> 1.4.0"
 end

Gemfile

@@ -3,12 +3,12 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
-gem "sqlite3"
+gem "sqlite3", "~> 1.3.6"
 
 local_gemfile = File.join(__dir__, "Gemfile.local")
 
 if File.exist?(local_gemfile)
   eval(File.read(local_gemfile)) # rubocop:disable Security/Eval
 else
-  gem "activerecord", "~> 5.0"
+  gem "rails", "~> 5.1.0"
 end

gemfiles/rails_4_2.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3"
-gem "activerecord", "~> 4.2.0"
+gem "sqlite3", "~> 1.3.0"
+gem "rails", "~> 4.2.0"
 
 gemspec path: "../"

gemfiles/rails_5_0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3"
-gem "activerecord", "~> 5.0.0"
+gem "sqlite3", "~> 1.3.0"
+gem "rails", "~> 5.0.0"
 
 gemspec path: "../"

gemfiles/rails_5_1.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3"
-gem "activerecord", "~> 5.1.0"
+gem "sqlite3", "~> 1.4.0"
+gem "rails", "~> 5.1.0"
 
 gemspec path: "../"

gemfiles/rails_5_2.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3"
-gem "activerecord", "~> 5.2.0"
+gem "sqlite3", "~> 1.4.0"
+gem "rails", "~> 5.2.0"
 
 gemspec path: "../"

gemfiles/rails_6_0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.4.0"
+gem "rails", "~> 6.0.0.rc1"
+
+gemspec path: "../"

gemfiles/railsmaster.gemfile

@@ -1,6 +1,8 @@
+# This file was generated by Appraisal
+
 source "https://rubygems.org"
 
-gem "rails", github: "rails/rails"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4.0"
+gem "rails", git: "https://github.com/rails/rails.git"
 
-gemspec path: ".."
+gemspec path: "../"