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

Commit 1f30789

Browse files
committed
Prevent ffi and childprocess causing build failures
1 parent 1a1cc94 commit 1f30789

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

Gemfile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ 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
@@ -41,7 +43,14 @@ else
4143
end
4244

4345
platforms :jruby do
44-
gem "jruby-openssl"
46+
if RUBY_VERSION < '1.9.0'
47+
# Pin jruby-openssl on older J Ruby
48+
gem "jruby-openssl", "< 0.10.0"
49+
# Pin child-process on older J Ruby
50+
gem "childprocess", "< 1.0.0"
51+
else
52+
gem "jruby-openssl"
53+
end
4554
end
4655

4756
gem 'simplecov', '~> 0.8'

0 commit comments

Comments
 (0)