diff --git a/.travis.yml b/.travis.yml index 82cf996..8ea176f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,33 +5,12 @@ before_install: - gem update --system rvm: - - 2.2 - - 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: - - rvm: 2.2 - env: RAILS_VERSION=5.0 - - rvm: 2.2 - 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 + - RAILS_VERSION=6.0 sudo: false diff --git a/Gemfile b/Gemfile index 45fa91c..18475e4 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,6 @@ source "http://rubygems.org" # development dependencies will be added by default to the :development group. gemspec -version = ENV['RAILS_VERSION'] || "4.0" +version = ENV['RAILS_VERSION'] || "6.0" eval_gemfile File.expand_path("../gemfiles/#{version}.gemfile", __FILE__) diff --git a/gemfiles/4.2.gemfile b/gemfiles/6.0.gemfile similarity index 72% rename from gemfiles/4.2.gemfile rename to gemfiles/6.0.gemfile index 9c5192a..8420e22 100644 --- a/gemfiles/4.2.gemfile +++ b/gemfiles/6.0.gemfile @@ -2,11 +2,11 @@ gem 'puma' gem 'jquery-rails' gem 'jquery-ui-rails' gem 'ancestry' -gem 'sqlite3', '~> 1.3.6' +gem 'sqlite3' gem 'activeadmin' gem 'devise' -gem 'rails', '~> 4.2.0' +gem 'rails', '~> 6.0.0' gem 'sass-rails' # vim: ft=ruby