Skip to content

Commit 0e75637

Browse files
authored
Merge pull request #134 from Fryguy/update_rubies_rails
Add Ruby 3.4+, Rails 7.2+; Drop Ruby < 3.1, Rails < 7.2
2 parents f00a8e1 + d3f1f1c commit 0e75637

File tree

4 files changed

+17
-24
lines changed

4 files changed

+17
-24
lines changed

.github/workflows/ci.yaml

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,21 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
ruby-version:
23-
- '2.7'
24-
- '3.0'
2523
- '3.1'
2624
- '3.2'
2725
- '3.3'
26+
- '3.4'
27+
- '4.0'
28+
- ruby-head
2829
rails-version:
29-
- '6.0'
30-
- '6.1'
31-
- '7.0'
32-
- '7.1'
33-
include:
34-
- ruby-version: '2.5'
35-
rails-version: '6.0'
36-
- ruby-version: '2.5'
37-
rails-version: '6.1'
38-
- ruby-version: '2.6'
39-
rails-version: '6.0'
40-
- ruby-version: '2.6'
41-
rails-version: '6.1'
30+
- '7.2'
31+
- '8.0'
32+
- '8.1'
33+
exclude:
4234
- ruby-version: '3.1'
43-
rails-version: '7.2'
44-
- ruby-version: '3.2'
45-
rails-version: '7.2'
46-
- ruby-version: '3.3'
47-
rails-version: '7.2'
35+
rails-version: '8.1'
36+
- ruby-version: '3.1'
37+
rails-version: '8.0'
4838
env:
4939
TEST_RAILS_VERSION: "${{ matrix.rails-version }}"
5040
steps:

Gemfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ require File.join(Bundler::Plugin.index.load_paths("bundler-inject")[0], "bundle
77
gemspec
88

99
minimum_version =
10-
case ENV.fetch("TEST_RAILS_VERSION", "7.2")
10+
case ENV.fetch("TEST_RAILS_VERSION", "8.0")
11+
when "8.1"
12+
"~>8.1.2"
13+
when "8.0"
14+
"~>8.0.4"
1115
when "7.2"
1216
"~>7.2.2"
1317
when "7.1"
@@ -16,8 +20,6 @@ minimum_version =
1620
"~>7.0.8"
1721
when "6.1"
1822
"~>6.1.7"
19-
when "6.0"
20-
"~>6.0.6"
2123
else
2224
raise "Unexpected Rails version #{ENV['TEST_RAILS_VERSION'].inspect}"
2325
end

more_core_extensions.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
2323
spec.required_ruby_version = ">= 2.0.0"
2424

2525
spec.add_runtime_dependency "activesupport"
26+
spec.add_runtime_dependency "benchmark"
2627
spec.add_runtime_dependency "sync"
2728

2829
spec.add_development_dependency "bundler"

spec/core_ext/string/to_i_with_method_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
end
3434

3535
it 'raises NoMethodError on private methods' do
36-
expect { "1.raise".to_i_with_method }.to raise_error(NoMethodError, /private method `raise' called/)
36+
expect { "1.raise".to_i_with_method }.to raise_error(NoMethodError, /private method [`']raise' called/)
3737
end
3838
end
3939

0 commit comments

Comments
 (0)