Skip to content

Commit 03d15c3

Browse files
rafaflorestatagliala
authored andcommitted
Drop Rails 5 support
Closes jsonapi-rb#147
1 parent a4238ee commit 03d15c3

File tree

5 files changed

+4
-19
lines changed

5 files changed

+4
-19
lines changed

.github/workflows/ci.yml

+1-11
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,22 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
ruby: [3.2, 3.1, '3.0', 2.7, 2.6, ruby-head]
14-
rails: ['7.0.0', '6.1.0', '6.0.0', '5.2.0', main]
14+
rails: ['7.0.0', '6.1.0', '6.0.0', main]
1515
exclude:
1616
- ruby: ruby-head
1717
rails: '6.1.0'
1818
- ruby: ruby-head
1919
rails: '6.0.0'
20-
- ruby: ruby-head
21-
rails: '5.2.0'
2220
- ruby: 3.2
2321
rails: '6.0.0'
24-
- ruby: 3.2
25-
rails: '5.2.0'
2622
- ruby: 3.1
2723
rails: '6.0.0'
28-
- ruby: 3.1
29-
rails: '5.2.0'
3024
- ruby: 3.0
3125
rails: main
3226
- ruby: 3.0
3327
rails: '6.0.0'
34-
- ruby: 3.0
35-
rails: '5.2.0'
3628
- ruby: 2.7
3729
rails: main
38-
- ruby: 2.7
39-
rails: '5.2.0'
4030
- ruby: 2.6
4131
rails: main
4232
- ruby: 2.6

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ rails =
66
when 'main'
77
{ github: 'rails/rails' }
88
when 'default'
9-
'>= 5.0'
9+
'>= 6.0'
1010
else
1111
"~> #{ENV['RAILS_VERSION']}"
1212
end

jsonapi-rails.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
1919
spec.add_dependency 'jsonapi-rb', '~> 0.5.0'
2020
spec.add_dependency 'jsonapi-parser', '~> 0.1.0'
2121

22-
spec.add_development_dependency 'rails', '>= 5.0'
22+
spec.add_development_dependency 'rails', '>= 6.0'
2323
spec.add_development_dependency 'sqlite3', '>= 1.3'
2424
spec.add_development_dependency 'rake', '>= 11.3'
2525
spec.add_development_dependency 'rspec-rails', '>= 4.0'

spec/dummy/config/initializers/new_framework_defaults.rb

-5
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,5 @@
1717
# Require `belongs_to` associations by default. Previous versions had false.
1818
Rails.application.config.active_record.belongs_to_required_by_default = true
1919

20-
# Do not halt callback chains when a callback returns false. Previous versions had true.
21-
if Rails.version < '5.2'
22-
ActiveSupport.halt_callback_chains_on_return_false = false
23-
end
24-
2520
# Configure SSL options to enable HSTS with subdomains. Previous versions had false.
2621
Rails.application.config.ssl_options = { hsts: { subdomains: true } }
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
if Rails.version >= '5.1.0' && Rails.application.config.active_record.sqlite3.present?
1+
if Rails.application.config.active_record.sqlite3.present?
22
Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
33
end

0 commit comments

Comments
 (0)