Merge pull request #2707 from joshcooper/ffi_bump

(FACT-3434) Accept ffi >= 1.16.3, < 1.17.0
puppetlabs · Apr 25, 2024 · d04a42d · d04a42d
2 parents 27e94e7 + 9ef20e5
commit d04a42d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -13,10 +13,9 @@ gem 'packaging', require: false
 local_gemfile = File.expand_path('Gemfile.local', __dir__)
 eval_gemfile(local_gemfile) if File.exist?(local_gemfile)
 
-# ffi >= 1.16.0 introduces breaking changes, so we pin to the version prior
-# for now
 group(:integration, optional: true) do
-  gem 'ffi', '1.15.5', require: false
+  # 1.16.0 - 1.16.2 are broken on Windows
+  gem 'ffi', '>= 1.15.5', '< 1.17.0', '!= 1.16.0', '!= 1.16.1', '!= 1.16.2', require: false
 end
 
 group(:documentation) do

diff --git a/facter.gemspec b/facter.gemspec
@@ -34,7 +34,8 @@ Gem::Specification.new do |spec|
   # or indirectly contain native extensions. The intent behind excluding these
   # gems from runtime dependencies is to allow users to be able to install
   # Facter without a compiler.
-  spec.add_development_dependency 'ffi', '1.15.5'
+  # ffi 1.16.0 - 1.16.2 are broken on Windows
+  spec.add_development_dependency 'ffi', '>= 1.15.5', '< 1.17.0', '!= 1.16.0', '!= 1.16.1', '!= 1.16.2'
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 1.28' # last version to support 2.5