Skip to content

Commit 07a3acb

Browse files
authored
Merge pull request #2 from Shopify/pz-remove-sorbet
Remove sorbet
2 parents 23ecbf5 + 335f297 commit 07a3acb

38 files changed

+6
-126834
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
ruby:
14-
- '3.2.0'
14+
- "3.2"
1515

1616
steps:
1717
- uses: actions/checkout@v3
@@ -22,5 +22,3 @@ jobs:
2222
bundler-cache: true
2323
- name: Run tests
2424
run: bundle exec rake
25-
- name: Run typecheck
26-
run: bundle exec srb tc

.rubocop.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ inherit_gem:
33

44
require:
55
- rubocop-minitest
6-
- rubocop-sorbet
76

87
AllCops:
98
NewCops: enable

bin/tapioca

Lines changed: 0 additions & 27 deletions
This file was deleted.

lib/shopify_ruby_definitions.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
# typed: strong
21
# frozen_string_literal: true
32

4-
require "sorbet-runtime"
5-
63
require_relative "shopify_ruby_definitions/ruby_build"
74
require_relative "shopify_ruby_definitions/ruby_versions"
85
require_relative "shopify_ruby_definitions/version"
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
# typed: strong
21
# frozen_string_literal: true
32

43
module ShopifyRubyDefinitions
54
module RubyBuild
6-
extend T::Sig
7-
8-
RUBY_BUILD_DIRECTORY = T.let(File.expand_path("../../../vendor/ruby-build", __FILE__), String)
5+
RUBY_BUILD_DIRECTORY = File.expand_path("../../../vendor/ruby-build", __FILE__)
96
end
107
end

lib/shopify_ruby_definitions/ruby_versions.rb

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
# typed: strong
21
# frozen_string_literal: true
32

43
module ShopifyRubyDefinitions
54
module RubyVersions
6-
extend T::Sig
5+
VERSIONS_DIRECTORY = File.join(RubyBuild::RUBY_BUILD_DIRECTORY, "share/ruby-build")
6+
ALL_VERSIONS = Dir["#{VERSIONS_DIRECTORY}/*"].map { |f| File.basename(f) }
77

8-
VERSIONS_DIRECTORY = T.let(File.join(RubyBuild::RUBY_BUILD_DIRECTORY, "share/ruby-build"), String)
9-
ALL_VERSIONS = T.let(Dir["#{VERSIONS_DIRECTORY}/*"].map { |f| File.basename(f) }, T::Array[String])
10-
11-
sig { returns(T::Hash[String, String]) }
128
def version_overrides
139
{
1410
"head" => ruby_head_version,
@@ -27,23 +23,21 @@ def version_overrides
2723
}.freeze
2824
end
2925

30-
sig { params(version: String).returns(String) }
3126
def resolve_version(version)
3227
if version.match?(/\A\d+\.\d+\z/)
3328
pattern = /\A#{Regexp.escape(version)}\.(\d+)\z/
3429
versions = ALL_VERSIONS.grep(pattern)
3530
unless versions.empty?
36-
version = T.must(versions.max_by { |v| T.must(v.match(pattern))[1].to_i })
31+
version = versions.max_by { |v| v.match(pattern)[1].to_i }
3732
end
3833
end
3934
version_overrides.fetch(version, version)
4035
end
4136

4237
private
4338

44-
sig { returns(String) }
4539
def ruby_head_version
46-
T.must(ALL_VERSIONS.grep(/\A[\d\.]+-dev\z/).max)
40+
ALL_VERSIONS.grep(/\A[\d\.]+-dev\z/).max
4741
end
4842
end
4943
end

lib/shopify_ruby_definitions/version.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# typed: strong
21
# frozen_string_literal: true
32

43
module ShopifyRubyDefinitions

shopify-ruby-definitions.gemspec

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ Gem::Specification.new do |spec|
2727
spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
2828
spec.require_paths = ["lib"]
2929

30-
spec.add_dependency("sorbet-runtime")
31-
3230
spec.add_development_dependency("rubocop-minitest")
3331
spec.add_development_dependency("rubocop-shopify")
34-
spec.add_development_dependency("rubocop-sorbet")
35-
spec.add_development_dependency("sorbet")
36-
spec.add_development_dependency("tapioca")
3732
end

sorbet/config

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)