Skip to content

Commit

Permalink
Add Rails 5.2 build (scenic-views#257)
Browse files Browse the repository at this point in the history
* Update Appraisals and regenerate, to match changes in scenic-views#232
* Update required Ruby version to match discussion in scenic-views#232
* Add Rails 5.2 to Appraisals
* Add Rails 5.2 to Travis config
* Add 'ApplicationRecord' to fix generated models on 5.0+
  • Loading branch information
smudge authored and derekprior committed Dec 5, 2018
1 parent 16874cc commit 3d44c62
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 26 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ gemfile:
- gemfiles/rails42.gemfile
- gemfiles/rails50.gemfile
- gemfiles/rails51.gemfile
- gemfiles/rails52.gemfile
- gemfiles/rails_edge.gemfile
matrix:
allow_failures:
Expand Down
41 changes: 16 additions & 25 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,33 +1,24 @@
if RUBY_VERSION < "2.4.0"
appraise "rails40" do
gem "activerecord", "~> 4.0.0"
gem "railties", "~> 4.0.0"
end

appraise "rails41" do
gem "activerecord", "~> 4.1.0"
gem "railties", "~> 4.1.0"
end
end

appraise "rails42" do
gem "activerecord", "~> 4.2.0"
gem "railties", "~> 4.2.0"
end

if RUBY_VERSION > "2.2.0"
appraise "rails50" do
gem "activerecord", "~> 5.0.0"
gem "railties", "~> 5.0.0"
end
appraise "rails50" do
gem "activerecord", "~> 5.0.0"
gem "railties", "~> 5.0.0"
end

appraise "rails51" do
gem "activerecord", "~> 5.1.0"
gem "railties", "~> 5.1.0"
end
appraise "rails51" do
gem "activerecord", "~> 5.1.0"
gem "railties", "~> 5.1.0"
end

appraise "rails52" do
gem "activerecord", "~> 5.2.0"
gem "railties", "~> 5.2.0"
end

appraise "rails-edge" do
gem "rails", git: "https://github.com/rails/rails"
gem "arel", git: "https://github.com/rails/arel"
end
appraise "rails-edge" do
gem "rails", git: "https://github.com/rails/rails"
gem "arel", git: "https://github.com/rails/arel"
end
8 changes: 8 additions & 0 deletions gemfiles/rails52.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activerecord", "~> 5.2.0"
gem "railties", "~> 5.2.0"

gemspec path: "../"
2 changes: 1 addition & 1 deletion scenic.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ Gem::Specification.new do |spec|
spec.add_dependency 'activerecord', '>= 4.0.0'
spec.add_dependency 'railties', '>= 4.0.0'

spec.required_ruby_version = '~> 2.1'
spec.required_ruby_version = '>= 2.3.0'
end
5 changes: 5 additions & 0 deletions spec/dummy/app/models/application_record.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
if Rails::VERSION::STRING >= "5.0.0"
class ApplicationRecord < ActiveRecord::Base
self.abstract_class = true
end
end

0 comments on commit 3d44c62

Please sign in to comment.