Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update development dependencies and light Rubocop'ing #1136

Merged
merged 2 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ updates:
directory: "/"
schedule:
interval: "monthly"
groups:
bundler-dependencies:
patterns:
- "*"
- package-ecosystem: github-actions
directory: "/"
schedule:
Expand Down
116 changes: 56 additions & 60 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -100,23 +100,23 @@ GEM
rake
thor (>= 0.14.0)
ast (2.4.2)
async (2.6.4)
async (2.6.5)
console (~> 1.10)
fiber-annotation
io-event (~> 1.1)
timers (~> 4.1)
async-http (0.60.2)
async-http (0.61.0)
async (>= 1.25)
async-io (>= 1.28)
async-pool (>= 0.2)
protocol-http (~> 0.24.0)
protocol-http1 (~> 0.15.0)
protocol-http (~> 0.25.0)
protocol-http1 (~> 0.16.0)
protocol-http2 (~> 0.15.0)
traces (>= 0.10.0)
async-http-faraday (0.12.0)
async-http (~> 0.42)
faraday
async-io (1.36.0)
async-io (1.36.1)
async
async-pool (0.4.0)
async (>= 1.25)
Expand All @@ -142,7 +142,7 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
chef-utils (18.2.7)
chef-utils (18.3.0)
concurrent-ruby
coderay (1.1.3)
concurrent-ruby (1.2.2)
Expand Down Expand Up @@ -170,18 +170,19 @@ GEM
erubi (1.12.0)
et-orbi (1.2.7)
tzinfo
faraday (2.7.10)
faraday (2.7.11)
base64
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-http-cache (2.5.0)
faraday (>= 0.8)
faraday-net_http (3.0.2)
ffi (1.15.5)
ffi (1.15.5-java)
ffi (1.16.3)
ffi (1.16.3-java)
fiber-annotation (0.2.0)
fiber-local (1.0.0)
foreman (0.87.2)
fugit (1.8.1)
fugit (1.9.0)
et-orbi (~> 1, >= 1.2.7)
raabro (~> 1.4)
gem-release (2.2.2)
Expand All @@ -199,21 +200,21 @@ GEM
highline (2.1.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
i18n-tasks (1.0.12)
i18n-tasks (1.0.13)
activesupport (>= 4.0.2)
ast (>= 2.1.0)
better_html (>= 1.0, < 3.0)
erubi
highline (>= 2.0.0)
i18n
parser (>= 2.2.3.0)
parser (>= 3.2.2.1)
rails-i18n
rainbow (>= 2.2.2, < 4.0)
terminal-table (>= 1.5.1)
io-console (0.6.0)
io-console (0.6.0-java)
io-event (1.3.2)
irb (1.8.1)
io-event (1.3.3)
irb (1.8.3)
rdoc
reline (>= 0.3.8)
jar-dependencies (0.4.1)
Expand All @@ -235,7 +236,7 @@ GEM
net-smtp
marcel (1.0.2)
matrix (0.4.2)
mdl (0.12.0)
mdl (0.13.0)
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.1)
mixlib-cli (~> 2.1, >= 2.1.1)
Expand All @@ -253,7 +254,7 @@ GEM
msgpack (1.7.2-java)
multi_json (1.15.0)
mutex_m (0.1.2)
net-imap (0.4.1)
net-imap (0.4.3)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -278,14 +279,15 @@ GEM
sawyer (~> 0.9)
optimist (3.1.0)
parallel (1.23.0)
parser (3.2.2.3)
parser (3.2.2.4)
ast (~> 2.4.1)
racc
pg (1.5.4)
prettier_print (1.2.1)
prism (0.16.0)
protocol-hpack (1.4.2)
protocol-http (0.24.7)
protocol-http1 (0.15.1)
protocol-http (0.25.0)
protocol-http1 (0.16.0)
protocol-http (~> 0.22)
protocol-http2 (0.15.1)
protocol-hpack (~> 1.4)
Expand All @@ -302,18 +304,18 @@ GEM
pry (>= 0.13, < 0.15)
pry-rails (0.3.9)
pry (>= 0.10.4)
psych (5.1.0)
psych (5.1.1.1)
stringio
psych (5.1.0-java)
psych (5.1.1.1-java)
jar-dependencies (>= 0.1.7)
public_suffix (5.0.3)
puma (5.6.7)
nio4r (~> 2.0)
puma (5.6.7-java)
nio4r (~> 2.0)
raabro (1.4.0)
racc (1.7.1)
racc (1.7.1-java)
racc (1.7.2)
racc (1.7.2-java)
rack (2.2.8)
rack-mini-profiler (3.1.1)
rack (>= 1.2.0)
Expand Down Expand Up @@ -357,19 +359,17 @@ GEM
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.0.6)
rbi (0.0.17)
ast
parser (>= 3.0.0)
rake (13.1.0)
rbi (0.1.2)
prism (>= 0.15.1)
sorbet-runtime (>= 0.5.9204)
unparser (>= 0.5.6)
rbtrace (0.4.14)
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rdoc (6.5.0)
psych (>= 4.0.0)
regexp_parser (2.8.1)
regexp_parser (2.8.2)
reline (0.3.9)
io-console (~> 0.5)
rexml (3.2.6)
Expand All @@ -390,33 +390,32 @@ GEM
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
rspec-support (3.12.1)
rubocop (1.56.3)
base64 (~> 0.1.1)
rubocop (1.57.2)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.2.3)
parser (>= 3.2.2.4)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.29.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-capybara (2.18.0)
rubocop-capybara (2.19.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.23.1)
rubocop-factory_bot (2.24.0)
rubocop (~> 1.33)
rubocop-performance (1.19.0)
rubocop-performance (1.19.1)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.21.0)
rubocop-rails (2.22.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-rspec (2.24.0)
rubocop (~> 1.33)
rubocop-rspec (2.25.0)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
ruby-progressbar (1.13.0)
Expand All @@ -425,23 +424,23 @@ GEM
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
selenium-webdriver (4.12.0)
selenium-webdriver (4.15.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
skylight (5.3.4)
skylight (6.0.1)
activesupport (>= 5.2.0)
smart_properties (1.17.0)
sorbet (0.5.11011)
sorbet-static (= 0.5.11011)
sorbet-runtime (0.5.11011)
sorbet-static (0.5.11011-java)
sorbet-static (0.5.11011-universal-darwin)
sorbet-static (0.5.11011-x86_64-linux)
sorbet-static-and-runtime (0.5.11011)
sorbet (= 0.5.11011)
sorbet-runtime (= 0.5.11011)
spoom (1.2.3)
sorbet (0.5.11109)
sorbet-static (= 0.5.11109)
sorbet-runtime (0.5.11109)
sorbet-static (0.5.11109-java)
sorbet-static (0.5.11109-universal-darwin)
sorbet-static (0.5.11109-x86_64-linux)
sorbet-static-and-runtime (0.5.11109)
sorbet (= 0.5.11109)
sorbet-runtime (= 0.5.11109)
spoom (1.2.4)
erubi (>= 1.10.0)
sorbet-static-and-runtime (>= 0.5.10187)
syntax_tree (>= 6.1.1)
Expand All @@ -450,20 +449,20 @@ GEM
ffi
stackprof (0.2.25)
stringio (3.0.8)
syntax_tree (6.1.1)
syntax_tree (6.2.0)
prettier_print (>= 1.2.0)
tapioca (0.11.8)
tapioca (0.11.10)
bundler (>= 2.2.25)
netrc (>= 0.11.0)
parallel (>= 1.21.0)
rbi (~> 0.0.0, >= 0.0.16)
rbi (~> 0.1.0, >= 0.1.0)
sorbet-static-and-runtime (>= 0.5.10187)
spoom (~> 1.2.0, >= 1.2.0)
thor (>= 1.2.0)
yard-sorbet
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.2.2)
thor (1.3.0)
thread (0.2.2)
thread_safe (0.3.6)
thread_safe (0.3.6-java)
Expand All @@ -473,12 +472,9 @@ GEM
traces (0.11.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.4.2)
unparser (0.6.8)
diff-lcs (~> 1.3)
parser (>= 3.2.0)
unicode-display_width (2.5.0)
webrick (1.8.1)
websocket (1.2.9)
websocket (1.2.10)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-driver (0.7.6-java)
Expand Down
10 changes: 6 additions & 4 deletions bin/lint
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ FileUtils.chdir GEM_ROOT do

system! "bundle exec srb tc", failure: <<~MESSAGE
You may need to run one of the following commands
- bin/tapioca todo # generate RBI files for unresolved constants (e.g. RSpec `stub_const`)
- bin/tapioca dsl # generate RBIs for dynamic methods
- bin/tapioca gem # generate RBIs for gems
- bin/tapioca check-shims # check duplicated definitions in shim RBIs
1. Regenerate gem RBIs by running `bin/tapioca gem --all` and `bin/tapioca annotations`
2. Generate RBIs for DSLs by running `bin/tapioca dsl`
3. If the missing constants are defined in files that a gem does not load by default,
manually require those files in `sorbet/tapioca/require.rb` and regenerate gem RBIs
4. Manually create an RBI shim defining the missing constants
5. Add files to sorbet/rbi/todo.rbi or `bin/tapioca todo` (though that's being deprecated)
MESSAGE

puts "\n== Rubocop =="
Expand Down
1 change: 1 addition & 0 deletions sorbet/rbi/annotations/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**/*.rbi linguist-vendored=true
2 changes: 1 addition & 1 deletion sorbet/rbi/annotations/actionmailer.rbi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions sorbet/rbi/annotations/actionpack.rbi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions sorbet/rbi/annotations/actionview.rbi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions sorbet/rbi/annotations/activemodel.rbi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 11 additions & 1 deletion sorbet/rbi/annotations/activerecord.rbi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading