From f60492b29c174d4c959ac02406392f8eb9c4d374 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Thu, 12 Apr 2018 11:00:21 +0900 Subject: [PATCH] Add Rails v5.2 support --- .travis.yml | 5 +++++ Appraisals | 5 +++++ devise-two-factor.gemspec | 4 ++-- gemfiles/rails_5_2.gemfile | 8 ++++++++ 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 gemfiles/rails_5_2.gemfile diff --git a/.travis.yml b/.travis.yml index 652eaf8..5dc469e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ gemfile: - gemfiles/rails_4_2.gemfile - gemfiles/rails_5_0.gemfile - gemfiles/rails_5_1.gemfile + - gemfiles/rails_5_2.gemfile rvm: - "2.1" - "2.2" @@ -26,3 +27,7 @@ matrix: gemfile: gemfiles/rails_5_1.gemfile - rvm: "2.2" gemfile: gemfiles/rails_5_1.gemfile + - rvm: "2.1" + gemfile: gemfiles/rails_5_2.gemfile + - rvm: "2.2" + gemfile: gemfiles/rails_5_2.gemfile diff --git a/Appraisals b/Appraisals index 282cba2..bcb464a 100644 --- a/Appraisals +++ b/Appraisals @@ -17,3 +17,8 @@ appraise "rails-5-1" do gem 'railties', '~> 5.1' gem 'activesupport', '~> 5.1' end + +appraise "rails-5-2" do + gem 'railties', '~> 5.2' + gem 'activesupport', '~> 5.2' +end diff --git a/devise-two-factor.gemspec b/devise-two-factor.gemspec index 34b4177..a60f560 100644 --- a/devise-two-factor.gemspec +++ b/devise-two-factor.gemspec @@ -24,8 +24,8 @@ Gem::Specification.new do |s| s.test_files = `git ls-files -- spec/*`.split("\n") s.require_paths = ['lib'] - s.add_runtime_dependency 'railties', '< 5.2' - s.add_runtime_dependency 'activesupport', '< 5.2' + s.add_runtime_dependency 'railties', '< 5.3' + s.add_runtime_dependency 'activesupport', '< 5.3' s.add_runtime_dependency 'attr_encrypted', '>= 1.3', '< 4', '!= 2' s.add_runtime_dependency 'devise', '~> 4.0' s.add_runtime_dependency 'rotp', '~> 2.0' diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile new file mode 100644 index 0000000..46fd105 --- /dev/null +++ b/gemfiles/rails_5_2.gemfile @@ -0,0 +1,8 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "railties", "~> 5.2" +gem "activesupport", "~> 5.2" + +gemspec path: "../"