From 3ebedff00a67f89cd93d94cb5f3520ea2eb3020a Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Fri, 26 Aug 2022 21:53:01 +0100 Subject: [PATCH] upgrade Nokogiri to latest version and add overrides for older Ruby versions (PR #4339) --- Gemfile | 6 ++++-- asciidoctor.gemspec | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 526b83bf2b..781acbafed 100644 --- a/Gemfile +++ b/Gemfile @@ -16,8 +16,10 @@ group :development do gem 'pygments.rb', ENV['PYGMENTS_VERSION'] if ENV.key? 'PYGMENTS_VERSION' # rouge is needed for testing source highlighting; Asciidoctor supports rouge >= 2 gem 'rouge', (ENV.fetch 'ROUGE_VERSION', '~> 3.0') - if Gem.win_platform? && (Gem::Version.new RUBY_VERSION) >= (Gem::Version.new '2.6.0') - gem 'nokogiri', '~> 1.13.0' + if RUBY_ENGINE == 'truffleruby' || (Gem::Version.new RUBY_VERSION) < (Gem::Version.new '2.5.0') + gem 'nokogiri', '~> 1.10.0' + elsif (Gem::Version.new RUBY_VERSION) < (Gem::Version.new '2.6.0') + gem 'nokogiri', '~> 1.12.0' end end diff --git a/asciidoctor.gemspec b/asciidoctor.gemspec index 46a425390f..a2c0e53e22 100644 --- a/asciidoctor.gemspec +++ b/asciidoctor.gemspec @@ -40,7 +40,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'erubi', '~> 1.10.0' s.add_development_dependency 'haml', '~> 5.2.0' s.add_development_dependency 'minitest', '~> 5.14.0' - s.add_development_dependency 'nokogiri', '~> 1.10.0' + s.add_development_dependency 'nokogiri', '~> 1.13.0' s.add_development_dependency 'rake', '~> 12.3.0' s.add_development_dependency 'slim', '~> 4.1.0' s.add_development_dependency 'tilt', '~> 2.0.0'