Skip to content

Commit 7808e03

Browse files
committed
Remove 1.8.7 and ree fom Travis because it does not support them anymore. Adapt json for jruby as well to prevent unexpected tPOW error
1 parent 32a0aab commit 7808e03

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

.travis.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: ruby
22
rvm:
3-
- 1.8.7
43
- 1.9.3
54
- 2.0.0
65
- 2.1.10
@@ -11,7 +10,6 @@ rvm:
1110
- 2.6.6
1211
- 2.7.2
1312
- 3.0.0
14-
- ree
1513
- jruby-1.7.27
1614
- jruby-9.1.17.0
1715
- jruby-9.2.13.0
@@ -22,10 +20,6 @@ before_install:
2220
- gem update bundler
2321
matrix:
2422
exclude:
25-
- rvm: 1.8.7
26-
gemfile: Gemfile
27-
- rvm: ree
28-
gemfile: Gemfile
2923
- rvm: jruby-1.7.27
3024
gemfile: gemfiles/nokogiri-1.5.gemfile
3125
- rvm: jruby-9.1.17.0
@@ -34,6 +28,8 @@ matrix:
3428
gemfile: gemfiles/nokogiri-1.5.gemfile
3529
- rvm: 2.1.5
3630
gemfile: gemfiles/nokogiri-1.5.gemfile
31+
- rvm: 2.1.10
32+
gemfile: gemfiles/nokogiri-1.5.gemfile
3733
- rvm: 2.2.10
3834
gemfile: gemfiles/nokogiri-1.5.gemfile
3935
- rvm: 2.3.8

ruby-saml.gemspec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
3131
if JRUBY_VERSION < '9.2.0.0'
3232
s.add_runtime_dependency('nokogiri', '>= 1.8.2', '<= 1.8.5')
3333
s.add_runtime_dependency('jruby-openssl', '>= 0.9.8')
34+
s.add_runtime_dependency('json', '< 2.3.0')
3435
else
3536
s.add_runtime_dependency('nokogiri', '>= 1.8.2')
3637
end
@@ -39,7 +40,7 @@ Gem::Specification.new do |s|
3940
s.add_runtime_dependency('nokogiri', '<= 1.5.11')
4041
elsif RUBY_VERSION < '2.1'
4142
s.add_runtime_dependency('nokogiri', '>= 1.5.10', '<= 1.6.8.1')
42-
s.add_runtime_dependency('json', '< 2.2.0')
43+
s.add_runtime_dependency('json', '< 2.3.0')
4344
elsif RUBY_VERSION < '2.3'
4445
s.add_runtime_dependency('nokogiri', '>= 1.9.1', '<= 1.10.0')
4546
else

0 commit comments

Comments
 (0)