Skip to content

Commit

Permalink
drop rails 6.1/7.0 support, bump required ruby to 3.1, add rails 8.0 …
Browse files Browse the repository at this point in the history
…to appraisals
  • Loading branch information
modosc committed Jun 12, 2024
1 parent d0299ad commit 12a3124
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require:

AllCops:
NewCops: enable
TargetRubyVersion: 2.5
TargetRubyVersion: 3.1
SuggestExtensions: false

Style/Documentation:
Expand Down
12 changes: 4 additions & 8 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
appraise 'rails-6.1' do
gem 'rails', '~> 6.1.0'
end

appraise 'rails-7.0' do
gem 'rails', '~> 7.0.0'
end

appraise 'rails-7.1' do
gem 'rails', '~> 7.1.0'
end

appraise 'rails-7.2' do
gem 'rails', github: 'rails/rails', branch: '7-2-stable'
end

appraise 'rails-8.0' do
gem 'rails', github: 'rails/rails'
end
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ This gem correctly configures Rails for [CloudFlare](https://www.cloudflare.com)

## Rails Compatibility

This gem requires `railties`, `activesupport`, and `actionpack` >= `6.1`. For older `rails` versions see the chart below:
This gem requires `railties`, `activesupport`, and `actionpack` >= `7.1`. For older `rails` versions see the chart below:

| `rails` version | `cloudflare-rails` version |
| --------------- | -------------------------- |
| 7.0 | 5.0.1 |
| 6.1 | 5.0.1 |
| 6.0 | 3.0.0 |
| 5.2 | 2.4.0 |
| 5.1 | 2.0.0 |
Expand Down
26 changes: 13 additions & 13 deletions cloudflare-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,25 @@ Gem::Specification.new do |spec|
spec.require_paths = ['lib']

spec.add_development_dependency 'appraisal', '~> 2.5.0'
spec.add_development_dependency 'bundler', '>= 2.1.2'
spec.add_development_dependency 'bundler', '>= 2.4.18'
spec.add_development_dependency 'pry-byebug'
spec.add_development_dependency 'rack-attack', '~> 6.7.0'
spec.add_development_dependency 'rake', '~> 13.1.0'
spec.add_development_dependency 'rspec', '~> 3.12.0'
spec.add_development_dependency 'rake', '~> 13.2.1'
spec.add_development_dependency 'rspec', '~> 3.13.0'
spec.add_development_dependency 'rspec_junit_formatter', '~> 0.6.0'
spec.add_development_dependency 'rspec-rails', '~> 6.1.0'
spec.add_development_dependency 'rubocop', '~> 1.60.2'
spec.add_development_dependency 'rubocop-performance', '~> 1.20.2'
spec.add_development_dependency 'rubocop-rails', '~> 2.23.1'
spec.add_development_dependency 'rspec-rails', '~> 6.1.2'
spec.add_development_dependency 'rubocop', '~> 1.64.1'
spec.add_development_dependency 'rubocop-performance', '~> 1.21.0'
spec.add_development_dependency 'rubocop-rails', '~> 2.25.0'
spec.add_development_dependency 'rubocop-rspec', '~> 2.26.1'
spec.add_development_dependency 'webmock', '~> 3.19.1'
spec.add_development_dependency 'webmock', '~> 3.23.1'

spec.add_dependency 'actionpack', '>= 6.1', '< 7.2.0'
spec.add_dependency 'activesupport', '>= 6.1', '< 7.2.0'
spec.add_dependency 'railties', '>= 6.1', '< 7.2.0'
spec.add_dependency 'actionpack', '>= 7.1.0', '< 8.1.0'
spec.add_dependency 'activesupport', '>= 7.1.0', '< 8.1.0'
spec.add_dependency 'railties', '>= 7.1.0', '< 8.1.0'
spec.add_dependency 'zeitwerk', '>= 2.5.0'

# rails 6.1 lists this as the minimum
spec.required_ruby_version = '>= 2.5.0'
# rails 7.2 lists this as the minimum
spec.required_ruby_version = '>= 3.1.0'
spec.metadata['rubygems_mfa_required'] = 'true'
end
7 changes: 0 additions & 7 deletions gemfiles/rails_7.0.gemfile

This file was deleted.

2 changes: 1 addition & 1 deletion gemfiles/rails_7.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

source 'https://rubygems.org'

gem 'rails', github: 'rails/rails'
gem 'rails', github: 'rails/rails', branch: '7-2-stable'

gemspec path: '../'
4 changes: 3 additions & 1 deletion gemfiles/rails_6.1.gemfile → gemfiles/rails_8.0.gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'https://rubygems.org'

gem 'rails', '~> 6.1.0'
gem 'rails', github: 'rails/rails'

gemspec path: '../'
2 changes: 1 addition & 1 deletion lib/cloudflare_rails/importer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class ResponseError < StandardError
# @param [Net::HTTPResponse]
def initialize(response)
@response = response
super(response)
super
end
end

Expand Down

0 comments on commit 12a3124

Please sign in to comment.