File tree Expand file tree Collapse file tree 2 files changed +6
-3
lines changed Expand file tree Collapse file tree 2 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -17,7 +17,6 @@ gemfile:
17
17
- Gemfile
18
18
- gemfiles/nokogiri-1.5.gemfile
19
19
before_install :
20
- - unset _JAVA_OPTIONS
21
20
- gem update bundler
22
21
matrix :
23
22
exclude :
Original file line number Diff line number Diff line change @@ -29,8 +29,12 @@ Gem::Specification.new do |s|
29
29
# Nokogiri's version dependent on the Ruby version, even though we would
30
30
# have liked to constrain Ruby 1.8.7 to install only the 1.5.x versions.
31
31
if defined? ( JRUBY_VERSION )
32
- s . add_runtime_dependency ( 'nokogiri' , '>= 1.6.0' )
33
- s . add_runtime_dependency ( 'jruby-openssl' , '>= 0.9.8' ) if JRUBY_VERSION < '9.2.0.0'
32
+ if JRUBY_VERSION < '9.2.0.0'
33
+ s . add_runtime_dependency ( 'nokogiri' , '>= 1.6.0' , '<= 1.8.5' )
34
+ s . add_runtime_dependency ( 'jruby-openssl' , '>= 0.9.8' )
35
+ else
36
+ s . add_runtime_dependency ( 'nokogiri' , '>= 1.6.0' )
37
+ end
34
38
elsif RUBY_VERSION < '1.9'
35
39
s . add_runtime_dependency ( 'uuid' )
36
40
s . add_runtime_dependency ( 'nokogiri' , '<= 1.5.11' )
You can’t perform that action at this time.
0 commit comments