Skip to content

Commit

Permalink
Drop support for Rails 4.2
Browse files Browse the repository at this point in the history
Rails 4.2 has reached EOL with the release of Rails 6. It has also
caused additional work recently to make CI work properly. With this, we
can remove the workarounds and focus on future version.
  • Loading branch information
aried3r committed Jan 2, 2020
1 parent 54ee176 commit 109c539
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 59 deletions.
1 change: 0 additions & 1 deletion .rubocop_todo.yml
Expand Up @@ -12,7 +12,6 @@
# Include: **/*.gemfile, **/Gemfile, **/gems.rb
Bundler/OrderedGems:
Exclude:
- 'gemfiles/rails_4.2.gemfile'
- 'gemfiles/rails_5.0.gemfile'

# Offense count: 9
Expand Down
23 changes: 8 additions & 15 deletions .travis.yml
Expand Up @@ -7,10 +7,10 @@ cache: bundler
compiler: clang

rvm:
- 2.3.8
- 2.4.7
- 2.5.6
- 2.6.4
- 2.3
- 2.4
- 2.5
- 2.6

# Build only commits on master for the "Build pushed branches" feature. This
# prevents building twice on PRs originating from our repo ("Build pushed pull
Expand All @@ -22,7 +22,6 @@ branches:
- master

gemfile:
- gemfiles/rails_4.2.gemfile
- gemfiles/rails_5.0.gemfile
- gemfiles/rails_5.1.gemfile
- gemfiles/rails_5.2.gemfile
Expand All @@ -37,10 +36,7 @@ before_install:
# https://github.com/rubygems/rubygems/issues/3036
# https://github.com/rubygems/rubygems/issues/3036#issuecomment-566132226
- yes | gem update --system
# Rails 4.2 doesn't support bundler 2.0, so we need to lock bundler to
# v1.17.3. This is just for Ruby 2.5 which ships with bundler 2.x on Travis
# CI while Ruby 2.6 does not.
- yes | rvm @global do gem install bundler -v 1.17.3 || true
- gem install bundler

env:
matrix:
Expand All @@ -49,17 +45,14 @@ env:

matrix:
fast_finish: true
allow_failures:
- gemfile: gemfiles/rails_4.2.gemfile
rvm: 2.5.6
exclude:
- gemfile: gemfiles/rails_6.0.gemfile
rvm: 2.3.8
rvm: 2.3
- gemfile: gemfiles/rails_6.0.gemfile
rvm: 2.4.7
rvm: 2.4

jobs:
include:
- stage: Lint
rvm: 2.6.4
rvm: 2.6
script: bundle exec rake rubocop
22 changes: 6 additions & 16 deletions Appraisals
Expand Up @@ -7,21 +7,11 @@
# > the version from the appraisal takes precedence.
# > https://github.com/thoughtbot/appraisal

appraise "rails-4.2" do
gem "activesupport", "~> 4.2"

group :development do
gem "rails", "~> 4.2"
# Rails 4.2 doesn't support pg 1.0
gem "pg", "< 1.0"
end
end

appraise "rails-5.0" do
gem "activesupport", ">= 5.0", "< 5.1"
gem "activesupport", "~> 5.0.0"

group :development do
gem "rails", ">= 5.0", "< 5.1"
gem "rails", "~> 5.0.0"
# Supposedly Rails 5-stable already supports pg 1.0 but hasn't had a
# release yet.
# https://github.com/rails/rails/pull/31671#issuecomment-357605227
Expand All @@ -30,18 +20,18 @@ appraise "rails-5.0" do
end

appraise "rails-5.1" do
gem "activesupport", ">= 5.1", "< 5.2"
gem "activesupport", "~> 5.1.0"

group :development do
gem "rails", ">= 5.1", "< 5.2"
gem "rails", "~> 5.1.0"
end
end

appraise "rails-5.2" do
gem "activesupport", ">= 5.2.0", "< 5.3"
gem "activesupport", "~> 5.2.0"

group :development do
gem "rails", ">= 5.2.0", "< 5.3"
gem "rails", "~> 5.2.0"
end
end

Expand Down
16 changes: 8 additions & 8 deletions Gemfile.lock
Expand Up @@ -2,7 +2,7 @@ PATH
remote: .
specs:
rpush (4.2.0)
activesupport
activesupport (>= 5.0)
jwt (>= 1.5.6)
multi_json (~> 1.0)
net-http-persistent
Expand Down Expand Up @@ -39,7 +39,7 @@ GEM
rake
thor (>= 0.14.0)
ast (2.4.0)
builder (3.2.3)
builder (3.2.4)
byebug (11.0.1)
codeclimate-test-reporter (1.0.7)
simplecov
Expand All @@ -49,14 +49,14 @@ GEM
database_cleaner (1.7.0)
diff-lcs (1.3)
docile (1.3.1)
erubi (1.8.0)
erubi (1.9.0)
hiredis (0.6.3)
http-2 (0.10.1)
i18n (1.7.0)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
json (2.2.0)
jwt (2.1.0)
jwt (2.2.1)
loofah (2.4.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
Expand All @@ -71,9 +71,9 @@ GEM
msgpack (>= 0.5)
redis (>= 3.0)
msgpack (1.3.1)
multi_json (1.13.1)
multi_json (1.14.1)
mysql2 (0.5.2)
net-http-persistent (3.0.1)
net-http-persistent (3.1.0)
connection_pool (~> 2.2)
net-http2 (0.18.2)
http-2 (~> 0.10.1)
Expand All @@ -89,8 +89,8 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.2.3)
actionpack (= 5.2.3)
activesupport (= 5.2.3)
Expand Down
12 changes: 0 additions & 12 deletions gemfiles/rails_4.2.gemfile

This file was deleted.

4 changes: 2 additions & 2 deletions gemfiles/rails_5.0.gemfile
Expand Up @@ -2,10 +2,10 @@

source "https://rubygems.org"

gem "activesupport", ">= 5.0", "< 5.1"
gem "activesupport", "~> 5.0.0"

group :development do
gem "rails", ">= 5.0", "< 5.1"
gem "rails", "~> 5.0.0"
gem "pg", "< 1.0"
end

Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails_5.1.gemfile
Expand Up @@ -2,10 +2,10 @@

source "https://rubygems.org"

gem "activesupport", ">= 5.1", "< 5.2"
gem "activesupport", "~> 5.1.0"

group :development do
gem "rails", ">= 5.1", "< 5.2"
gem "rails", "~> 5.1.0"
end

gemspec path: "../"
4 changes: 2 additions & 2 deletions gemfiles/rails_5.2.gemfile
Expand Up @@ -2,10 +2,10 @@

source "https://rubygems.org"

gem "activesupport", ">= 5.2.0", "< 5.3"
gem "activesupport", "~> 5.2.0"

group :development do
gem "rails", ">= 5.2.0", "< 5.3"
gem "rails", "~> 5.2.0"
end

gemspec path: "../"
2 changes: 1 addition & 1 deletion rpush.gemspec
Expand Up @@ -35,7 +35,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency 'net-http-persistent'
s.add_runtime_dependency 'net-http2', '~> 0.14'
s.add_runtime_dependency 'jwt', '>= 1.5.6'
s.add_runtime_dependency 'activesupport'
s.add_runtime_dependency 'activesupport', '>= 5.0'
s.add_runtime_dependency 'thor', ['>= 0.18.1', '< 2.0']
s.add_runtime_dependency 'railties'
s.add_runtime_dependency 'rainbow'
Expand Down

0 comments on commit 109c539

Please sign in to comment.