From 70248c19bc559fb4535f8aa06b3208b8f1a648c7 Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Tue, 18 Oct 2022 10:24:55 -0600 Subject: drop support for Ruby < 9.2 (which provides Ruby 2.3) --- .github/workflows/ci.yml | 6 +++--- CHANGELOG.adoc | 2 +- Gemfile | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88788333..8885a34e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - ruby: [jruby-9.3.7.0, '2.5', '2.7', '3.0', '3.1'] + ruby: [jruby-9.3.8.0, '2.5', '2.7', '3.0', '3.1'] asciimath-version: [~] pygments-version: ['~> 2.0'] rouge-version: [~] @@ -37,10 +37,10 @@ jobs: - os: ubuntu-latest ruby: truffleruby-21.1.0 - os: ubuntu-latest - ruby: jruby-9.1.17.0 + ruby: jruby-9.2.21.0 pygments-version: ~ - os: windows-latest - ruby: jruby-9.1.17.0 + ruby: jruby-9.2.21.0 pygments-version: ~ - os: macos-latest ruby: '3.1' diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 360a558e..3286d7aa 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -41,7 +41,7 @@ Compliance:: * Don't promote level-0 special section at start of document to document title (#4151) * Disallow the use of dot (`.`) in the name of a named element attribute (#4147) * Disallow the use of the left square bracket in an attribute list on formatted text (#4306) - * Drop support for Ruby < 2.5 + * Drop support for Ruby < 2.5 and JRuby < 9.2 Improvements:: diff --git a/Gemfile b/Gemfile index 5ad259e6..26d7e02d 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ 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 RUBY_ENGINE == 'truffleruby' || (Gem::Version.new RUBY_VERSION) < (Gem::Version.new '2.5.0') + if RUBY_ENGINE == 'truffleruby' gem 'nokogiri', '~> 1.10.0' elsif (Gem::Version.new RUBY_VERSION) < (Gem::Version.new '2.6.0') gem 'nokogiri', '~> 1.12.0' @@ -32,9 +32,9 @@ group :lint do gem 'rubocop', '~> 1.24.0', require: false gem 'rubocop-minitest', '~> 0.17.0', require: false gem 'rubocop-rake', '~> 0.6.0', require: false -end unless (Gem::Version.new RUBY_VERSION) < (Gem::Version.new '2.5.0') +end group :coverage do gem 'json', '~> 2.2.0' if RUBY_ENGINE == 'truffleruby' gem 'simplecov', '~> 0.16.0' -end unless (Gem::Version.new RUBY_VERSION) < (Gem::Version.new '2.5.0') +end -- cgit v1.2.3