[CHA-2578] chore: relax faraday and sorbet-runtime version constraints (#200)

nijeesh-stream · claude · web-flow · commit 1411d388f022 · 2026-03-05T13:53:54.000+01:00
* chore: relax faraday and sorbet-runtime version constraints - faraday: ~> 2.12.2 -> ~> 2.12 (unblocks security fix in 2.14.1) - faraday-multipart: ~> 1.1.0 -> ~> 1.1 (allows 1.2.x, Ruby 4 compat) - faraday-net_http_persistent: ~> 2.3.0 -> ~> 2.3 - sorbet-runtime: ~> 0.5.11820 -> >= 0.5.11820, < 2 (allows 0.5.x and 0.6.x) - sorbet (dev): ~> 0.5 -> ~> 0.6 Closes #196, closes #189 * chore: add Ruby 4.0 to CI matrix, run lint checks on 3.4 and 4.0 * fix: update sorbet RBI stubs for Sorbet 0.6 compatibility - Remove conflicting method stubs from hidden.rbi (now in Sorbet 0.6 stdlib) - Add typed: true headers to gem RBIs missing sigils - Ignore sorbet/rbi/sorbet-typed in sorbet config (stale 0.5 community stubs) - Delete sorbet/rbi/sorbet-typed (ignored, 1071 lines of stale stubs removed) * chore: make lint configurable via matrix flag instead of hardcoded ruby version check Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * enabled lint check on ruby 3.4 as well * fix: tighten sorbet-runtime upper bound from < 2 to < 1 Current sorbet versions are 0.5.x and 0.6.x, both of which are < 1. Using < 2 was unnecessarily wide and would allow a hypothetical 1.x series without explicit opt-in. --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,14 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        ruby: ["3.0", "3.1", "3.4"]
+        ruby: ["3.0", "3.1", "3.4", "4.0"]
+        include:
+          # Add lint: true to any Ruby version that should run rubocop + srb tc.
+          # Always include 4.0; also add it to the latest Ruby when a newer version is added.
+          - ruby: "4.0"
+            lint: true
+          - ruby: "3.4"
+            lint: true
     name: 💎 Ruby ${{ matrix.ruby }}
     steps:
       - uses: actions/checkout@v4
@@ -21,10 +28,10 @@ jobs:
           bundler-cache: true
 
       - run: bundle exec rake rubocop
-        if: ${{ matrix.ruby == '3.4' }}
+        if: ${{ matrix.lint == true }}
 
       - run: bundle exec srb tc
-        if: ${{ matrix.ruby == '3.4' }}
+        if: ${{ matrix.lint == true }}
 
       - run: bundle exec rspec ./spec --require spec_helper
         env:
diff --git a/Gemfile b/Gemfile
@@ -14,7 +14,7 @@ group :dev do
   gem 'rubocop-ast', '~> 1.23', require: false
   gem 'simplecov', '~> 0.21.2'
   gem 'simplecov-console', '~> 0.9.1'
-  gem 'sorbet', '~> 0.5.10539'
+  gem 'sorbet', '~> 0.6'
 end
 
 group :test do
diff --git a/sorbet/config b/sorbet/config
@@ -1,4 +1,8 @@
 --dir
 .
---ignore=vendor/bundle,spec
---disable-watchman
+--ignore=vendor/bundle,spec,sorbet/rbi/sorbet-typed
+# sorbet/rbi/sorbet-typed contains community stubs generated for Sorbet 0.5.
+# Sorbet 0.6 defaults unsigned RBI files to typed: strict, causing 7017 errors
+# in these stale stubs. They cover dev tools (rake, rspec, rubocop) that don't
+# need type checking. Migrate to Tapioca in a follow-up to replace all stubs.
+--disable-watchman
diff --git a/sorbet/rbi/gems/connection_pool.rbi b/sorbet/rbi/gems/connection_pool.rbi
@@ -1,3 +1,4 @@
+# typed: true
 # This file is autogenerated. Do not edit it by hand. Regenerate it with:
 #   srb rbi gems
 
diff --git a/sorbet/rbi/gems/docile.rbi b/sorbet/rbi/gems/docile.rbi
@@ -1,3 +1,4 @@
+# typed: true
 # This file is autogenerated. Do not edit it by hand. Regenerate it with:
 #   srb rbi gems
 
diff --git a/sorbet/rbi/gems/faraday-em_http.rbi b/sorbet/rbi/gems/faraday-em_http.rbi
@@ -1,3 +1,4 @@
+# typed: true
 # This file is autogenerated. Do not edit it by hand. Regenerate it with:
 #   srb rbi gems
 
diff --git a/sorbet/rbi/gems/faraday-em_synchrony.rbi b/sorbet/rbi/gems/faraday-em_synchrony.rbi
@@ -1,3 +1,4 @@
+# typed: true
 # This file is autogenerated. Do not edit it by hand. Regenerate it with:
 #   srb rbi gems
 
diff --git a/sorbet/rbi/gems/faraday-excon.rbi b/sorbet/rbi/gems/faraday-excon.rbi
@@ -1,3 +1,4 @@
+# typed: true
 # This file is autogenerated. Do not edit it by hand. Regenerate it with:
 #   srb rbi gems
 
diff --git a/sorbet/rbi/gems/faraday-httpclient.rbi b/sorbet/rbi/gems/faraday-httpclient.rbi
@@ -1,3 +1,4 @@
+# typed: true
 # This file is autogenerated. Do not edit it by hand. Regenerate it with:
 #   srb rbi gems
 
diff --git a/sorbet/rbi/gems/faraday-multipart.rbi b/sorbet/rbi/gems/faraday-multipart.rbi
@@ -1,3 +1,4 @@
+# typed: true
 # This file is autogenerated. Do not edit it by hand. Regenerate it with:
 #   srb rbi gems
 
diff --git a/sorbet/rbi/gems/faraday-net_http.rbi b/sorbet/rbi/gems/faraday-net_http.rbi
@@ -1,3 +1,4 @@
+# typed: true
 # This file is autogenerated. Do not edit it by hand. Regenerate it with:
 #   srb rbi gems
 
diff --git a/sorbet/rbi/gems/faraday-net_http_persistent.rbi b/sorbet/rbi/gems/faraday-net_http_persistent.rbi
@@ -1,3 +1,4 @@
+# typed: true
 # This file is autogenerated. Do not edit it by hand. Regenerate it with:
 #   srb rbi gems
 
diff --git a/sorbet/rbi/gems/faraday-patron.rbi b/sorbet/rbi/gems/faraday-patron.rbi
@@ -1,3 +1,4 @@
+# typed: true
 # This file is autogenerated. Do not edit it by hand. Regenerate it with:
 #   srb rbi gems
 
diff --git a/sorbet/rbi/gems/faraday-rack.rbi b/sorbet/rbi/gems/faraday-rack.rbi
@@ -1,3 +1,4 @@
+# typed: true
 # This file is autogenerated. Do not edit it by hand. Regenerate it with:
 #   srb rbi gems
 
diff --git a/sorbet/rbi/gems/method_source.rbi b/sorbet/rbi/gems/method_source.rbi
@@ -1,3 +1,4 @@
+# typed: true
 # This file is autogenerated. Do not edit it by hand. Regenerate it with:
 #   srb rbi gems
 
diff --git a/sorbet/rbi/gems/multipart-post.rbi b/sorbet/rbi/gems/multipart-post.rbi
@@ -1,3 +1,4 @@
+# typed: true
 # This file is autogenerated. Do not edit it by hand. Regenerate it with:
 #   srb rbi gems
 
diff --git a/sorbet/rbi/gems/net-http-persistent.rbi b/sorbet/rbi/gems/net-http-persistent.rbi
@@ -1,3 +1,4 @@
+# typed: true
 # This file is autogenerated. Do not edit it by hand. Regenerate it with:
 #   srb rbi gems
 
diff --git a/sorbet/rbi/gems/simplecov-html.rbi b/sorbet/rbi/gems/simplecov-html.rbi
@@ -1,3 +1,4 @@
+# typed: true
 # This file is autogenerated. Do not edit it by hand. Regenerate it with:
 #   srb rbi gems
 
diff --git a/sorbet/rbi/gems/simplecov_json_formatter.rbi b/sorbet/rbi/gems/simplecov_json_formatter.rbi
@@ -1,3 +1,4 @@
+# typed: true
 # This file is autogenerated. Do not edit it by hand. Regenerate it with:
 #   srb rbi gems
 
diff --git a/sorbet/rbi/hidden-definitions/hidden.rbi b/sorbet/rbi/hidden-definitions/hidden.rbi
@@ -4607,8 +4607,6 @@ class Gem::SpecFetcher
 
   def specs(); end
 
-  def suggest_gems_from_name(gem_name, type=T.unsafe(nil)); end
-
   def tuples_for(source, type, gracefully_ignore=T.unsafe(nil)); end
 end
 
@@ -4728,8 +4726,6 @@ class IO
 
   def wait(*arg); end
 
-  def wait_readable(*arg); end
-
   def wait_writable(*arg); end
 end
 
diff --git a/sorbet/rbi/sorbet-typed/lib/faraday/all/faraday.rbi b/sorbet/rbi/sorbet-typed/lib/faraday/all/faraday.rbi
diff --git a/sorbet/rbi/sorbet-typed/lib/rainbow/all/rainbow.rbi b/sorbet/rbi/sorbet-typed/lib/rainbow/all/rainbow.rbi
diff --git a/sorbet/rbi/sorbet-typed/lib/rake/all/rake.rbi b/sorbet/rbi/sorbet-typed/lib/rake/all/rake.rbi
diff --git a/sorbet/rbi/sorbet-typed/lib/rspec-core/all/rspec-core.rbi b/sorbet/rbi/sorbet-typed/lib/rspec-core/all/rspec-core.rbi
diff --git a/sorbet/rbi/sorbet-typed/lib/rubocop/>=1.8/rubocop.rbi b/sorbet/rbi/sorbet-typed/lib/rubocop/>=1.8/rubocop.rbi
diff --git a/sorbet/rbi/sorbet-typed/lib/yard/all/yard.rbi b/sorbet/rbi/sorbet-typed/lib/yard/all/yard.rbi
diff --git a/stream-chat.gemspec b/stream-chat.gemspec

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# typed: true`
`1`	`2`	`# This file is autogenerated. Do not edit it by hand. Regenerate it with:`
`2`	`3`	`# srb rbi gems`
`3`	`4`