From 4e4e08195157c43008b5f9f0afdf2c56af250aa5 Mon Sep 17 00:00:00 2001 From: Erik Axel Nielsen Date: Sat, 31 Aug 2019 11:26:26 +0200 Subject: [PATCH] Add support for Rails 6.0 --- .travis.yml | 1 + Appraisals | 5 +++++ README.md | 2 +- gemfiles/rails_6.0.0.gemfile | 10 ++++++++++ storext.gemspec | 2 +- 5 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 gemfiles/rails_6.0.0.gemfile diff --git a/.travis.yml b/.travis.yml index 5a79d0b..95beaa9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ gemfile: - gemfiles/rails_5.0.7.gemfile - gemfiles/rails_5.1.6.gemfile - gemfiles/rails_5.2.1.gemfile + - gemfiles/rails_6.0.0.gemfile before_script: - cp spec/dummy/config/database.yml{.sample,} - bundle exec rake db:create db:schema:load db:test:prepare --Rakefile spec/dummy/Rakefile diff --git a/Appraisals b/Appraisals index 8be5f88..2d3b4cd 100644 --- a/Appraisals +++ b/Appraisals @@ -17,3 +17,8 @@ appraise "rails_5.2.1" do gem "rails", "5.2.1" gem "pg", "~> 1.0" end + +appraise "rails_6.0.0" do + gem "rails", "6.0.0" + gem "pg", "~> 1.0" +end \ No newline at end of file diff --git a/README.md b/README.md index 67184c1..7018189 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Currently this gem uses [virtus](https://github.com/solnic/virtus) so you can pa ## Dependencies - * Rails 4.x, 5.x + * Rails 4.x, 5.x, 6.x * Virtus ## Installation diff --git a/gemfiles/rails_6.0.0.gemfile b/gemfiles/rails_6.0.0.gemfile new file mode 100644 index 0000000..a6fd7e2 --- /dev/null +++ b/gemfiles/rails_6.0.0.gemfile @@ -0,0 +1,10 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "pry" +gem "appraisal" +gem "rails", "6.0.0" +gem "pg", "~> 1.0" + +gemspec path: "../" diff --git a/storext.gemspec b/storext.gemspec index d4fb7ba..772810e 100644 --- a/storext.gemspec +++ b/storext.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| s.test_files = Dir["test/**/*"] s.add_dependency "virtus" - s.add_dependency "activerecord", [">= 4.0", "< 6.0"] + s.add_dependency "activerecord", [">= 4.0", "< 6.1"] s.add_development_dependency "pg" s.add_development_dependency "rspec"