Skip to content

Commit 3bab672

Browse files
author
Alex Evanczuk
authored
Upgrade bundler and gems (#73)
* Upgrade bundler and gems * bundle lock --add-platform x86_64-linux * stop testing head: nokogiri-1.15.3-x86_64-linux requires ruby version < 3.3.dev, >= 2.7, which is incompatible with the current version, 3.3.0.dev * downgrade spoom for CI * tc
1 parent e2f4e3d commit 3bab672

File tree

4 files changed

+63
-71
lines changed

4 files changed

+63
-71
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ jobs:
1313
# Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
1414
- '3.0'
1515
- 3.1
16-
- head
1716
env:
1817
BUNDLE_GEMFILE: Gemfile
1918
name: "RSpec tests: Ruby ${{ matrix.ruby }}"
@@ -35,6 +34,6 @@ jobs:
3534
uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
3635
with:
3736
bundler-cache: true
38-
ruby-version: head
37+
ruby-version: 3.1
3938
- name: Run static type checks
4039
run: bundle exec srb tc

Gemfile.lock

Lines changed: 60 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -9,56 +9,52 @@ PATH
99
GEM
1010
remote: https://rubygems.org/
1111
specs:
12-
actionpack (7.0.4.3)
13-
actionview (= 7.0.4.3)
14-
activesupport (= 7.0.4.3)
15-
rack (~> 2.0, >= 2.2.0)
12+
actionpack (7.0.6)
13+
actionview (= 7.0.6)
14+
activesupport (= 7.0.6)
15+
rack (~> 2.0, >= 2.2.4)
1616
rack-test (>= 0.6.3)
1717
rails-dom-testing (~> 2.0)
1818
rails-html-sanitizer (~> 1.0, >= 1.2.0)
19-
actionview (7.0.4.3)
20-
activesupport (= 7.0.4.3)
19+
actionview (7.0.6)
20+
activesupport (= 7.0.6)
2121
builder (~> 3.1)
2222
erubi (~> 1.4)
2323
rails-dom-testing (~> 2.0)
2424
rails-html-sanitizer (~> 1.1, >= 1.2.0)
25-
activesupport (7.0.4.3)
25+
activesupport (7.0.6)
2626
concurrent-ruby (~> 1.0, >= 1.0.2)
2727
i18n (>= 1.6, < 2)
2828
minitest (>= 5.1)
2929
tzinfo (~> 2.0)
3030
ast (2.4.2)
31-
better_html (2.0.1)
31+
better_html (2.0.2)
3232
actionview (>= 6.0)
3333
activesupport (>= 6.0)
3434
ast (~> 2.0)
3535
erubi (~> 1.4)
3636
parser (>= 2.4)
3737
smart_properties
3838
builder (3.2.4)
39-
code_teams (1.0.1)
39+
code_teams (1.0.2)
4040
sorbet-runtime
4141
coderay (1.1.3)
4242
concurrent-ruby (1.2.2)
4343
constant_resolver (0.2.0)
4444
crass (1.0.6)
4545
diff-lcs (1.5.0)
4646
erubi (1.12.0)
47-
i18n (1.13.0)
47+
i18n (1.14.1)
4848
concurrent-ruby (~> 1.0)
49-
loofah (2.21.2)
49+
loofah (2.21.3)
5050
crass (~> 1.0.2)
5151
nokogiri (>= 1.12.0)
5252
method_source (1.0.0)
53-
mini_portile2 (2.8.2)
54-
minitest (5.18.0)
53+
minitest (5.19.0)
5554
netrc (0.11.0)
56-
nokogiri (1.14.4)
57-
mini_portile2 (~> 2.8.0)
55+
nokogiri (1.15.3-arm64-darwin)
5856
racc (~> 1.4)
59-
nokogiri (1.14.4-arm64-darwin)
60-
racc (~> 1.4)
61-
nokogiri (1.14.4-x86_64-darwin)
57+
nokogiri (1.15.3-x86_64-linux)
6258
racc (~> 1.4)
6359
packs (0.0.6)
6460
sorbet-runtime
@@ -73,68 +69,68 @@ GEM
7369
sorbet-runtime (>= 0.5.9914)
7470
zeitwerk (>= 2.6.1)
7571
parallel (1.23.0)
76-
parser (3.2.2.1)
72+
parser (3.2.2.3)
7773
ast (~> 2.4.1)
78-
pry (0.14.1)
74+
racc
75+
prettier_print (1.2.1)
76+
pry (0.14.2)
7977
coderay (~> 1.1)
8078
method_source (~> 1.0)
81-
racc (1.6.2)
82-
rack (2.2.7)
79+
racc (1.7.1)
80+
rack (2.2.8)
8381
rack-test (2.1.0)
8482
rack (>= 1.3)
85-
rails-dom-testing (2.0.3)
86-
activesupport (>= 4.2.0)
83+
rails-dom-testing (2.2.0)
84+
activesupport (>= 5.0.0)
85+
minitest
8786
nokogiri (>= 1.6)
88-
rails-html-sanitizer (1.5.0)
89-
loofah (~> 2.19, >= 2.19.1)
90-
railties (7.0.4.3)
91-
actionpack (= 7.0.4.3)
92-
activesupport (= 7.0.4.3)
87+
rails-html-sanitizer (1.6.0)
88+
loofah (~> 2.21)
89+
nokogiri (~> 1.14)
90+
railties (7.0.6)
91+
actionpack (= 7.0.6)
92+
activesupport (= 7.0.6)
9393
method_source
9494
rake (>= 12.2)
9595
thor (~> 1.0)
9696
zeitwerk (~> 2.5)
9797
rake (13.0.6)
98-
rbi (0.0.16)
98+
rbi (0.0.17)
9999
ast
100-
parser (>= 2.6.4.0)
100+
parser (>= 3.0.0)
101101
sorbet-runtime (>= 0.5.9204)
102-
unparser
103-
rspec (3.10.0)
104-
rspec-core (~> 3.10.0)
105-
rspec-expectations (~> 3.10.0)
106-
rspec-mocks (~> 3.10.0)
107-
rspec-core (3.10.1)
108-
rspec-support (~> 3.10.0)
109-
rspec-expectations (3.10.1)
102+
unparser (>= 0.5.6)
103+
rspec (3.12.0)
104+
rspec-core (~> 3.12.0)
105+
rspec-expectations (~> 3.12.0)
106+
rspec-mocks (~> 3.12.0)
107+
rspec-core (3.12.2)
108+
rspec-support (~> 3.12.0)
109+
rspec-expectations (3.12.3)
110110
diff-lcs (>= 1.2.0, < 2.0)
111-
rspec-support (~> 3.10.0)
112-
rspec-mocks (3.10.2)
111+
rspec-support (~> 3.12.0)
112+
rspec-mocks (3.12.6)
113113
diff-lcs (>= 1.2.0, < 2.0)
114-
rspec-support (~> 3.10.0)
115-
rspec-support (3.10.2)
114+
rspec-support (~> 3.12.0)
115+
rspec-support (3.12.1)
116116
smart_properties (1.17.0)
117-
sorbet (0.5.10821)
118-
sorbet-static (= 0.5.10821)
119-
sorbet-runtime (0.5.10821)
120-
sorbet-static (0.5.10821-universal-darwin-14)
121-
sorbet-static (0.5.10821-universal-darwin-15)
122-
sorbet-static (0.5.10821-universal-darwin-16)
123-
sorbet-static (0.5.10821-universal-darwin-17)
124-
sorbet-static (0.5.10821-universal-darwin-18)
125-
sorbet-static (0.5.10821-universal-darwin-19)
126-
sorbet-static (0.5.10821-universal-darwin-20)
127-
sorbet-static (0.5.10821-universal-darwin-21)
128-
sorbet-static (0.5.10821-universal-darwin-22)
129-
sorbet-static (0.5.10821-x86_64-linux)
130-
sorbet-static-and-runtime (0.5.10821)
131-
sorbet (= 0.5.10821)
132-
sorbet-runtime (= 0.5.10821)
117+
sorbet (0.5.10950)
118+
sorbet-static (= 0.5.10950)
119+
sorbet-runtime (0.5.10950)
120+
sorbet-static (0.5.10950-universal-darwin-22)
121+
sorbet-static (0.5.10950-x86_64-linux)
122+
sorbet-static-and-runtime (0.5.10950)
123+
sorbet (= 0.5.10950)
124+
sorbet-runtime (= 0.5.10950)
133125
spoom (1.2.1)
126+
erubi (>= 1.10.0)
134127
sorbet (>= 0.5.10187)
135128
sorbet-runtime (>= 0.5.9204)
129+
syntax_tree (>= 6.1.1)
136130
thor (>= 0.19.2)
137-
tapioca (0.11.6)
131+
syntax_tree (6.1.1)
132+
prettier_print (>= 1.2.0)
133+
tapioca (0.11.8)
138134
bundler (>= 2.2.25)
139135
netrc (>= 0.11.0)
140136
parallel (>= 1.21.0)
@@ -146,20 +142,17 @@ GEM
146142
thor (1.2.2)
147143
tzinfo (2.0.6)
148144
concurrent-ruby (~> 1.0)
149-
unparser (0.6.7)
145+
unparser (0.6.8)
150146
diff-lcs (~> 1.3)
151147
parser (>= 3.2.0)
152148
yard (0.9.34)
153149
yard-sorbet (0.8.1)
154150
sorbet-runtime (>= 0.5)
155151
yard (>= 0.9)
156-
zeitwerk (2.6.8)
152+
zeitwerk (2.6.11)
157153

158154
PLATFORMS
159-
arm64-darwin-20
160-
arm64-darwin-21
161-
ruby
162-
x86_64-darwin-20
155+
arm64-darwin-22
163156
x86_64-linux
164157

165158
DEPENDENCIES
@@ -173,4 +166,4 @@ DEPENDENCIES
173166
tapioca
174167

175168
BUNDLED WITH
176-
2.3.8
169+
2.4.18

lib/code_ownership.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ def backtrace_with_ownership(backtrace)
156156
end
157157
private_class_method(:backtrace_with_ownership)
158158

159-
sig { params(klass: T.nilable(T.any(Class, Module))).returns(T.nilable(::CodeTeams::Team)) }
159+
sig { params(klass: T.nilable(T.any(T::Class[T.anything], Module))).returns(T.nilable(::CodeTeams::Team)) }
160160
def for_class(klass)
161161
@memoized_values ||= T.let(@memoized_values, T.nilable(T::Hash[String, T.nilable(::CodeTeams::Team)]))
162162
@memoized_values ||= {}

lib/code_ownership/private.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def self.validate!(files:, autocorrect: true, stage_changes: true)
6262

6363
# Returns a string version of the relative path to a Rails constant,
6464
# or nil if it can't find something
65-
sig { params(klass: T.nilable(T.any(Class, Module))).returns(T.nilable(String)) }
65+
sig { params(klass: T.nilable(T.any(T::Class[T.anything], Module))).returns(T.nilable(String)) }
6666
def self.path_from_klass(klass)
6767
if klass
6868
path = Object.const_source_location(klass.to_s)&.first

0 commit comments

Comments
 (0)