Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Rails 4.2 support #1422

Merged
merged 1 commit into from
Mar 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,9 @@ jobs:
- rails_5_2
- rails_5_1
- rails_5_0
- rails_4_2
adapter:
- sqlite3
- postgresql
exclude:
- { ruby: 2.7.2, appraisal: rails_4_2 }
- { ruby: 2.6.6, appraisal: rails_4_2 }
env:
DATABASE_ADAPTER: ${{ matrix.adapter }}
BUNDLE_GEMFILE: gemfiles/${{ matrix.appraisal }}.gemfile
Expand Down
23 changes: 0 additions & 23 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,6 @@ shared_dependencies = proc do
instance_eval(&shared_test_dependencies)
end

appraise 'rails_4_2' do
instance_eval(&shared_dependencies)

gem 'rails', '4.2.11.1'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'jquery-rails'
gem 'turbolinks'
gem 'jbuilder', '~> 2.0'
gem 'sdoc', '~> 0.4.0', group: :doc
gem 'bcrypt', '~> 3.1.7'

# Other dependencies
gem 'activeresource', '4.0.0'
gem 'json', '~> 1.4'
gem 'protected_attributes', '~> 1.0.6'

# Database adapters
gem 'pg', '~> 0.18'
gem 'sqlite3', '~> 1.3.6'
end

appraise 'rails_5_0' do
instance_eval(&shared_dependencies)
instance_eval(&controller_test_dependency)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ machine, understanding the codebase, and creating a good pull request.
## Compatibility

Shoulda Matchers is tested and supported against Ruby 2.5+, Rails
4.2+, RSpec 3.x, and Minitest 5.x.
5.0+, RSpec 3.x, and Minitest 5.x.

- For Ruby < 2.4 and Rails < 4.1 compatibility, please use [v3.1.3][v3.1.3].
- For Ruby < 3.0 and Rails < 6.1 compatibility, please use [v4.5.1][v4.5.1].
Expand Down
37 changes: 0 additions & 37 deletions gemfiles/rails_4_2.gemfile

This file was deleted.

261 changes: 0 additions & 261 deletions gemfiles/rails_4_2.gemfile.lock

This file was deleted.

2 changes: 1 addition & 1 deletion shoulda-matchers.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ Gem::Specification.new do |s|
s.require_paths = ['lib']

s.required_ruby_version = '>= 2.5.0'
s.add_dependency('activesupport', '>= 4.2.0')
s.add_dependency('activesupport', '>= 5.0.0')
end
4 changes: 2 additions & 2 deletions spec/support/unit/capture.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Kernel
# #capture, #silence_stream, and #silence_stderr are deprecated after Rails
# 4.2 and will be removed in 5.0, so just override them completely here
# #capture, #silence_stream, and #silence_stderr were removed in rails 5.0,
# but we keep it them here

if method_defined?(:capture)
undef_method :capture
Expand Down