Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Commit b925766

Browse files
authored
Prevent ffi and childprocess causing build failures (#2595)
1 parent 1a1cc94 commit b925766

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

Gemfile

+15-2
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,29 @@ if RUBY_VERSION < '2.0.0' || RUBY_ENGINE == 'java'
3232
gem 'json', '< 2.0.0'
3333
end
3434

35-
if RUBY_VERSION < '2.0.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
35+
if RUBY_VERSION < '2.2.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
36+
gem 'ffi', '< 1.10'
37+
elsif RUBY_VERSION < '2.0.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
3638
gem 'ffi', '< 1.9.15' # allow ffi to be installed on older rubies on windows
3739
elsif RUBY_VERSION < '1.9'
3840
gem 'ffi', '< 1.9.19' # ffi dropped Ruby 1.8 support in 1.9.19
3941
else
4042
gem 'ffi', '~> 1.9.25'
4143
end
4244

45+
if RUBY_VERSION < '2.2.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
46+
gem "childprocess", "< 1.0.0"
47+
end
48+
4349
platforms :jruby do
44-
gem "jruby-openssl"
50+
if RUBY_VERSION < '1.9.0'
51+
# Pin jruby-openssl on older J Ruby
52+
gem "jruby-openssl", "< 0.10.0"
53+
# Pin child-process on older J Ruby
54+
gem "childprocess", "< 1.0.0"
55+
else
56+
gem "jruby-openssl"
57+
end
4558
end
4659

4760
gem 'simplecov', '~> 0.8'

0 commit comments

Comments
 (0)