Skip to content

Commit 5f73053

Browse files
authored
Merge pull request SAML-Toolkits#462 from HarlemSquirrel/jruby-9.2.0.0
Improve JRuby support
2 parents a15c183 + a3fb3e9 commit 5f73053

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

.travis.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ rvm:
1010
- 2.4.0
1111
- 2.5.0
1212
- ree
13-
- jruby-1.7.21
14-
- jruby-9.0.0.0
13+
- jruby-1.7.27
14+
- jruby-9.1.17.0
15+
- jruby-9.2.0.0
1516
gemfile:
1617
- Gemfile
1718
- gemfiles/nokogiri-1.5.gemfile
@@ -21,7 +22,11 @@ matrix:
2122
gemfile: Gemfile
2223
- rvm: ree
2324
gemfile: Gemfile
24-
- rvm: jruby-9.0.0.0
25+
- rvm: jruby-1.7.27
2526
gemfile: gemfiles/nokogiri-1.5.gemfile
26-
- rvm: jruby-1.7.21
27+
- rvm: jruby-9.1.17.0
2728
gemfile: gemfiles/nokogiri-1.5.gemfile
29+
- rvm: jruby-9.2.0.0
30+
gemfile: gemfiles/nokogiri-1.5.gemfile
31+
env:
32+
- JRUBY_OPTS="--debug"

ruby-saml.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
3030
# have liked to constrain Ruby 1.8.7 to install only the 1.5.x versions.
3131
if defined?(JRUBY_VERSION)
3232
s.add_runtime_dependency('nokogiri', '>= 1.6.0')
33-
s.add_runtime_dependency('jruby-openssl', '>= 0.9.8')
33+
s.add_runtime_dependency('jruby-openssl', '>= 0.9.8') if JRUBY_VERSION < '9.2.0.0'
3434
elsif RUBY_VERSION < '1.9'
3535
s.add_runtime_dependency('uuid')
3636
s.add_runtime_dependency('nokogiri', '<= 1.5.11')

0 commit comments

Comments
 (0)