Merge pull request #3386 from ruby/remove-ffi-update-deps

kddnewton · web-flow · commit 6bfe3a5e3e8f · 2025-01-08T16:01:47.000-05:00
Remove FFI from versions that do not need it, update dependencies
diff --git a/Gemfile b/Gemfile
@@ -10,9 +10,7 @@ gem "rake-compiler"
 gem "test-unit"
 
 platforms :mri, :mswin, :mingw, :x64_mingw do
-  if RUBY_VERSION >= '3.0.0'
-    gem "ffi"
-  end
+  gem "ffi"
   gem "parser"
   gem "ruby_memcheck"
   gem "ruby_parser"
diff --git a/gemfiles/2.7/Gemfile b/gemfiles/2.7/Gemfile
@@ -6,7 +6,6 @@ ruby "~> 2.7.0"
 
 gemspec path: "../.."
 
-gem "ffi"
 gem "onigmo", platforms: :ruby
 gem "parser"
 gem "rake-compiler"
diff --git a/gemfiles/2.7/Gemfile.lock b/gemfiles/2.7/Gemfile.lock
@@ -7,7 +7,6 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    ffi (1.16.3)
     onigmo (0.1.0)
     parser (3.3.6.0)
       ast (~> 2.4.1)
@@ -25,7 +24,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ffi
   onigmo
   parser
   prism!
diff --git a/gemfiles/3.0/Gemfile b/gemfiles/3.0/Gemfile
@@ -6,7 +6,6 @@ ruby "~> 3.0.0"
 
 gemspec path: "../.."
 
-gem "ffi"
 gem "onigmo", platforms: :ruby
 gem "parser"
 gem "rake-compiler"
diff --git a/gemfiles/3.0/Gemfile.lock b/gemfiles/3.0/Gemfile.lock
@@ -7,7 +7,6 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    ffi (1.17.1)
     logger (1.6.1)
     mini_portile2 (2.8.8)
     nokogiri (1.17.2)
@@ -33,7 +32,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ffi
   onigmo
   parser
   prism!
diff --git a/gemfiles/3.1/Gemfile b/gemfiles/3.1/Gemfile
@@ -6,7 +6,6 @@ ruby "~> 3.1.0"
 
 gemspec path: "../.."
 
-gem "ffi"
 gem "onigmo", platforms: :ruby
 gem "parser"
 gem "rake-compiler"
diff --git a/gemfiles/3.1/Gemfile.lock b/gemfiles/3.1/Gemfile.lock
@@ -7,7 +7,6 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    ffi (1.17.1)
     logger (1.6.4)
     mini_portile2 (2.8.8)
     nokogiri (1.18.1)
@@ -33,7 +32,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ffi
   onigmo
   parser
   prism!
diff --git a/gemfiles/3.2/Gemfile b/gemfiles/3.2/Gemfile
@@ -6,7 +6,6 @@ ruby "~> 3.2.0"
 
 gemspec path: "../.."
 
-gem "ffi"
 gem "onigmo", platforms: :ruby
 gem "parser"
 gem "rake-compiler"
diff --git a/gemfiles/3.2/Gemfile.lock b/gemfiles/3.2/Gemfile.lock
@@ -7,7 +7,6 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    ffi (1.17.1)
     logger (1.6.4)
     mini_portile2 (2.8.8)
     nokogiri (1.18.1)
@@ -33,7 +32,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ffi
   onigmo
   parser
   prism!
diff --git a/gemfiles/3.3/Gemfile b/gemfiles/3.3/Gemfile
@@ -6,7 +6,6 @@ ruby "~> 3.3.0"
 
 gemspec path: "../.."
 
-gem "ffi"
 gem "onigmo", platforms: :ruby
 gem "parser"
 gem "rake-compiler"
diff --git a/gemfiles/3.3/Gemfile.lock b/gemfiles/3.3/Gemfile.lock
@@ -7,7 +7,6 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    ffi (1.17.1)
     logger (1.6.4)
     mini_portile2 (2.8.8)
     nokogiri (1.18.1)
@@ -33,7 +32,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ffi
   onigmo
   parser
   prism!
diff --git a/gemfiles/3.4/Gemfile b/gemfiles/3.4/Gemfile
@@ -6,7 +6,6 @@ ruby "~> 3.4.0"
 
 gemspec path: "../.."
 
-gem "ffi"
 gem "onigmo", platforms: :ruby
 gem "parser"
 gem "rake-compiler"
diff --git a/gemfiles/3.4/Gemfile.lock b/gemfiles/3.4/Gemfile.lock
@@ -7,7 +7,6 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    ffi (1.17.1)
     logger (1.6.4)
     mini_portile2 (2.8.8)
     nokogiri (1.18.1)
@@ -33,7 +32,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ffi
   onigmo
   parser
   prism!
diff --git a/gemfiles/typecheck/Gemfile b/gemfiles/typecheck/Gemfile
@@ -2,8 +2,6 @@
 
 source "https://rubygems.org"
 
-# gemspec path: "../.."
-
 gem "minitest"
 gem "parser"
 gem "rake-compiler"
diff --git a/gemfiles/typecheck/Gemfile.lock b/gemfiles/typecheck/Gemfile.lock
@@ -19,7 +19,7 @@ GEM
     benchmark (0.4.0)
     bigdecimal (3.1.9)
     concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    connection_pool (2.5.0)
     csv (3.3.2)
     drb (2.2.1)
     erubi (1.13.1)
@@ -60,14 +60,14 @@ GEM
       sexp_processor (~> 4.16)
     securerandom (0.4.1)
     sexp_processor (4.17.3)
-    sorbet (0.5.11717)
-      sorbet-static (= 0.5.11717)
-    sorbet-runtime (0.5.11717)
-    sorbet-static (0.5.11717-universal-darwin)
-    sorbet-static (0.5.11717-x86_64-linux)
-    sorbet-static-and-runtime (0.5.11717)
-      sorbet (= 0.5.11717)
-      sorbet-runtime (= 0.5.11717)
+    sorbet (0.5.11734)
+      sorbet-static (= 0.5.11734)
+    sorbet-runtime (0.5.11734)
+    sorbet-static (0.5.11734-universal-darwin)
+    sorbet-static (0.5.11734-x86_64-linux)
+    sorbet-static-and-runtime (0.5.11734)
+      sorbet (= 0.5.11734)
+      sorbet-runtime (= 0.5.11734)
     spoom (1.5.0)
       erubi (>= 1.10.0)
       prism (>= 0.28.0)
@@ -90,7 +90,7 @@ GEM
       terminal-table (>= 2, < 4)
       uri (>= 0.12.0)
     strscan (3.1.2)
-    tapioca (0.16.5)
+    tapioca (0.16.6)
       bundler (>= 2.2.25)
       netrc (>= 0.11.0)
       parallel (>= 1.21.0)
