Merge pull request #86 from ksss/rbs-3.6

Update to rbs v3.6

.github/workflows/main.yml

@@ -14,7 +14,6 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - '3.0'
           - '3.1'
           - '3.2'
           - '3.3'

Gemfile.lock

@@ -7,16 +7,17 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.4)
+    activesupport (7.2.1)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     ast (2.4.2)
     base64 (0.2.0)
     bigdecimal (3.1.8)
@@ -31,40 +32,39 @@ GEM
     ffi (1.17.0-x86_64-darwin)
     ffi (1.17.0-x86_64-linux-gnu)
     fileutils (1.7.2)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
-    irb (1.13.2)
+    irb (1.14.1)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.0)
+    logger (1.6.1)
     minitest (5.25.1)
-    mutex_m (0.2.0)
-    parser (3.3.3.0)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
     psych (5.1.2)
       stringio
-    racc (1.8.0)
+    racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbs (3.5.1)
+    rbs (3.6.0)
       logger
     rdoc (6.7.0)
       psych (>= 4.0.0)
-    reline (0.5.9)
+    reline (0.5.10)
       io-console (~> 0.5)
     rgot (1.4.0)
     securerandom (0.3.1)
-    steep (1.7.1)
+    steep (1.8.0)
       activesupport (>= 5.1)
       concurrent-ruby (>= 1.1.10)
       csv (>= 3.0.9)
@@ -75,7 +75,7 @@ GEM
       logger (>= 1.3.0)
       parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 3.5.0.pre)
+      rbs (~> 3.6.0)
       securerandom (>= 0.1)
       strscan (>= 1.0.0)
       terminal-table (>= 2, < 4)
@@ -85,7 +85,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
 
 PLATFORMS
   arm64-darwin-22

lib/orthoses/content/duplication_checker.rb

@@ -18,7 +18,9 @@ def update_decl
         drop_known_method_definition
         drop_known_const_definition
 
-        @decl.members.replace(@uniq_map.values)
+        # HACK
+        new_members = @uniq_map.values
+        @decl.instance_eval { @members = new_members }
 
         @uniq_map.clear
       end

orthoses.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description = "Build RBS by Rack base architecture"
   spec.homepage = "https://github.com/ksss/orthoses"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.0.0"
+  spec.required_ruby_version = ">= 3.1.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage

rbs_collection.lock.yaml

@@ -34,21 +34,17 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 436720a4e366323a5a5bf22d71abb9943663edd8
+    revision: f5f878b82e8a8d341b8630040bb1e006ace1ddd7
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rbs
-  version: 3.5.1
+  version: 3.6.0
   source:
     type: rubygems
 - name: rdoc
   version: '0'
   source:
     type: stdlib
-- name: rgot
-  version: 1.4.0
-  source:
-    type: rubygems
 - name: tsort
   version: '0'
   source:

rbs_collection.yaml

@@ -28,3 +28,5 @@ gems:
     ignore: true
   - name: tmpdir
     ignore: true
+  - name: rgot
+    ignore: true