Merge pull request #648 from Shopify/mangara-bump-deps-2025-11-20

Restrict Tapioca and Sorbet versions

Author: Mangara

Gemfile

@@ -39,8 +39,17 @@ gem "rake"
 gem "csv" # required for Ruby 3.4+
 gem "mutex_m" # Required for Ruby 3.4+
 
+ruby_version = Gem::Version.new(RUBY_VERSION)
+if ruby_version >= Gem::Version.new("3.2")
+  tapioca_version = ">= 0.17.9" # Fixes incompatibility with Sorbet >= 0.6.12698
+  sorbet_version = ">= 0.6.12698"
+else
+  tapioca_version = ">= 0.10.0"
+  sorbet_version = "< 0.6.12698"
+end
+
 # for unit testing optional sorbet support
-gem "sorbet-runtime"
-gem "tapioca"
+gem "sorbet-runtime", sorbet_version
+gem "tapioca", tapioca_version
 
 gem "logger"

Gemfile.lock

@@ -58,8 +58,6 @@ GEM
     bigdecimal (3.2.2)
     builder (3.3.0)
     coderay (1.1.3)
-    commander (5.0.0)
-      highline (~> 3.0.0)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.3)
     crass (1.0.6)
@@ -72,7 +70,6 @@ GEM
     erubi (1.13.1)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    highline (3.0.1)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     io-console (0.8.1)
@@ -96,18 +93,14 @@ GEM
     mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
     mutex_m (0.3.0)
+    netrc (0.11.0)
     nokogiri (1.18.9-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.18.9-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
     parallel (1.27.0)
-    parlour (9.1.2)
-      commander (~> 5.0)
-      parser
-      rainbow (~> 3.0)
-      sorbet-runtime (>= 0.5)
     parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
@@ -151,7 +144,7 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.3.1)
-    rbi (0.3.6)
+    rbi (0.3.7)
       prism (~> 1.0)
       rbs (>= 3.4.4)
     rbs (4.0.0.dev.4)
@@ -169,6 +162,7 @@ GEM
     regexp_parser (2.10.0)
     reline (0.6.2)
       io-console (~> 0.5)
+    require-hooks (0.2.2)
     resque (2.7.0)
       mono_logger (~> 1)
       multi_json (~> 1.0)
@@ -208,15 +202,15 @@ GEM
       rack-protection (= 4.1.1)
       rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    sorbet (0.6.12690)
-      sorbet-static (= 0.6.12690)
-    sorbet-runtime (0.6.12690)
-    sorbet-static (0.6.12690-universal-darwin)
-    sorbet-static (0.6.12690-x86_64-linux)
-    sorbet-static-and-runtime (0.6.12690)
-      sorbet (= 0.6.12690)
-      sorbet-runtime (= 0.6.12690)
-    spoom (1.7.5)
+    sorbet (0.6.12780)
+      sorbet-static (= 0.6.12780)
+    sorbet-runtime (0.6.12780)
+    sorbet-static (0.6.12780-universal-darwin)
+    sorbet-static (0.6.12780-x86_64-linux)
+    sorbet-static-and-runtime (0.6.12780)
+      sorbet (= 0.6.12780)
+      sorbet-runtime (= 0.6.12780)
+    spoom (1.7.9)
       erubi (>= 1.10.0)
       prism (>= 0.28.0)
       rbi (>= 0.3.3)
@@ -225,13 +219,17 @@ GEM
       sorbet-static-and-runtime (>= 0.5.10187)
       thor (>= 0.19.2)
     stringio (3.1.7)
-    tapioca (0.4.13)
-      parlour (>= 2.1.0)
-      pry (>= 0.12.2)
-      sorbet-runtime
-      sorbet-static (>= 0.4.4471)
-      spoom
-      thor (>= 0.19.2)
+    tapioca (0.17.9)
+      benchmark
+      bundler (>= 2.2.25)
+      netrc (>= 0.11.0)
+      parallel (>= 1.21.0)
+      rbi (>= 0.3.7)
+      require-hooks (>= 0.2.2)
+      sorbet-static-and-runtime (>= 0.5.11087)
+      spoom (>= 1.7.9)
+      thor (>= 1.2.0)
+      yard-sorbet
     thor (1.4.0)
     tilt (2.6.1)
     timeout (0.4.3)
@@ -244,6 +242,9 @@ GEM
     uri (1.0.3)
     useragent (0.16.11)
     yard (0.9.37)
+    yard-sorbet (0.9.0)
+      sorbet-runtime
+      yard
     zeitwerk (2.7.3)
 
 PLATFORMS
@@ -269,8 +270,8 @@ DEPENDENCIES
   resque
   rubocop-shopify
   sidekiq
-  sorbet-runtime
-  tapioca
+  sorbet-runtime (>= 0.6.12698)
+  tapioca (>= 0.17.9)
   yard
 
 BUNDLED WITH