Skip to content
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
46 changes: 41 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ GEM
docile (1.4.0)
json (2.6.2)
method_source (1.0.0)
netrc (0.11.0)
parallel (1.22.1)
parser (3.1.2.1)
ast (~> 2.4.1)
Expand All @@ -31,6 +32,11 @@ GEM
pry (>= 0.13, < 0.15)
rainbow (3.1.1)
rake (13.0.6)
rbi (0.0.15)
ast
parser (>= 2.6.4.0)
sorbet-runtime (>= 0.5.9204)
unparser
redcarpet (3.5.1)
regexp_parser (2.5.0)
rexml (3.2.5)
Expand Down Expand Up @@ -75,12 +81,41 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
sorbet (0.5.10365)
sorbet-static (= 0.5.10365)
sorbet-runtime (0.5.10365)
sorbet-static (0.5.10365-x86_64-linux)
sorbet (0.5.10346)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried for quite a bit but couldn't get sorbet to be bumped given the new Gemfile.lock. Nothing jumps out to me that is limiting Sorbet version 😕 Maybe you can have more luck locally.

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's likely because there are no darwin builds for the new release due to https://sorbet-ruby.slack.com/archives/CHN2L03NH/p1660847337669779

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good find, I was very confused.

sorbet-static (= 0.5.10346)
sorbet-runtime (0.5.10346)
sorbet-static (0.5.10346-universal-darwin-14)
sorbet-static (0.5.10346-universal-darwin-15)
sorbet-static (0.5.10346-universal-darwin-16)
sorbet-static (0.5.10346-universal-darwin-17)
sorbet-static (0.5.10346-universal-darwin-18)
sorbet-static (0.5.10346-universal-darwin-19)
sorbet-static (0.5.10346-universal-darwin-20)
sorbet-static (0.5.10346-universal-darwin-21)
sorbet-static (0.5.10346-universal-darwin-22)
sorbet-static (0.5.10346-x86_64-linux)
sorbet-static-and-runtime (0.5.10346)
sorbet (= 0.5.10346)
sorbet-runtime (= 0.5.10346)
spoom (1.1.12)
sorbet (>= 0.5.9204)
sorbet-runtime (>= 0.5.9204)
thor (>= 0.19.2)
tapioca (0.9.4)
bundler (>= 1.17.3)
netrc (>= 0.11.0)
parallel (>= 1.21.0)
pry (>= 0.12.2)
rbi (~> 0.0.0, >= 0.0.14)
sorbet-static-and-runtime (>= 0.5.9204)
spoom (~> 1.1.0, >= 1.1.11)
thor (>= 1.2.0)
yard-sorbet
thor (1.2.1)
unicode-display_width (2.2.0)
unparser (0.6.5)
diff-lcs (~> 1.3)
parser (>= 3.1.0)
webrick (1.7.0)
yard (0.9.28)
webrick (~> 1.7.0)
Expand All @@ -101,7 +136,8 @@ DEPENDENCIES
rubocop-rspec (~> 2.12.1)
rubocop-sorbet (~> 0.6.0)
sorbet (~> 0.5.9204)
tapioca (~> 0.9.4)
yard-sorbet!

BUNDLED WITH
2.3.20
2.3.13
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Downgraded the bundler version to keep platform specific versions of sorbet-static until a version with ruby/rubygems#5832 is released.

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've kept this, but just fyi, when I run bundle update locally with bundler 2.3.13 i get this error: ruby/rubygems#5088

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting. It's working for me on Ruby 3.1.2. Hopefully we can bump Bundler soon.

15 changes: 0 additions & 15 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,6 @@ RSpec::Core::RakeTask.new(:spec)
RuboCop::RakeTask.new(:rubocop)
YARD::Rake::YardocTask.new

desc 'Update sorbet rbi files'
task :rbi do
sh 'bundle update'
sh 'bundle clean'
sh 'rm -r sorbet/rbi/{gems,hidden-definitions,sorbet-typed,todo.rbi}'
sh 'bundle exec srb rbi sorbet-typed'
sh 'bundle exec srb rbi gems'
sh 'bundle exec srb rbi hidden-definitions'
sh 'bundle exec srb rbi todo'
# sadly, the above commands don't limit themselves to the files/folders that they describe
sh 'git checkout -- sorbet/rbi/contexts'
# this is a weird and unnecessary artifact, just delete it
sh 'rm sorbet/rbi/gems/yard-sorbet.rbi'
end

desc 'Typecheck files with sorbet'
namespace :typecheck do |typecheck_namespace|
desc 'Typecheck Gemfile'
Expand Down
27 changes: 27 additions & 0 deletions bin/tapioca
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/usr/bin/env ruby
# frozen_string_literal: true

#
# This file was generated by Bundler.
#
# The application 'tapioca' is installed as part of a gem, and
# this file is here to facilitate running it.
#

ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)

bundle_binstub = File.expand_path('bundle', __dir__)

if File.file?(bundle_binstub)
if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
load(bundle_binstub)
else
abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
end
end

require 'rubygems'
require 'bundler/setup'

load Gem.bin_path('tapioca', 'tapioca')

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

49 changes: 0 additions & 49 deletions sorbet/rbi/gems/ast.rbi

This file was deleted.

Loading