Skip to content

Commit a4b0111

Browse files
authored
Merge pull request #651 from SAML-Toolkits/check_dependencies
Update dependencies
2 parents 85765cd + af955af commit a4b0111

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
os: [ubuntu-20.04, macos-latest]
12-
ruby-version: [2.1.9, 2.2.10, 2.3.8, 2.4.6, 2.5.8, 2.6.6, 2.7.2, 3.0.1, '3.1', '3.2', jruby-9.1.17.0, jruby-9.2.17.0, truffleruby]
12+
ruby-version: [2.1.9, 2.2.10, 2.3.8, 2.4.6, 2.5.8, 2.6.6, 2.7.2, 3.0.1, 3.1, 3.2, jruby-9.1.17.0, jruby-9.2.17.0, jruby-9.3.2.0, jruby-9.4.0.0, truffleruby]
1313
runs-on: ${{ matrix.os }}
1414
steps:
1515
- uses: actions/checkout@v2

ruby-saml.gemspec

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,18 @@ Gem::Specification.new do |s|
2727
# Nokogiri's version dependent on the Ruby version, even though we would
2828
# have liked to constrain Ruby 1.8.7 to install only the 1.5.x versions.
2929
if defined?(JRUBY_VERSION)
30-
if JRUBY_VERSION < '9.2.0.0'
30+
if JRUBY_VERSION < '9.1.7.0'
3131
s.add_runtime_dependency('nokogiri', '>= 1.8.2', '<= 1.8.5')
3232
s.add_runtime_dependency('jruby-openssl', '>= 0.9.8')
3333
s.add_runtime_dependency('json', '< 2.3.0')
34+
elsif JRUBY_VERSION < '9.2.0.0'
35+
s.add_runtime_dependency('nokogiri', '>= 1.9.1', '< 1.10.0')
36+
elsif JRUBY_VERSION < '9.3.2.0'
37+
s.add_runtime_dependency('nokogiri', '>= 1.11.4')
38+
s.add_runtime_dependency('rexml')
3439
else
35-
s.add_runtime_dependency('nokogiri', '>= 1.8.2')
40+
s.add_runtime_dependency('nokogiri', '>= 1.13.10')
41+
s.add_runtime_dependency('rexml')
3642
end
3743
elsif RUBY_VERSION < '1.9'
3844
s.add_runtime_dependency('uuid')
@@ -42,8 +48,14 @@ Gem::Specification.new do |s|
4248
s.add_runtime_dependency('json', '< 2.3.0')
4349
elsif RUBY_VERSION < '2.3'
4450
s.add_runtime_dependency('nokogiri', '>= 1.9.1', '< 1.10.0')
51+
elsif RUBY_VERSION < '2.5'
52+
s.add_runtime_dependency('nokogiri', '>= 1.10.10', '< 1.11.0')
53+
s.add_runtime_dependency('rexml')
54+
elsif RUBY_VERSION < '2.6'
55+
s.add_runtime_dependency('nokogiri', '>= 1.11.4')
56+
s.add_runtime_dependency('rexml')
4557
else
46-
s.add_runtime_dependency('nokogiri', '>= 1.10.5')
58+
s.add_runtime_dependency('nokogiri', '>= 1.13.10')
4759
s.add_runtime_dependency('rexml')
4860
end
4961

@@ -57,10 +69,10 @@ Gem::Specification.new do |s|
5769
s.add_development_dependency('minitest', '~> 5.5')
5870
s.add_development_dependency('mocha', '~> 0.14')
5971

60-
if RUBY_VERSION < '3.2'
72+
if RUBY_VERSION < '2.0'
6173
s.add_development_dependency('rake', '~> 10')
6274
else
63-
s.add_development_dependency('rake', '~> 12')
75+
s.add_development_dependency('rake', '>= 12.3.3')
6476
end
6577

6678
s.add_development_dependency('shoulda', '~> 2.11')

0 commit comments

Comments
 (0)