Skip to content

Commit f210c1a

Browse files
committed
Drop support for Ruby < 3.2 and Rails < 7.2
This reverts commit 085d234.
1 parent 085d234 commit f210c1a

File tree

228 files changed

+21
-4357
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

228 files changed

+21
-4357
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,12 @@ jobs:
1515
name: ${{ matrix.ruby }}
1616
runs-on: ubuntu-latest
1717
env:
18-
COVERAGE_RUBY_VERSION: 2.6
18+
COVERAGE_RUBY_VERSION: 3.2
1919
BUNDLE_PATH: ${{ github.workspace }}/vendor/bundle
2020
strategy:
2121
fail-fast: false
2222
matrix:
2323
ruby:
24-
- 2.6
25-
- 2.7
26-
- '3.0' # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
27-
- 3.1
2824
- 3.2
2925
- 3.3
3026
- 3.4

Appraisals

Lines changed: 9 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -6,68 +6,19 @@ min_ruby_version = ->(version) {
66
RUBY_ENGINE == 'ruby' && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new(version)
77
}
88

9-
# Rails 5.x, 6.0 require Ruby < 3
10-
if max_ruby_version.call('3.0')
11-
appraise 'rails-5.2' do
12-
gem 'activerecord-jdbcsqlite3-adapter', '~> 52.5', platform: :jruby
13-
gem 'bootsnap', '~> 1.4'
14-
gem 'rails', '~> 5.2.0'
15-
gem 'rspec-rails', '~> 3.7'
16-
gem 'sqlite3', '< 1.4.0', platform: :ruby
17-
end
18-
19-
appraise 'rails-6.0' do
20-
gem 'activerecord-jdbcsqlite3-adapter', '~> 60.1', platform: :jruby
21-
gem 'bootsnap', '~> 1.4'
22-
gem 'rails', '~> 6.0.0'
23-
gem 'rspec-rails', '~> 3.7'
24-
gem 'sqlite3', '~> 1', platform: :ruby
25-
end
26-
end
27-
28-
appraise 'rails-6.1' do
29-
gem 'activerecord-jdbcsqlite3-adapter', '~> 61.1', platform: :jruby
30-
gem 'bootsnap', '>= 1.4.4'
31-
gem 'drb', '~> 2.2' if min_ruby_version.call('3.4')
32-
gem 'mutex_m', '~> 0.2.0' if min_ruby_version.call('3.4')
33-
gem 'psych', '>= 4'
34-
gem 'rails', '~> 6.1.0'
35-
gem 'rspec-rails', '~> 5.0'
36-
gem 'sqlite3', '~> 1', platform: :ruby
37-
gem 'benchmark'
38-
end
39-
40-
# Rails 7.0 require Ruby > 2.7
41-
if min_ruby_version.call('2.7') || RUBY_ENGINE != 'ruby'
42-
appraise 'rails-7.0' do
43-
gem 'activerecord-jdbcsqlite3-adapter', '~> 70.1', platform: :jruby
44-
gem 'bootsnap', '>= 1.4.4'
45-
gem 'drb', '~> 2.2' if min_ruby_version.call('3.4')
46-
gem 'mutex_m', '~> 0.2.0' if min_ruby_version.call('3.4')
47-
gem 'psych', '>= 4'
48-
gem 'rails', '~> 7.0.0'
49-
gem 'rspec-rails', '~> 7.0'
50-
gem 'sprockets-rails', '~> 3.5.2'
51-
gem 'sqlite3', '~> 1', platform: :ruby
52-
end
53-
end
54-
55-
# Rails 7.1 require Ruby > 2.7
56-
if min_ruby_version.call('2.7')
57-
appraise 'rails-7.1' do
9+
# Rails 8.0 requires Ruby > 3.2
10+
if min_ruby_version.call('3.2.0')
11+
appraise 'rails-8.0' do
5812
gem 'activerecord-jdbcsqlite3-adapter', '~> 71.0', platform: :jruby
5913
gem 'bootsnap', '>= 1.16.0'
14+
gem 'kamal', '~> 2.7.0'
15+
gem 'rails', '~> 8.0.0'
16+
gem 'rspec-rails', '~> 8.0'
6017
gem 'psych', '>= 4'
61-
gem 'rails', '~> 7.1.0'
62-
gem 'rspec-rails', '~> 7.0'
63-
gem 'sprockets-rails', '~> 3.5.2'
64-
gem 'sqlite3', '~> 1', platform: :ruby
18+
gem 'sqlite3', '>= 2.1', platform: :ruby
6519
end
6620

67-
end
68-
69-
# Rails 7.2 requires Ruby > 3.1
70-
if min_ruby_version.call('3.1.0')
21+
# Rails 7.2 requires Ruby > 3.1 but 3.1 is EOL.
7122
appraise 'rails-7.2' do
7223
gem 'activerecord-jdbcsqlite3-adapter', '~> 71.0', platform: :jruby
7324
gem 'bootsnap', '>= 1.16.0'
@@ -79,19 +30,6 @@ if min_ruby_version.call('3.1.0')
7930
end
8031
end
8132

82-
# Rails 8.0 requires Ruby > 3.2
83-
if min_ruby_version.call('3.2.0')
84-
appraise 'rails-8.0' do
85-
gem 'activerecord-jdbcsqlite3-adapter', '~> 71.0', platform: :jruby
86-
gem 'bootsnap', '>= 1.16.0'
87-
gem 'kamal', '~> 2.7.0'
88-
gem 'rails', '~> 8.0.0'
89-
gem 'rspec-rails', '~> 8.0'
90-
gem 'psych', '>= 4'
91-
gem 'sqlite3', '>= 2.1', platform: :ruby
92-
end
93-
end
94-
9533
# Rails 8.1 requires Ruby > 3.3
9634
if min_ruby_version.call('3.3.0')
9735
appraise 'rails-8.1' do
@@ -106,5 +44,5 @@ if min_ruby_version.call('3.3.0')
10644
end
10745

10846
appraise 'sinatra' do
109-
gem 'sinatra', '2.0.8.1'
47+
gem 'sinatra', '~> 4.2.0'
11048
end

README.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,22 @@ Config helps you easily manage environment specific settings in an easy and usab
2323
Current version supports and is [tested](.github/workflows/tests.yml#L19) for the following interpreters and frameworks:
2424

2525
* Interpreters
26-
* [Ruby](https://www.ruby-lang.org) `>= 2.6`
26+
* [Ruby](https://www.ruby-lang.org) `>= 3.6`
2727
* [JRuby](https://www.jruby.org) `>= 9.2`
2828
* [TruffleRuby](https://github.com/oracle/truffleruby) `>= 19.3`
2929
* Application frameworks
30-
* Rails `>= 5.2`
30+
* Rails `>= 7.2`
3131
* Padrino
32-
* Sinatra
32+
* Sinatra `>= 4.2.0`
3333

34-
For Ruby `2.0` to `2.3` or Rails `3` to `4.1` use version `1.x` of this gem. For older versions of Rails or Ruby use [AppConfig](http://github.com/fredwu/app_config).
34+
| Ruby | Rails | Config |
35+
|---|---|---|
36+
| >= 3.2 | >= 7.2 | 6.x |
37+
| < 3.2 | < 7.2 | 5.x |
38+
| 2.4–2.5 | 4.2–5.1 | 3.x |
39+
| 2.0–2.3 | 3.0–4.1 | 1.x |
3540

36-
For Ruby `2.4` or `2.5` or Rails `4.2`, `5.0`, or `5.1` use version `3.x` of this gem.
41+
For older versions of Rails or Ruby use [AppConfig](http://github.com/fredwu/app_config).
3742

3843
## Installing
3944

config.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
2525
s.files.select! { |file| /(^lib\/|^\w+.md$|\.gemspec$)/ =~ file }
2626

2727
s.require_paths = ['lib']
28-
s.required_ruby_version = '>= 2.6.0'
28+
s.required_ruby_version = '>= 3.2.0'
2929

3030
s.add_dependency 'deep_merge', '~> 1.2', '>= 1.2.1'
3131
s.add_dependency 'ostruct'

spec/app/rails_5.2/Gemfile

Lines changed: 0 additions & 59 deletions
This file was deleted.

spec/app/rails_5.2/README.md

Lines changed: 0 additions & 24 deletions
This file was deleted.

spec/app/rails_5.2/Rakefile

Lines changed: 0 additions & 6 deletions
This file was deleted.

spec/app/rails_5.2/app/assets/config/manifest.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

spec/app/rails_5.2/app/assets/javascripts/application.js

Lines changed: 0 additions & 16 deletions
This file was deleted.

spec/app/rails_5.2/app/assets/javascripts/cable.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)