Skip to content

Commit

Permalink
Add support for rails@5.1, drop rails@4.1
Browse files Browse the repository at this point in the history
With the release of `rails@5.1`, add explicit test coverage, in addition
to testing on `master`.

According to the [Ruby on Rails Maintenance Policy][policy], Rails 4.1
has reached its end of life stage [after the release of Rails
5.0][rails-5.0].

As such, this commit drops formal test coverage and support for Rails
versions prior to 4.2.

[policy]: http://guides.rubyonrails.org/maintenance_policy.html#severe-security-issues
[rails-5.0]: http://weblog.rubyonrails.org/2016/6/30/Rails-5-0-final/
[rails-5.1]: http://weblog.rubyonrails.org/2017/4/27/Rails-5-1-final/
  • Loading branch information
seanpdoyle committed Aug 4, 2017
1 parent 989e610 commit c8c426e
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ env:
- secure: RbWKxwfpzyQ5uv/jYH68/0J3Y9xe7rQbGULsWZT98FxZcVWLoOFlPPITmnmEK32CjQUww8iMz50FRLxFNmXg8prt1KzpzikVdIZLmYg1NFShI8+JOFhJzwCuk/LLybNUmydejR58FJvV9gS8NYqMh5leFkDM3OwLxhWdcE8hDDQ=
- NODE_JS_VERSION=7.10.0
gemfile:
- gemfiles/4.1.gemfile
- gemfiles/4.2.gemfile
- gemfiles/5.0.0.gemfile
- gemfiles/5.1.0.gemfile
- gemfiles/master.gemfile
matrix:
allow_failures:
- rvm: jruby-9.0.3.0
Expand Down
8 changes: 4 additions & 4 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
appraise "4.1" do
gem "rails", "~> 4.1.1"
end

appraise "4.2" do
gem "rails", "~> 4.2.1"
end
Expand All @@ -10,6 +6,10 @@ appraise "5.0.0" do
gem "rails", "5.0.0"
end

appraise "5.1.0" do
gem "rails", "5.0.0"
end

appraise "master" do
gem "rails", git: "https://github.com/rails/rails.git", branch: "master"
end
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ master
Next, execute `rake ember:heroku`. [#544]
* Generate an empty `yarn.lock` so that Heroku understands that the
application's deployment target requires `yarn`. Closes [#538]. [#540]
* No longer support `rails < 4.2`. [#543]
* Generate an empty `yarn.lock` so that Heroku understands that the
application's deployment target requires `yarn`. Closes [#538]. [#540]

[#543]: https://github.com/thoughtbot/ember-cli-rails/pull/543
[#544]: https://github.com/thoughtbot/ember-cli-rails/pull/544
[#538]: https://github.com/thoughtbot/ember-cli-rails/issues/538
[#540]: https://github.com/thoughtbot/ember-cli-rails/pull/540
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ This project supports:
This project supports:

* Ruby versions `>= 2.2.0`
* Rails versions `>=4.1.x`.
* Rails versions `>=4.2.x`.

To learn more about supported versions and upgrades, read the [upgrading guide].

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/4.1.gemfile → gemfiles/5.1.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"

gem "appraisal"
gem "rails", "~> 4.1.1"
gem "rails", "5.1.0"
gem "pry"

group :development, :test do
Expand Down
7 changes: 1 addition & 6 deletions lib/tasks/ember-cli.rake
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,5 @@ namespace :ember do
end

unless EmberCli.skip?
# Hook into assets:precompile:all for Rails 3.1+
if Rails::VERSION::MAJOR < 4
task "assets:precompile:all" => "ember:compile"
else
task "assets:precompile" => "ember:compile"
end
task "assets:precompile" => "ember:compile"
end

0 comments on commit c8c426e

Please sign in to comment.