Skip to content

Commit

Permalink
Update all dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Bo98 committed Dec 15, 2023
1 parent dc3daf7 commit 89531e9
Show file tree
Hide file tree
Showing 207 changed files with 291,657 additions and 29,826 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Check RuboCop filepaths
working-directory: ${{ steps.set-up-homebrew.outputs.repository-path }}/Library/Homebrew
run: |
public_apis=$(git grep -l "@api public" | wc -l | tr -d ' ')
public_apis=$(git grep -l "@api public" -- :^sorbet/ :^vendor/ | wc -l | tr -d ' ')
rubocop_docs=$(yq '.Style/Documentation.Include' .rubocop.yml | wc -l | tr -d ' ')
if [[ public_apis -ne rubocop_docs ]]
then
Expand Down
14 changes: 7 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,24 +102,29 @@
**/vendor/bundle/ruby/*/gems/diff-lcs-*/
**/vendor/bundle/ruby/*/gems/docile-*/
**/vendor/bundle/ruby/*/gems/ecma-re-validator-*/
**/vendor/bundle/ruby/*/gems/erubi-*/
**/vendor/bundle/ruby/*/gems/hana-*/
**/vendor/bundle/ruby/*/gems/highline-*/
**/vendor/bundle/ruby/*/gems/hpricot-*/
**/vendor/bundle/ruby/*/gems/i18n-*/
**/vendor/bundle/ruby/*/gems/jaro_winkler-*/
**/vendor/bundle/ruby/*/gems/json-*/
**/vendor/bundle/ruby/*/gems/json_schemer-*/
**/vendor/bundle/ruby/*/gems/language_server-protocol-*/
**/vendor/bundle/ruby/*/gems/method_source-*/
**/vendor/bundle/ruby/*/gems/mini_portile2-*/
**/vendor/bundle/ruby/*/gems/minitest-*/
**/vendor/bundle/ruby/*/gems/msgpack-*/
**/vendor/bundle/ruby/*/gems/mustache-*/
**/vendor/bundle/ruby/*/gems/netrc-*/
**/vendor/bundle/ruby/*/gems/ntlm-http-*/
**/vendor/bundle/ruby/*/gems/parallel-*/
**/vendor/bundle/ruby/*/gems/parallel_tests-*/
**/vendor/bundle/ruby/*/gems/parlour-*/
**/vendor/bundle/ruby/*/gems/parser-*/
**/vendor/bundle/ruby/*/gems/powerpack-*/
**/vendor/bundle/ruby/*/gems/prettier_print-*/
**/vendor/bundle/ruby/*/gems/prism-*/
**/vendor/bundle/ruby/*/gems/psych-*/
**/vendor/bundle/ruby/*/gems/pry-*/
**/vendor/bundle/ruby/*/gems/racc-*/
Expand All @@ -140,13 +145,7 @@
**/vendor/bundle/ruby/*/gems/rspec-support-*/
**/vendor/bundle/ruby/*/gems/rspec-sorbet-*/
**/vendor/bundle/ruby/*/gems/rspec-wait-*/
**/vendor/bundle/ruby/*/gems/rubocop-1*/
**/vendor/bundle/ruby/*/gems/rubocop-ast-*/
**/vendor/bundle/ruby/*/gems/rubocop-capybara-*/
**/vendor/bundle/ruby/*/gems/rubocop-performance-*/
**/vendor/bundle/ruby/*/gems/rubocop-rails-*/
**/vendor/bundle/ruby/*/gems/rubocop-rspec-*/
**/vendor/bundle/ruby/*/gems/rubocop-sorbet-*/
**/vendor/bundle/ruby/*/gems/rubocop-*/
**/vendor/bundle/ruby/*/gems/ruby-prof-*/
**/vendor/bundle/ruby/*/gems/ruby-progressbar-*/
**/vendor/bundle/ruby/*/gems/simplecov-*/
Expand All @@ -158,6 +157,7 @@
**/vendor/bundle/ruby/*/gems/spoom-*/
**/vendor/bundle/ruby/*/gems/stackprof-*/
**/vendor/bundle/ruby/*/gems/strscan-*/
**/vendor/bundle/ruby/*/gems/syntax_tree-*/
**/vendor/bundle/ruby/*/gems/tapioca-*/
**/vendor/bundle/ruby/*/gems/thor-*/
**/vendor/bundle/ruby/*/gems/tzinfo-*/
Expand Down
10 changes: 5 additions & 5 deletions Library/.rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ RSpec/DescribeClass:
Enabled: false
RSpec/FilePath:
Enabled: false
# RSpec/SpecFilePathFormat:
# Enabled: false
RSpec/SpecFilePathFormat:
Enabled: false
RSpec/StubbedMock:
Enabled: false
RSpec/SubjectStub:
Expand Down Expand Up @@ -384,7 +384,7 @@ Style/InvertibleUnlessCondition:
# Unset this (prefer `unless a.zero?` over `if a.nonzero?`)
:zero?:
# Don't require non-standard `exclude?` (for now at least) - it's not available in every file
# :include?:
:include?:

# TODO: Enable this cop again once https://github.com/Homebrew/brew/pull/16337#issuecomment-1855668516 is done.
# From the RuboCop docs: "NOTE: Regexp and Range literals are frozen objects since Ruby 3.0."
Expand Down Expand Up @@ -442,8 +442,8 @@ Style/StringMethods:
Enabled: true

# Treating this the same as Style/MethodCallWithArgsParentheses
# Style/SuperWithArgsParentheses:
# Enabled: false
Style/SuperWithArgsParentheses:
Enabled: false

# An array of symbols is more readable than a symbol array
# and also allows for easier grepping.
Expand Down
8 changes: 4 additions & 4 deletions Library/Homebrew/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ source "https://rubygems.org"

# The default case (no envs), should always be a restrictive bound on the lowest supported minor version.
# This is the branch that Dependabot will use.
if ENV.fetch("HOMEBREW_USE_RUBY_FROM_PATH", "").empty? && ENV.fetch("HOMEBREW_RUBY3", "").empty?
ruby "~> 2.6.0"
if ENV.fetch("HOMEBREW_USE_RUBY_FROM_PATH", "").empty?
ruby "~> 3.1.0"
else
ruby ">= 2.6.0"
ruby ">= 3.1.0"
end

# disallowed gems (should not be used)
Expand Down Expand Up @@ -74,7 +74,7 @@ group :audit, :bump_unversioned_casks, :livecheck, optional: true do
end

# vendored gems (no group)
gem "activesupport"
gem "activesupport", "<7" # we're actively working to remove this: https://github.com/Homebrew/brew/issues/16190
gem "addressable"
gem "patchelf"
gem "plist"
Expand Down
90 changes: 45 additions & 45 deletions Library/Homebrew/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ GEM
docile (1.4.0)
elftools (1.2.0)
bindata (~> 2)
erubi (1.12.0)
hana (1.3.7)
highline (2.0.3)
hpricot (0.8.6)
Expand All @@ -32,12 +33,14 @@ GEM
hana (~> 1.3)
regexp_parser (~> 2.0)
simpleidn (~> 0.2)
language_server-protocol (3.17.0.3)
method_source (1.0.0)
minitest (5.20.0)
msgpack (1.7.2)
mustache (1.1.1)
netrc (0.11.0)
parallel (1.23.0)
parallel_tests (3.13.0)
parallel_tests (4.3.0)
parallel
parlour (8.1.0)
commander (~> 4.5)
Expand All @@ -50,18 +53,18 @@ GEM
patchelf (1.4.0)
elftools (>= 1.2)
plist (3.7.0)
prettier_print (1.2.1)
prism (0.19.0)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.4)
racc (1.7.3)
rack (3.0.8)
rainbow (3.1.1)
rbi (0.0.14)
ast
parser (>= 2.6.4.0)
rbi (0.1.6)
prism (>= 0.18.0, < 0.20)
sorbet-runtime (>= 0.5.9204)
unparser
rdiscount (2.2.7.1)
regexp_parser (2.8.3)
rexml (3.2.6)
Expand Down Expand Up @@ -93,30 +96,35 @@ GEM
rspec-support (3.12.1)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.50.2)
rubocop (1.59.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.0.0)
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.0, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.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-performance (1.17.1)
rubocop-factory_bot (2.24.0)
rubocop (~> 1.33)
rubocop-performance (1.19.1)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.19.1)
rubocop-rails (2.22.2)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-rspec (2.20.0)
rubocop (~> 1.33)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-rspec (2.25.0)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
rubocop-sorbet (0.7.6)
rubocop (>= 0.90.0)
ruby-macho (4.0.0)
Expand All @@ -133,34 +141,29 @@ GEM
simplecov_json_formatter (0.1.4)
simpleidn (0.2.1)
unf (~> 0.1.4)
sorbet (0.5.10461)
sorbet-static (= 0.5.10461)
sorbet-runtime (0.5.10461)
sorbet-static (0.5.10461-universal-darwin-14)
sorbet-static (0.5.10461-universal-darwin-15)
sorbet-static (0.5.10461-universal-darwin-16)
sorbet-static (0.5.10461-universal-darwin-17)
sorbet-static (0.5.10461-universal-darwin-18)
sorbet-static (0.5.10461-universal-darwin-19)
sorbet-static (0.5.10461-universal-darwin-20)
sorbet-static (0.5.10461-universal-darwin-21)
sorbet-static (0.5.10461-universal-darwin-22)
sorbet-static (0.5.10461-x86_64-linux)
sorbet-static-and-runtime (0.5.10461)
sorbet (= 0.5.10461)
sorbet-runtime (= 0.5.10461)
spoom (1.1.11)
sorbet (>= 0.5.9204)
sorbet-runtime (>= 0.5.9204)
sorbet (0.5.11155)
sorbet-static (= 0.5.11155)
sorbet-runtime (0.5.11155)
sorbet-static (0.5.11155-universal-darwin)
sorbet-static (0.5.11155-x86_64-linux)
sorbet-static-and-runtime (0.5.11155)
sorbet (= 0.5.11155)
sorbet-runtime (= 0.5.11155)
spoom (1.2.4)
erubi (>= 1.10.0)
sorbet-static-and-runtime (>= 0.5.10187)
syntax_tree (>= 6.1.1)
thor (>= 0.19.2)
stackprof (0.2.25)
tapioca (0.7.3)
bundler (>= 1.17.3)
pry (>= 0.12.2)
rbi (~> 0.0.0, >= 0.0.14)
sorbet-runtime (>= 0.5.9204)
sorbet-static (>= 0.5.9204)
spoom (~> 1.1.0, >= 1.1.11)
syntax_tree (6.2.0)
prettier_print (>= 1.2.0)
tapioca (0.11.13)
bundler (>= 2.2.25)
netrc (>= 0.11.0)
parallel (>= 1.21.0)
rbi (>= 0.1.4, < 0.2)
sorbet-static-and-runtime (>= 0.5.10187)
spoom (~> 1.2.0, >= 1.2.0)
thor (>= 1.2.0)
yard-sorbet
thor (1.3.0)
Expand All @@ -170,12 +173,9 @@ GEM
unf_ext
unf_ext (0.0.9.1)
unicode-display_width (2.5.0)
unparser (0.6.4)
diff-lcs (~> 1.3)
parser (>= 3.1.0)
warning (1.3.0)
yard (0.9.34)
yard-sorbet (0.6.1)
yard-sorbet (0.8.1)
sorbet-runtime (>= 0.5)
yard (>= 0.9)
zeitwerk (2.6.12)
Expand All @@ -188,7 +188,7 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
activesupport
activesupport (< 7)
addressable
bootsnap
byebug
Expand Down Expand Up @@ -226,7 +226,7 @@ DEPENDENCIES
warning

RUBY VERSION
ruby 2.6.10p210
ruby 3.1.4p223

BUNDLED WITH
2.4.18
2 changes: 0 additions & 2 deletions Library/Homebrew/brew.sh
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,6 @@ auto-update() {
# Restore user path as it'll be refiltered by HOMEBREW_BREW_FILE (bin/brew)
export PATH=${HOMEBREW_PATH}

unset HOMEBREW_RUBY3

# exec a new process to set any new environment variables.
exec "${HOMEBREW_BREW_FILE}" "$@"
fi
Expand Down
5 changes: 1 addition & 4 deletions Library/Homebrew/cmd/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -893,10 +893,7 @@ EOS
[[ ! -f "${HOMEBREW_CACHE}/all_commands_list.txt" ]] ||
[[ -n "${HOMEBREW_DEVELOPER}" && -z "${HOMEBREW_UPDATE_AUTO}" ]]
then
(
unset HOMEBREW_RUBY3
brew update-report "$@"
)
brew update-report "$@"
return $?
elif [[ -z "${HOMEBREW_UPDATE_AUTO}" && -z "${HOMEBREW_QUIET}" ]]
then
Expand Down
1 change: 0 additions & 1 deletion Library/Homebrew/dev-cmd/tests.rb
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ def setup_environment!(args)
HOMEBREW_CACHE
HOMEBREW_LOGS
HOMEBREW_TEMP
HOMEBREW_RUBY3
]
allowed_test_env << "HOMEBREW_USE_RUBY_FROM_PATH" if Homebrew::EnvConfig.developer?
Homebrew::EnvConfig::ENVS.keys.map(&:to_s).each do |env|
Expand Down
21 changes: 13 additions & 8 deletions Library/Homebrew/dev-cmd/typecheck.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,9 @@ def self.typecheck
HOMEBREW_LIBRARY_PATH.cd do
if update
excluded_gems = [
"did_you_mean", # RBI file is already provided by Sorbet
"json", # RBI file is already provided by Sorbet
"sorbet-static-and-runtime", # Unnecessary RBI - remove this entry with Tapioca 0.8
]
typed_overrides = [
"msgpack:false", # Investigate removing this with Tapioca 0.8
]
tapioca_args = ["--exclude", *excluded_gems, "--typed-overrides", *typed_overrides]
tapioca_args = ["--exclude", *excluded_gems, "--pre", "sorbet/tapioca/prerequire.rb"]

Check warning on line 51 in Library/Homebrew/dev-cmd/typecheck.rb

View check run for this annotation

Codecov / codecov/patch

Library/Homebrew/dev-cmd/typecheck.rb#L51

Added line #L51 was not covered by tests
tapioca_args << "--all" if args.update_all?

ohai "Updating homegrown RBI files..."
Expand All @@ -63,13 +58,23 @@ def self.typecheck
ohai "Updating Tapioca RBI files..."
safe_system "bundle", "exec", "tapioca", "gem", *tapioca_args
safe_system "bundle", "exec", "parlour"

safe_system({ "RUBYLIB" => "#{HOMEBREW_LIBRARY_PATH}/sorbet/hidden_definitions_hacks" },
"bundle", "exec", "srb", "rbi", "hidden-definitions")
safe_system "bundle", "exec", "tapioca", "todo"
# HACK: we'll phase out hidden-definitions soon
tmp_file = "sorbet/rbi/hidden-definitions/hidden.rbi.tmp"
orig_file = "sorbet/rbi/hidden-definitions/hidden.rbi"
File.open(tmp_file, "w") do |out_file|
File.foreach(orig_file) do |line|

Check warning on line 68 in Library/Homebrew/dev-cmd/typecheck.rb

View check run for this annotation

Codecov / codecov/patch

Library/Homebrew/dev-cmd/typecheck.rb#L65-L68

Added lines #L65 - L68 were not covered by tests
out_file.puts line unless line.include?("def self.new(*args, **arg, &blk); end")
end
end
File.rename(tmp_file, orig_file)

Check warning on line 72 in Library/Homebrew/dev-cmd/typecheck.rb

View check run for this annotation

Codecov / codecov/patch

Library/Homebrew/dev-cmd/typecheck.rb#L72

Added line #L72 was not covered by tests

if args.suggest_typed?
ohai "Bumping Sorbet `typed` sigils..."
safe_system "bundle", "exec", "spoom", "bump"
# --sorbet needed because of https://github.com/Shopify/spoom/issues/488
safe_system "bundle", "exec", "spoom", "bump", "--dry", "--sorbet", "#{Gem.bin_path("sorbet", "srb")} tc"

Check warning on line 77 in Library/Homebrew/dev-cmd/typecheck.rb

View check run for this annotation

Codecov / codecov/patch

Library/Homebrew/dev-cmd/typecheck.rb#L77

Added line #L77 was not covered by tests
end

return
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/livecheck/livecheck.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ module Livecheck
rc
].freeze, T::Array[String])

sig { returns(T::Hash[Class, String]) }
sig { returns(T::Hash[T::Class[T.anything], String]) }
def livecheck_strategy_names
return T.must(@livecheck_strategy_names) if defined?(@livecheck_strategy_names)

# Cache demodulized strategy names, to avoid repeating this work
@livecheck_strategy_names = T.let({}, T.nilable(T::Hash[Class, String]))
@livecheck_strategy_names = T.let({}, T.nilable(T::Hash[T::Class[T.anything], String]))
Strategy.constants.sort.each do |const_symbol|
constant = Strategy.const_get(const_symbol)
next unless constant.is_a?(Class)
Expand Down
1 change: 1 addition & 0 deletions Library/Homebrew/sorbet/rbi/gems/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**/*.rbi linguist-generated=true
Loading

0 comments on commit 89531e9

Please sign in to comment.