Upgrade bundler and gems (#73)

* Upgrade bundler and gems * bundle lock --add-platform x86_64-linux * stop testing head: nokogiri-1.15.3-x86_64-linux requires ruby version < 3.3.dev, >= 2.7, which is incompatible with the current version, 3.3.0.dev * downgrade spoom for CI * tc
rubyatscale · Aug 7, 2023 · 3bab672 · 3bab672
1 parent e2f4e3d
commit 3bab672
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 71 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,6 @@ jobs:
           # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
           - '3.0'
           - 3.1
-          - head
     env:
       BUNDLE_GEMFILE: Gemfile
     name: "RSpec tests: Ruby ${{ matrix.ruby }}"
@@ -35,6 +34,6 @@ jobs:
         uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
         with:
           bundler-cache: true
-          ruby-version: head
+          ruby-version: 3.1
       - name: Run static type checks
         run: bundle exec srb tc
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -9,56 +9,52 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.4.3)
-      actionview (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      rack (~> 2.0, >= 2.2.0)
+    actionpack (7.0.6)
+      actionview (= 7.0.6)
+      activesupport (= 7.0.6)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actionview (7.0.6)
+      activesupport (= 7.0.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.4.3)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
-    better_html (2.0.1)
+    better_html (2.0.2)
       actionview (>= 6.0)
       activesupport (>= 6.0)
       ast (~> 2.0)
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
     builder (3.2.4)
-    code_teams (1.0.1)
+    code_teams (1.0.2)
       sorbet-runtime
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
     constant_resolver (0.2.0)
     crass (1.0.6)
     diff-lcs (1.5.0)
     erubi (1.12.0)
-    i18n (1.13.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    loofah (2.21.2)
+    loofah (2.21.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     method_source (1.0.0)
-    mini_portile2 (2.8.2)
-    minitest (5.18.0)
+    minitest (5.19.0)
     netrc (0.11.0)
-    nokogiri (1.14.4)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.4-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.14.4-x86_64-darwin)
+    nokogiri (1.15.3-x86_64-linux)
       racc (~> 1.4)
     packs (0.0.6)
       sorbet-runtime
@@ -73,68 +69,68 @@ GEM
       sorbet-runtime (>= 0.5.9914)
       zeitwerk (>= 2.6.1)
     parallel (1.23.0)
-    parser (3.2.2.1)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
-    pry (0.14.1)
+      racc
+    prettier_print (1.2.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.6.2)
-    rack (2.2.7)
+    racc (1.7.1)
+    rack (2.2.8)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
-    railties (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.0.6)
+      actionpack (= 7.0.6)
+      activesupport (= 7.0.6)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rake (13.0.6)
-    rbi (0.0.16)
+    rbi (0.0.17)
       ast
-      parser (>= 2.6.4.0)
+      parser (>= 3.0.0)
       sorbet-runtime (>= 0.5.9204)
-      unparser
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+      unparser (>= 0.5.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
     smart_properties (1.17.0)
-    sorbet (0.5.10821)
-      sorbet-static (= 0.5.10821)
-    sorbet-runtime (0.5.10821)
-    sorbet-static (0.5.10821-universal-darwin-14)
-    sorbet-static (0.5.10821-universal-darwin-15)
-    sorbet-static (0.5.10821-universal-darwin-16)
-    sorbet-static (0.5.10821-universal-darwin-17)
-    sorbet-static (0.5.10821-universal-darwin-18)
-    sorbet-static (0.5.10821-universal-darwin-19)
-    sorbet-static (0.5.10821-universal-darwin-20)
-    sorbet-static (0.5.10821-universal-darwin-21)
-    sorbet-static (0.5.10821-universal-darwin-22)
-    sorbet-static (0.5.10821-x86_64-linux)
-    sorbet-static-and-runtime (0.5.10821)
-      sorbet (= 0.5.10821)
-      sorbet-runtime (= 0.5.10821)
+    sorbet (0.5.10950)
+      sorbet-static (= 0.5.10950)
+    sorbet-runtime (0.5.10950)
+    sorbet-static (0.5.10950-universal-darwin-22)
+    sorbet-static (0.5.10950-x86_64-linux)
+    sorbet-static-and-runtime (0.5.10950)
+      sorbet (= 0.5.10950)
+      sorbet-runtime (= 0.5.10950)
     spoom (1.2.1)
+      erubi (>= 1.10.0)
       sorbet (>= 0.5.10187)
       sorbet-runtime (>= 0.5.9204)
+      syntax_tree (>= 6.1.1)
       thor (>= 0.19.2)
-    tapioca (0.11.6)
+    syntax_tree (6.1.1)
+      prettier_print (>= 1.2.0)
+    tapioca (0.11.8)
       bundler (>= 2.2.25)
       netrc (>= 0.11.0)
       parallel (>= 1.21.0)
@@ -146,20 +142,17 @@ GEM
     thor (1.2.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unparser (0.6.7)
+    unparser (0.6.8)
       diff-lcs (~> 1.3)
       parser (>= 3.2.0)
     yard (0.9.34)
     yard-sorbet (0.8.1)
       sorbet-runtime (>= 0.5)
       yard (>= 0.9)
-    zeitwerk (2.6.8)
+    zeitwerk (2.6.11)
 
 PLATFORMS
-  arm64-darwin-20
-  arm64-darwin-21
-  ruby
-  x86_64-darwin-20
+  arm64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
@@ -173,4 +166,4 @@ DEPENDENCIES
   tapioca
 
 BUNDLED WITH
-   2.3.8
+   2.4.18
diff --git a/lib/code_ownership.rb b/lib/code_ownership.rb
@@ -156,7 +156,7 @@ def backtrace_with_ownership(backtrace)
   end
   private_class_method(:backtrace_with_ownership)
 
-  sig { params(klass: T.nilable(T.any(Class, Module))).returns(T.nilable(::CodeTeams::Team)) }
+  sig { params(klass: T.nilable(T.any(T::Class[T.anything], Module))).returns(T.nilable(::CodeTeams::Team)) }
   def for_class(klass)
     @memoized_values ||= T.let(@memoized_values, T.nilable(T::Hash[String, T.nilable(::CodeTeams::Team)]))
     @memoized_values ||= {}

diff --git a/lib/code_ownership/private.rb b/lib/code_ownership/private.rb
@@ -62,7 +62,7 @@ def self.validate!(files:, autocorrect: true, stage_changes: true)
 
     # Returns a string version of the relative path to a Rails constant,
     # or nil if it can't find something
-    sig { params(klass: T.nilable(T.any(Class, Module))).returns(T.nilable(String)) }
+    sig { params(klass: T.nilable(T.any(T::Class[T.anything], Module))).returns(T.nilable(String)) }
     def self.path_from_klass(klass)
       if klass
         path = Object.const_source_location(klass.to_s)&.first