Skip to content

Commit 5688da5

Browse files
flavorjonesflavorjones
authored
Merge pull request #124 from rails/flavorjones-dep-logger-fix
CI: insert Rails 7.2 and 8.0 coverage, update dependencies
2 parents da0d96b + 9cad72e commit 5688da5

7 files changed

+88
-51
lines changed

‎.github/workflows/ci.yml

+17-4
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,35 @@ jobs:
5656
- { activesupport: "7.0", ruby: "3.1" }
5757
- { activesupport: "7.0", ruby: "3.2" }
5858
- { activesupport: "7.0", ruby: "3.3" }
59-
- { activesupport: "7.0", ruby: "ruby-head" }
59+
- { activesupport: "7.0", ruby: "3.4" }
6060
- { activesupport: "7.0", ruby: "jruby" }
6161
# rails 7.1
6262
- { activesupport: "7.1", ruby: "2.7" }
6363
- { activesupport: "7.1", ruby: "3.0" }
6464
- { activesupport: "7.1", ruby: "3.1" }
6565
- { activesupport: "7.1", ruby: "3.2" }
6666
- { activesupport: "7.1", ruby: "3.3" }
67-
- { activesupport: "7.1", ruby: "ruby-head" }
67+
- { activesupport: "7.1", ruby: "3.4" }
6868
- { activesupport: "7.1", ruby: "jruby" }
6969
# rails 7.2
70-
- { activesupport: "edge", ruby: "3.1" }
70+
- { activesupport: "7.2", ruby: "3.1" }
71+
- { activesupport: "7.2", ruby: "3.2" }
72+
- { activesupport: "7.2", ruby: "3.3" }
73+
- { activesupport: "7.2", ruby: "3.4" }
74+
- { activesupport: "7.2", ruby: "ruby-head" }
75+
- { activesupport: "7.2", ruby: "jruby" }
76+
# rails 8.0
77+
- { activesupport: "8.0", ruby: "3.2" }
78+
- { activesupport: "8.0", ruby: "3.3" }
79+
- { activesupport: "8.0", ruby: "3.4" }
80+
- { activesupport: "8.0", ruby: "ruby-head" }
81+
# - { activesupport: "8.0", ruby: "jruby" } # uncomment once jruby reports "ruby >= 3.2"
82+
# rails 8.1
7183
- { activesupport: "edge", ruby: "3.2" }
7284
- { activesupport: "edge", ruby: "3.3" }
85+
- { activesupport: "edge", ruby: "3.4" }
7386
- { activesupport: "edge", ruby: "ruby-head" }
74-
- { activesupport: "edge", ruby: "jruby" }
87+
# - { activesupport: "edge", ruby: "jruby" } # uncomment once jruby reports "ruby >= 3.2"
7588
env:
7689
BUNDLE_GEMFILE: gemfiles/active_support_${{ matrix.activesupport }}.gemfile
7790
steps:

‎Gemfile.lock

+52-43
Original file line numberDiff line numberDiff line change
@@ -9,74 +9,83 @@ PATH
99
GEM
1010
remote: https://rubygems.org/
1111
specs:
12-
activesupport (7.1.2)
12+
activesupport (8.0.1)
1313
base64
14+
benchmark (>= 0.3)
1415
bigdecimal
15-
concurrent-ruby (~> 1.0, >= 1.0.2)
16+
concurrent-ruby (~> 1.0, >= 1.3.1)
1617
connection_pool (>= 2.2.5)
1718
drb
1819
i18n (>= 1.6, < 2)
20+
logger (>= 1.4.2)
1921
minitest (>= 5.1)
20-
mutex_m
21-
tzinfo (~> 2.0)
22+
securerandom (>= 0.3)
23+
tzinfo (~> 2.0, >= 2.0.5)
24+
uri (>= 0.13.1)
2225
ast (2.4.2)
2326
base64 (0.2.0)
24-
bigdecimal (3.1.5)
25-
concurrent-ruby (1.2.2)
26-
connection_pool (2.4.1)
27-
drb (2.2.0)
28-
ruby2_keywords
29-
i18n (1.14.1)
27+
benchmark (0.4.0)
28+
bigdecimal (3.1.9)
29+
concurrent-ruby (1.3.5)
30+
connection_pool (2.5.0)
31+
drb (2.2.1)
32+
i18n (1.14.7)
3033
concurrent-ruby (~> 1.0)
31-
json (2.7.1)
32-
language_server-protocol (3.17.0.3)
33-
minitest (5.21.1)
34-
mutex_m (0.2.0)
35-
nokogiri (1.16.0-aarch64-linux)
34+
json (2.10.1)
35+
language_server-protocol (3.17.0.4)
36+
lint_roller (1.1.0)
37+
logger (1.6.6)
38+
minitest (5.25.4)
39+
nokogiri (1.18.3-aarch64-linux-gnu)
3640
racc (~> 1.4)
37-
nokogiri (1.16.0-x86_64-linux)
41+
nokogiri (1.18.3-x86_64-linux-gnu)
3842
racc (~> 1.4)
39-
parallel (1.24.0)
40-
parser (3.3.0.3)
43+
parallel (1.26.3)
44+
parser (3.3.7.1)
4145
ast (~> 2.4.1)
4246
racc
43-
racc (1.7.3)
44-
rack (3.0.8)
47+
racc (1.8.1)
48+
rack (3.1.11)
4549
rainbow (3.1.1)
46-
rake (13.1.0)
47-
regexp_parser (2.9.0)
48-
rexml (3.2.6)
49-
rubocop (1.59.0)
50+
rake (13.2.1)
51+
regexp_parser (2.10.0)
52+
rubocop (1.73.2)
5053
json (~> 2.3)
51-
language_server-protocol (>= 3.17.0)
54+
language_server-protocol (~> 3.17.0.2)
55+
lint_roller (~> 1.1.0)
5256
parallel (~> 1.10)
53-
parser (>= 3.2.2.4)
57+
parser (>= 3.3.0.2)
5458
rainbow (>= 2.2.2, < 4.0)
55-
regexp_parser (>= 1.8, < 3.0)
56-
rexml (>= 3.2.5, < 4.0)
57-
rubocop-ast (>= 1.30.0, < 2.0)
59+
regexp_parser (>= 2.9.3, < 3.0)
60+
rubocop-ast (>= 1.38.0, < 2.0)
5861
ruby-progressbar (~> 1.7)
59-
unicode-display_width (>= 2.4.0, < 3.0)
60-
rubocop-ast (1.30.0)
61-
parser (>= 3.2.1.0)
62-
rubocop-minitest (0.34.4)
63-
rubocop (>= 1.39, < 2.0)
64-
rubocop-ast (>= 1.30.0, < 2.0)
62+
unicode-display_width (>= 2.4.0, < 4.0)
63+
rubocop-ast (1.38.1)
64+
parser (>= 3.3.1.0)
65+
rubocop-minitest (0.37.1)
66+
lint_roller (~> 1.1)
67+
rubocop (>= 1.72.1, < 2.0)
68+
rubocop-ast (>= 1.38.0, < 2.0)
6569
rubocop-packaging (0.5.2)
6670
rubocop (>= 1.33, < 2.0)
67-
rubocop-performance (1.20.2)
68-
rubocop (>= 1.48.1, < 2.0)
69-
rubocop-ast (>= 1.30.0, < 2.0)
70-
rubocop-rails (2.23.1)
71+
rubocop-performance (1.24.0)
72+
lint_roller (~> 1.1)
73+
rubocop (>= 1.72.1, < 2.0)
74+
rubocop-ast (>= 1.38.0, < 2.0)
75+
rubocop-rails (2.30.3)
7176
activesupport (>= 4.2.0)
77+
lint_roller (~> 1.1)
7278
rack (>= 1.1)
73-
rubocop (>= 1.33.0, < 2.0)
74-
rubocop-ast (>= 1.30.0, < 2.0)
79+
rubocop (>= 1.72.1, < 2.0)
80+
rubocop-ast (>= 1.38.0, < 2.0)
7581
ruby-progressbar (1.13.0)
76-
ruby2_keywords (0.0.5)
82+
securerandom (0.4.1)
7783
tzinfo (2.0.6)
7884
concurrent-ruby (~> 1.0)
79-
unicode-display_width (2.5.0)
85+
unicode-display_width (3.1.4)
86+
unicode-emoji (~> 4.0, >= 4.0.4)
87+
unicode-emoji (4.0.4)
88+
uri (1.0.3)
8089

8190
PLATFORMS
8291
aarch64-linux

‎gemfiles/active_support_6.0.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ source "https://rubygems.org"
44

55
gem "activesupport", "~> 6.0.0"
66

7-
gem "nokogiri", ">= 1.7.0"
7+
gem "concurrent-ruby", "1.3.4" # to avoid the logger issue
88

99
gemspec path: "../"

‎gemfiles/active_support_6.1.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ source "https://rubygems.org"
44

55
gem "activesupport", "~> 6.1.0"
66

7-
gem "nokogiri", ">= 1.7.0"
7+
gem "concurrent-ruby", "1.3.4" # to avoid the logger issue
88

99
gemspec path: "../"

‎gemfiles/active_support_7.0.gemfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ source "https://rubygems.org"
44

55
gem "activesupport", "~> 7.0.0"
66

7-
gem "nokogiri", ">= 1.7.0"
8-
gem "mutex_m" # for ruby 3.4.0-dev
7+
gem "mutex_m" # for ruby 3.4.0
8+
gem "drb" # for ruby 3.4.0
9+
gem "concurrent-ruby", "1.3.4" # to avoid the logger issue
910

1011
gemspec path: "../"

‎gemfiles/active_support_7.2.gemfile

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# frozen_string_literal: true
2+
3+
source "https://rubygems.org"
4+
5+
gem "activesupport", "~> 7.2.0"
6+
7+
gemspec path: "../"

‎gemfiles/active_support_8.0.gemfile

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# frozen_string_literal: true
2+
3+
source "https://rubygems.org"
4+
5+
gem "activesupport", "~> 8.0.0"
6+
7+
gemspec path: "../"

0 commit comments

Comments
 (0)