Skip to content

Commit

Permalink
Sorbet support arm64 macOS natively (#10662)
Browse files Browse the repository at this point in the history
* Sorbet support arm64 macOS natively

* Fix sorbet issues
  • Loading branch information
JamieMagee authored Oct 8, 2024
1 parent bfc7c91 commit ce21ef4
Show file tree
Hide file tree
Showing 17 changed files with 14,496 additions and 15,127 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ gem "dependabot-swift", path: "swift"
gem "dependabot-terraform", path: "terraform"

# Sorbet
gem "sorbet", "0.5.11370", group: :development
gem "tapioca", "0.13.3", require: false, group: :development
gem "sorbet", "0.5.11577", group: :development
gem "tapioca", "0.16.2", require: false, group: :development

common_gemspec = File.expand_path("common/dependabot-common.gemspec", __dir__)

Expand Down
56 changes: 28 additions & 28 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ PATH
opentelemetry-metrics-api (~> 0.1)
parser (>= 2.5, < 4.0)
psych (~> 5.0)
sorbet-runtime (~> 0.5.11178)
sorbet-runtime (~> 0.5.11577)
stackprof (~> 0.2.16)
toml-rb (>= 1.1.2, < 4.0)

Expand Down Expand Up @@ -177,7 +177,7 @@ GEM
docker_registry2 (1.18.0)
rest-client (>= 1.8.0)
domain_name (0.6.20231109)
erubi (1.12.0)
erubi (1.13.0)
excon (0.110.0)
faraday (2.7.11)
base64
Expand Down Expand Up @@ -235,15 +235,15 @@ GEM
parser (3.3.1.0)
ast (~> 2.4.1)
racc
prism (0.29.0)
prism (1.0.0)
psych (5.1.2)
stringio
public_suffix (5.0.4)
racc (1.7.3)
rainbow (3.1.1)
rake (13.1.0)
rbi (0.1.13)
prism (>= 0.18.0, < 1.0.0)
rbi (0.2.0)
prism (~> 1.0)
sorbet-runtime (>= 0.5.9204)
rdoc (6.6.3.1)
psych (>= 4.0.0)
Expand Down Expand Up @@ -302,8 +302,8 @@ GEM
rubocop-rspec_rails (~> 2.28)
rubocop-rspec_rails (2.28.3)
rubocop (~> 1.40)
rubocop-sorbet (0.8.3)
rubocop (>= 0.90.0)
rubocop-sorbet (0.8.5)
rubocop (>= 1)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
Expand All @@ -316,35 +316,35 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
sorbet (0.5.11370)
sorbet-static (= 0.5.11370)
sorbet-runtime (0.5.11370)
sorbet-static (0.5.11370-aarch64-linux)
sorbet-static (0.5.11370-universal-darwin)
sorbet-static (0.5.11370-x86_64-linux)
sorbet-static-and-runtime (0.5.11370)
sorbet (= 0.5.11370)
sorbet-runtime (= 0.5.11370)
spoom (1.3.0)
sorbet (0.5.11577)
sorbet-static (= 0.5.11577)
sorbet-runtime (0.5.11577)
sorbet-static (0.5.11577-aarch64-linux)
sorbet-static (0.5.11577-universal-darwin)
sorbet-static (0.5.11577-x86_64-linux)
sorbet-static-and-runtime (0.5.11577)
sorbet (= 0.5.11577)
sorbet-runtime (= 0.5.11577)
spoom (1.4.2)
erubi (>= 1.10.0)
prism (>= 0.19.0)
prism (>= 0.28.0)
sorbet-static-and-runtime (>= 0.5.10187)
thor (>= 0.19.2)
stackprof (0.2.25)
stringio (3.1.0)
strscan (3.1.0)
tapioca (0.13.3)
tapioca (0.16.2)
bundler (>= 2.2.25)
netrc (>= 0.11.0)
parallel (>= 1.21.0)
rbi (>= 0.1.4, < 0.2)
rbi (~> 0.2)
sorbet-static-and-runtime (>= 0.5.11087)
spoom (>= 1.2.0)
thor (>= 1.2.0)
yard-sorbet
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.3.1)
thor (1.3.2)
toml-rb (3.0.1)
citrus (~> 3.0, > 3.0)
racc (~> 1.7)
Expand All @@ -358,10 +358,10 @@ GEM
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.8.1)
yard (0.9.36)
yard-sorbet (0.8.1)
sorbet-runtime (>= 0.5)
yard (>= 0.9)
yard (0.9.37)
yard-sorbet (0.9.0)
sorbet-runtime
yard

PLATFORMS
aarch64-linux
Expand Down Expand Up @@ -399,10 +399,10 @@ DEPENDENCIES
rubocop (~> 1.65.0)
rubocop-performance (~> 1.21.0)
rubocop-rspec (~> 2.29.1)
rubocop-sorbet (~> 0.8.1)
rubocop-sorbet (~> 0.8.5)
simplecov (~> 0.22.0)
sorbet (= 0.5.11370)
tapioca (= 0.13.3)
sorbet (= 0.5.11577)
tapioca (= 0.16.2)
turbo_tests (~> 2.2.0)
vcr (~> 6.1)
webmock (~> 3.18)
Expand Down
4 changes: 2 additions & 2 deletions common/dependabot-common.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "opentelemetry-metrics-api", "~> 0.1"
spec.add_dependency "parser", ">= 2.5", "< 4.0"
spec.add_dependency "psych", "~> 5.0"
spec.add_dependency "sorbet-runtime", "~> 0.5.11178"
spec.add_dependency "sorbet-runtime", "~> 0.5.11577"
spec.add_dependency "stackprof", "~> 0.2.16"
spec.add_dependency "toml-rb", ">= 1.1.2", "< 4.0"

Expand All @@ -55,7 +55,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "rubocop", "~> 1.65.0"
spec.add_development_dependency "rubocop-performance", "~> 1.21.0"
spec.add_development_dependency "rubocop-rspec", "~> 2.29.1"
spec.add_development_dependency "rubocop-sorbet", "~> 0.8.1"
spec.add_development_dependency "rubocop-sorbet", "~> 0.8.5"
spec.add_development_dependency "simplecov", "~> 0.22.0"
spec.add_development_dependency "turbo_tests", "~> 2.2.0"
spec.add_development_dependency "vcr", "~> 6.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ def yarnrc_specifies_private_reg?
return false unless yarnrc_global_registry

UpdateChecker::RegistryFinder::CENTRAL_REGISTRIES.any? do |r|
r.include?(URI(yarnrc_global_registry).host)
r.include?(T.must(URI(yarnrc_global_registry).host))
end
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def yarnrc_specifies_private_reg?
return false unless yarnrc_global_registry

UpdateChecker::RegistryFinder::CENTRAL_REGISTRIES.none? do |r|
r.include?(URI(yarnrc_global_registry).host)
r.include?(T.must(URI(yarnrc_global_registry).host))
end
end

Expand Down

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

Loading

0 comments on commit ce21ef4

Please sign in to comment.