From 5aa791e2c1e24e36cdaf89035e7fcc23b8b8d951 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 3 Dec 2023 18:38:26 +0000 Subject: [PATCH 1/6] build(deps-dev): bump json from 2.6.3 to 2.7.0 in /Library/Homebrew Bumps [json](https://github.com/flori/json) from 2.6.3 to 2.7.0. - [Release notes](https://github.com/flori/json/releases) - [Changelog](https://github.com/flori/json/blob/master/CHANGES.md) - [Commits](https://github.com/flori/json/compare/v2.6.3...v2.7.0) --- updated-dependencies: - dependency-name: json dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Library/Homebrew/Gemfile.lock | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock index 91664c3983..bbf092a16d 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -28,7 +28,7 @@ GEM hpricot (0.8.6) i18n (1.14.1) concurrent-ruby (~> 1.0) - json (2.6.3) + json (2.7.0) json_schemer (2.1.1) hana (~> 1.3) regexp_parser (~> 2.0) @@ -182,7 +182,6 @@ GEM zeitwerk (2.6.12) PLATFORMS - aarch64-linux arm-linux arm64-darwin x86_64-darwin From ec3f580540b8b3bd59df4efe48c699f3f38327b9 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Sun, 3 Dec 2023 18:41:12 +0000 Subject: [PATCH 2/6] brew vendor-gems: commit updates. --- Library/Homebrew/Gemfile.lock | 1 + .../Homebrew/vendor/bundle/bundler/setup.rb | 25 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock index bbf092a16d..ea65e95756 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -182,6 +182,7 @@ GEM zeitwerk (2.6.12) PLATFORMS + aarch64-linux arm-linux arm64-darwin x86_64-darwin diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index 3538db2495..2d511a8cc0 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -37,26 +37,25 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/addressable-2.8.5/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/ast-2.4.2/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/bindata-2.4.15/lib") -$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/universal-darwin-22/#{Gem.extension_api_version}/msgpack-1.7.2") +$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-darwin-15/#{Gem.extension_api_version}/msgpack-1.7.2") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/msgpack-1.7.2/lib") -$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/universal-darwin-22/#{Gem.extension_api_version}/bootsnap-1.17.0") +$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-darwin-15/#{Gem.extension_api_version}/bootsnap-1.17.0") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/bootsnap-1.17.0/lib") -$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/universal-darwin-22/#{Gem.extension_api_version}/byebug-11.1.3") +$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-darwin-15/#{Gem.extension_api_version}/byebug-11.1.3") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/byebug-11.1.3/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/coderay-1.1.3/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/highline-2.0.3/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/commander-4.6.0/lib") -$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/did_you_mean-1.6.3/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/diff-lcs-1.5.0/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/docile-1.4.0/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/elftools-1.2.0/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/hana-1.3.7/lib") -$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/universal-darwin-22/#{Gem.extension_api_version}/hpricot-0.8.6") +$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-darwin-15/#{Gem.extension_api_version}/hpricot-0.8.6") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/hpricot-0.8.6/lib") -$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/universal-darwin-22/#{Gem.extension_api_version}/json-2.6.3") -$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/json-2.6.3/lib") +$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-darwin-15/#{Gem.extension_api_version}/json-2.7.0") +$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/json-2.7.0/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/regexp_parser-2.8.2/lib") -$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/universal-darwin-22/#{Gem.extension_api_version}/unf_ext-0.0.9.1") +$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-darwin-15/#{Gem.extension_api_version}/unf_ext-0.0.9.1") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/unf_ext-0.0.9.1/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/unf-0.1.4/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/simpleidn-0.2.1/lib") @@ -65,7 +64,7 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/mustache-1.1.1/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/parallel-1.23.0/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/parallel_tests-3.13.0/lib") -$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/universal-darwin-22/#{Gem.extension_api_version}/racc-1.7.3") +$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-darwin-15/#{Gem.extension_api_version}/racc-1.7.3") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/racc-1.7.3/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/parser-3.2.2.4/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rainbow-3.1.1/lib") @@ -77,7 +76,7 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rack-3.0.8/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/unparser-0.6.4/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rbi-0.0.14/lib") -$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/universal-darwin-22/#{Gem.extension_api_version}/rdiscount-2.2.7.1") +$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-darwin-15/#{Gem.extension_api_version}/rdiscount-2.2.7.1") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rdiscount-2.2.7.1/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rexml-3.2.6/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/ronn-0.7.3/lib") @@ -101,18 +100,18 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rubocop-rspec-2.20.0/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rubocop-sorbet-0.7.5/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/ruby-macho-4.0.0/lib") -$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/universal-darwin-22/#{Gem.extension_api_version}/ruby-prof-1.4.3") +$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-darwin-15/#{Gem.extension_api_version}/ruby-prof-1.4.3") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/ruby-prof-1.4.3/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/simplecov-html-0.12.3/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/simplecov_json_formatter-0.1.4/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/simplecov-0.22.0/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/simplecov-cobertura-2.1.0/lib") -$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-0.5.10461-universal-darwin-22/lib") +$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-0.5.10461-universal-darwin-15/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-0.5.10461/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-and-runtime-0.5.10461/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/thor-1.3.0/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/spoom-1.1.11/lib") -$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/universal-darwin-22/#{Gem.extension_api_version}/stackprof-0.2.25") +$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-darwin-15/#{Gem.extension_api_version}/stackprof-0.2.25") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/stackprof-0.2.25/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/yard-0.9.34/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/yard-sorbet-0.6.1/lib") From 574121d983bdf89f43478c61f00808837cd56ea3 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Sun, 3 Dec 2023 18:48:01 +0000 Subject: [PATCH 3/6] Update RBI files for json. Autogenerated by the [vendor-gems](https://github.com/Homebrew/brew/blob/HEAD/.github/workflows/vendor-gems.yml) workflow. --- .../gems/{json@2.6.3.rbi => json@2.7.0.rbi} | 5 ++-- .../sorbet/rbi/hidden-definitions/hidden.rbi | 28 +++++++++++++------ 2 files changed, 23 insertions(+), 10 deletions(-) rename Library/Homebrew/sorbet/rbi/gems/{json@2.6.3.rbi => json@2.7.0.rbi} (93%) diff --git a/Library/Homebrew/sorbet/rbi/gems/json@2.6.3.rbi b/Library/Homebrew/sorbet/rbi/gems/json@2.7.0.rbi similarity index 93% rename from Library/Homebrew/sorbet/rbi/gems/json@2.6.3.rbi rename to Library/Homebrew/sorbet/rbi/gems/json@2.7.0.rbi index 169cf4b68c..7c423ba36a 100644 --- a/Library/Homebrew/sorbet/rbi/gems/json@2.6.3.rbi +++ b/Library/Homebrew/sorbet/rbi/gems/json@2.7.0.rbi @@ -11,7 +11,7 @@ end module JSON private - def dump(obj, anIO = T.unsafe(nil), limit = T.unsafe(nil)); end + def dump(obj, anIO = T.unsafe(nil), limit = T.unsafe(nil), strict: T.unsafe(nil)); end def fast_generate(obj, opts = T.unsafe(nil)); end def fast_unparse(obj, opts = T.unsafe(nil)); end def generate(obj, opts = T.unsafe(nil)); end @@ -33,7 +33,7 @@ module JSON def create_id=(new_value); end def create_pretty_state; end def deep_const_get(path); end - def dump(obj, anIO = T.unsafe(nil), limit = T.unsafe(nil)); end + def dump(obj, anIO = T.unsafe(nil), limit = T.unsafe(nil), strict: T.unsafe(nil)); end def dump_default_options; end def dump_default_options=(_arg0); end def fast_generate(obj, opts = T.unsafe(nil)); end @@ -86,6 +86,7 @@ class JSON::JSONError < ::StandardError end end +JSON::NOT_SET = T.let(T.unsafe(nil), Object) JSON::Parser = JSON::Ext::Parser JSON::State = JSON::Ext::Generator::State JSON::UnparserError = JSON::GeneratorError diff --git a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi index bed3a6b8c0..63585e46e6 100644 --- a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi +++ b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi @@ -5712,6 +5712,18 @@ class JSON::Ext::Generator::State def escape_slash=(escape_slash); end def escape_slash?(); end + + def script_safe(); end + + def script_safe=(script_safe); end + + def script_safe?(); end + + def strict(); end + + def strict=(strict); end + + def strict?(); end end class JSON::Ext::Generator::State @@ -6353,7 +6365,13 @@ Net::HTTPServerErrorCode = Net::HTTPServerError Net::HTTPSession = Net::HTTP -Net::HTTPSuccessCode = Net::HTTPSuccess +class Net::HTTPSuccess +end + +Net::HTTPSuccessCode::EXCEPTION_TYPE = Net::HTTPError + +class Net::HTTPSuccess +end class Net::HTTPURITooLong HAS_BODY = ::T.let(nil, ::T.untyped) @@ -9438,12 +9456,6 @@ module Reline VERSION = ::T.let(nil, ::T.untyped) end -class Reline::ANSI - CAPNAME_KEY_BINDINGS = ::T.let(nil, ::T.untyped) - END_BRACKETED_PASTE = ::T.let(nil, ::T.untyped) - START_BRACKETED_PASTE = ::T.let(nil, ::T.untyped) -end - class Reline::Config KEYSEQ_PATTERN = ::T.let(nil, ::T.untyped) VARIABLE_NAMES = ::T.let(nil, ::T.untyped) @@ -9454,7 +9466,7 @@ class Reline::Core ATTR_READER_NAMES = ::T.let(nil, ::T.untyped) end -Reline::IOGate = Reline::ANSI +Reline::IOGate = Reline::GeneralIO Reline::Key = Struct::Key From 6eb8d51a0ccea314299ebac55d57e2d5a0cee63b Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Mon, 4 Dec 2023 17:08:50 +0000 Subject: [PATCH 4/6] dev-cmd/typecheck: skip `json` RBI generation --- Library/Homebrew/dev-cmd/typecheck.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/typecheck.rb b/Library/Homebrew/dev-cmd/typecheck.rb index 7f50f2d03e..649dd56d97 100644 --- a/Library/Homebrew/dev-cmd/typecheck.rb +++ b/Library/Homebrew/dev-cmd/typecheck.rb @@ -47,7 +47,7 @@ module Homebrew if update excluded_gems = [ "did_you_mean", # RBI file is already provided by Sorbet - "webrobots", # RBI file is bugged + "json", # RBI file is already provided by Sorbet "sorbet-static-and-runtime", # Unnecessary RBI - remove this entry with Tapioca 0.8 ] typed_overrides = [ From dad6e913e61c807c5aaabcbf0d551957234a48bf Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Mon, 4 Dec 2023 17:19:07 +0000 Subject: [PATCH 5/6] Update RBI files for json. Autogenerated by the [vendor-gems](https://github.com/Homebrew/brew/blob/HEAD/.github/workflows/vendor-gems.yml) workflow. --- .../Homebrew/sorbet/rbi/gems/json@2.7.0.rbi | 102 ------------------ .../sorbet/rbi/hidden-definitions/hidden.rbi | 18 ++++ 2 files changed, 18 insertions(+), 102 deletions(-) delete mode 100644 Library/Homebrew/sorbet/rbi/gems/json@2.7.0.rbi diff --git a/Library/Homebrew/sorbet/rbi/gems/json@2.7.0.rbi b/Library/Homebrew/sorbet/rbi/gems/json@2.7.0.rbi deleted file mode 100644 index 7c423ba36a..0000000000 --- a/Library/Homebrew/sorbet/rbi/gems/json@2.7.0.rbi +++ /dev/null @@ -1,102 +0,0 @@ -# typed: true - -# DO NOT EDIT MANUALLY -# This is an autogenerated file for types exported from the `json` gem. -# Please instead update this file by running `bin/tapioca gem json`. - -class Class < ::Module - def json_creatable?; end -end - -module JSON - private - - def dump(obj, anIO = T.unsafe(nil), limit = T.unsafe(nil), strict: T.unsafe(nil)); end - def fast_generate(obj, opts = T.unsafe(nil)); end - def fast_unparse(obj, opts = T.unsafe(nil)); end - def generate(obj, opts = T.unsafe(nil)); end - def load(source, proc = T.unsafe(nil), options = T.unsafe(nil)); end - def load_file(filespec, opts = T.unsafe(nil)); end - def load_file!(filespec, opts = T.unsafe(nil)); end - def parse(source, opts = T.unsafe(nil)); end - def parse!(source, opts = T.unsafe(nil)); end - def pretty_generate(obj, opts = T.unsafe(nil)); end - def pretty_unparse(obj, opts = T.unsafe(nil)); end - def recurse_proc(result, &proc); end - def restore(source, proc = T.unsafe(nil), options = T.unsafe(nil)); end - def unparse(obj, opts = T.unsafe(nil)); end - - class << self - def [](object, opts = T.unsafe(nil)); end - def create_fast_state; end - def create_id; end - def create_id=(new_value); end - def create_pretty_state; end - def deep_const_get(path); end - def dump(obj, anIO = T.unsafe(nil), limit = T.unsafe(nil), strict: T.unsafe(nil)); end - def dump_default_options; end - def dump_default_options=(_arg0); end - def fast_generate(obj, opts = T.unsafe(nil)); end - def fast_unparse(obj, opts = T.unsafe(nil)); end - def generate(obj, opts = T.unsafe(nil)); end - def generator; end - def generator=(generator); end - def iconv(to, from, string); end - def load(source, proc = T.unsafe(nil), options = T.unsafe(nil)); end - def load_default_options; end - def load_default_options=(_arg0); end - def load_file(filespec, opts = T.unsafe(nil)); end - def load_file!(filespec, opts = T.unsafe(nil)); end - def parse(source, opts = T.unsafe(nil)); end - def parse!(source, opts = T.unsafe(nil)); end - def parser; end - def parser=(parser); end - def pretty_generate(obj, opts = T.unsafe(nil)); end - def pretty_unparse(obj, opts = T.unsafe(nil)); end - def recurse_proc(result, &proc); end - def restore(source, proc = T.unsafe(nil), options = T.unsafe(nil)); end - def state; end - def state=(_arg0); end - def unparse(obj, opts = T.unsafe(nil)); end - end -end - -JSON::CREATE_ID_TLS_KEY = T.let(T.unsafe(nil), String) -JSON::DEFAULT_CREATE_ID = T.let(T.unsafe(nil), String) - -class JSON::GenericObject < ::OpenStruct - def as_json(*_arg0); end - def to_hash; end - def to_json(*a); end - def |(other); end - - class << self - def dump(obj, *args); end - def from_hash(object); end - def json_creatable=(_arg0); end - def json_creatable?; end - def json_create(data); end - def load(source, proc = T.unsafe(nil), opts = T.unsafe(nil)); end - end -end - -class JSON::JSONError < ::StandardError - class << self - def wrap(exception); end - end -end - -JSON::NOT_SET = T.let(T.unsafe(nil), Object) -JSON::Parser = JSON::Ext::Parser -JSON::State = JSON::Ext::Generator::State -JSON::UnparserError = JSON::GeneratorError - -module Kernel - extend ::Forwardable - - private - - def JSON(object, *args); end - def j(*objs); end - def jj(*objs); end -end diff --git a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi index 63585e46e6..0578e860bb 100644 --- a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi +++ b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi @@ -3336,6 +3336,8 @@ end class Class def any_instance(); end + + def json_creatable?(); end end class Complex @@ -5734,6 +5736,22 @@ class JSON::Ext::Parser def initialize(*arg); end end +JSON::Parser = JSON::Ext::Parser + +JSON::State = JSON::Ext::Generator::State + +JSON::UnparserError = JSON::GeneratorError + +module JSON + def self.create_fast_state(); end + + def self.create_pretty_state(); end + + def self.load_file(filespec, opts=T.unsafe(nil)); end + + def self.load_file!(filespec, opts=T.unsafe(nil)); end +end + class JSONSchemer::Result def self.keyword_init?(); end end From ea6c37545a4ec2c24ecfed7fe8d9de5230abb4b6 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Mon, 4 Dec 2023 17:34:27 +0000 Subject: [PATCH 6/6] standalone/init: temporary code to retain Ruby 2.6 support --- Library/Homebrew/standalone/init.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Library/Homebrew/standalone/init.rb b/Library/Homebrew/standalone/init.rb index 709fd4251a..8729fa58c4 100644 --- a/Library/Homebrew/standalone/init.rb +++ b/Library/Homebrew/standalone/init.rb @@ -40,4 +40,9 @@ $LOAD_PATH.push HOMEBREW_LIBRARY_PATH.to_s unless $LOAD_PATH.include?(HOMEBREW_L require_relative "../vendor/bundle/bundler/setup" $LOAD_PATH.unshift "#{HOMEBREW_LIBRARY_PATH}/vendor/bundle/#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/" \ "bundler-#{Homebrew::HOMEBREW_BUNDLER_VERSION}/lib" +if ruby_major == 2 && ruby_minor == 6 + # TEMP: Ruby 3 transition + $LOAD_PATH.unshift "#{HOMEBREW_LIBRARY_PATH}/vendor/bundle/#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/" \ + "did_you_mean-1.6.3/lib" +end $LOAD_PATH.uniq!