Skip to content

Commit

Permalink
Merge pull request #651 from SAML-Toolkits/check_dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
pitbulk authored Jan 4, 2023
2 parents 85765cd + af955af commit a4b0111
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04, macos-latest]
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]
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]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand Down
22 changes: 17 additions & 5 deletions ruby-saml.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,18 @@ Gem::Specification.new do |s|
# Nokogiri's version dependent on the Ruby version, even though we would
# have liked to constrain Ruby 1.8.7 to install only the 1.5.x versions.
if defined?(JRUBY_VERSION)
if JRUBY_VERSION < '9.2.0.0'
if JRUBY_VERSION < '9.1.7.0'
s.add_runtime_dependency('nokogiri', '>= 1.8.2', '<= 1.8.5')
s.add_runtime_dependency('jruby-openssl', '>= 0.9.8')
s.add_runtime_dependency('json', '< 2.3.0')
elsif JRUBY_VERSION < '9.2.0.0'
s.add_runtime_dependency('nokogiri', '>= 1.9.1', '< 1.10.0')
elsif JRUBY_VERSION < '9.3.2.0'
s.add_runtime_dependency('nokogiri', '>= 1.11.4')
s.add_runtime_dependency('rexml')
else
s.add_runtime_dependency('nokogiri', '>= 1.8.2')
s.add_runtime_dependency('nokogiri', '>= 1.13.10')
s.add_runtime_dependency('rexml')
end
elsif RUBY_VERSION < '1.9'
s.add_runtime_dependency('uuid')
Expand All @@ -42,8 +48,14 @@ Gem::Specification.new do |s|
s.add_runtime_dependency('json', '< 2.3.0')
elsif RUBY_VERSION < '2.3'
s.add_runtime_dependency('nokogiri', '>= 1.9.1', '< 1.10.0')
elsif RUBY_VERSION < '2.5'
s.add_runtime_dependency('nokogiri', '>= 1.10.10', '< 1.11.0')
s.add_runtime_dependency('rexml')
elsif RUBY_VERSION < '2.6'
s.add_runtime_dependency('nokogiri', '>= 1.11.4')
s.add_runtime_dependency('rexml')
else
s.add_runtime_dependency('nokogiri', '>= 1.10.5')
s.add_runtime_dependency('nokogiri', '>= 1.13.10')
s.add_runtime_dependency('rexml')
end

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

if RUBY_VERSION < '3.2'
if RUBY_VERSION < '2.0'
s.add_development_dependency('rake', '~> 10')
else
s.add_development_dependency('rake', '~> 12')
s.add_development_dependency('rake', '>= 12.3.3')
end

s.add_development_dependency('shoulda', '~> 2.11')
Expand Down

0 comments on commit a4b0111

Please sign in to comment.