diff options
| -rw-r--r-- | .github/workflows/ci.yml | 15 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 2 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | CHANGELOG.adoc | 4 | ||||
| -rw-r--r-- | Gemfile | 12 | ||||
| -rw-r--r-- | README.adoc | 2 | ||||
| -rw-r--r-- | asciidoctor-epub3.gemspec | 6 | ||||
| -rw-r--r-- | spec/cli_spec.rb | 4 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 8 |
9 files changed, 17 insertions, 37 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f940516..0f2f582 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.1' + ruby-version: '3.3' bundler-cache: true - name: Lint run: bundle exec rake lint @@ -30,17 +30,11 @@ jobs: needs: activate strategy: matrix: - # TODO: Use 'jruby-9.2' when https://github.com/jruby/jruby/issues/6648 is fixed - ruby: ['jruby-9.2.16', '2.5', '2.6', '2.7', '3.0', '3.1'] + ruby: ['jruby-9.3', 'jruby-9.4', '2.6', '3.3'] os: [ubuntu-latest, windows-latest] - asciidoctor: [''] include: - - ruby: '3.1' - os: ubuntu-latest - asciidoctor: '1.5.6' - - ruby: '3.1' + - ruby: '3.3' os: macos-latest - asciidoctor: '' runs-on: ${{ matrix.os }} steps: - name: Checkout @@ -50,9 +44,6 @@ jobs: with: distribution: 'adopt' java-version: '17' - - name: Set up Asciidoctor - if: matrix.asciidoctor != '' - run: echo "ASCIIDOCTOR_VERSION=${{ matrix.asciidoctor }}" >> "${GITHUB_ENV}" - name: Set up Ruby uses: ruby/setup-ruby@v1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0bed032..c22484e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.1' + ruby-version: '3.3' - name: Publish to RubyGems.org uses: dawidd6/action-publish-gem@v1 with: @@ -5,3 +5,4 @@ /Gemfile.lock /README.html /pkg/ +/vendor/ diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 7b06cc7..3313b21 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -8,6 +8,8 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[ == Unreleased * add XML declarations to XHTML files (#424 by @abbrev) +* bump the oldest supported Ruby to 2.6 +* bump the oldest supported Asciidoctor to 2.0 == 1.5.1 (2021-04-29) - @slonopotamus @@ -75,7 +77,7 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[ * fix image and listing numbers being reset in each chapter (#178) * fix xref resolving between sub-includes of chapter files (#166) * add support for contentless include files (#151) -* drop nonstandard `<<chapter#>>` xref syntax and instead support vanilla `<<anchor>>` or `<<file#anchor>>` syntax (#136) +* drop nonstandard `\<<chapter#>>` xref syntax and instead support vanilla `\<<anchor>>` or `\<<file#anchor>>` syntax (#136) * properly include bibliography generated by asciidoctor-bibtex (#206) * require Asciidoctor 1.5.6+ * add support for book preamble (#303) @@ -5,15 +5,11 @@ source 'https://rubygems.org' # Look in asciidoctor-epub3.gemspec for runtime and development dependencies. gemspec -if ENV.key? 'ASCIIDOCTOR_VERSION' - gem 'asciidoctor', ENV['ASCIIDOCTOR_VERSION'], require: false - # Newer asciidoctor-diagram 1.5.x require asciidoctor >=1.5.7 - gem 'asciidoctor-diagram', '1.5.16', require: false if Gem::Version.new(ENV['ASCIIDOCTOR_VERSION']) < Gem::Version.new('2.0.0') -end - group :optional do # epubcheck-ruby might be safe to be converted into runtime dependency, but could have issues when packaged into asciidoctorj-epub3 gem 'epubcheck-ruby', '~> 5.1.0.0' - # Kindlegen is unavailable neither for 64-bit MacOS nor for ARM - gem 'kindlegen', '~> 3.1.0' unless RbConfig::CONFIG['host_os'] =~ /darwin/ + + # Kindlegen is unavailable neither for 64-bit x86 macOS nor for ARM + # Also, skip JRuby on Windows for now. See https://github.com/jruby/jruby/issues/7171 + gem 'kindlegen', '~> 3.1.0' unless RUBY_PLATFORM =~ /darwin/ || (Gem.win_platform? && RUBY_ENGINE == 'jruby') end diff --git a/README.adoc b/README.adoc index 8566f90..833e138 100644 --- a/README.adoc +++ b/README.adoc @@ -21,7 +21,7 @@ Detailed installation and usage instructions can be found on the https://docs.as == Installation {project-name} is published on RubyGems.org. -{project-name} requires Ruby 2.3 or newer. +{project-name} requires Ruby 2.6 or newer. You can install the published gem using the following command: [source,shell script] diff --git a/asciidoctor-epub3.gemspec b/asciidoctor-epub3.gemspec index 5468de9..e910df1 100644 --- a/asciidoctor-epub3.gemspec +++ b/asciidoctor-epub3.gemspec @@ -17,7 +17,7 @@ An extension for Asciidoctor that converts AsciiDoc documents to EPUB3 and KF8/M s.homepage = 'https://github.com/asciidoctor/asciidoctor-epub3' s.license = 'MIT' - s.required_ruby_version = '>= 2.5.0' + s.required_ruby_version = '>= 2.6.0' files = begin (result = Open3.popen3('git ls-files -z') {|_, out| out.read }.split %(\0)).empty? ? Dir['**/*'] : result @@ -30,7 +30,7 @@ An extension for Asciidoctor that converts AsciiDoc documents to EPUB3 and KF8/M s.require_paths = ['lib'] - s.add_development_dependency 'asciidoctor-diagram', '>= 1.5.0', '< 3.0.0' + s.add_development_dependency 'asciidoctor-diagram', '~> 2.0' s.add_development_dependency 'asciimath', '~> 2.0' s.add_development_dependency 'coderay', '~> 1.1.0' s.add_development_dependency 'pygments.rb', '~> 2.4.0' @@ -41,7 +41,7 @@ An extension for Asciidoctor that converts AsciiDoc documents to EPUB3 and KF8/M s.add_development_dependency 'rubocop-rake', '~> 0.6.0' s.add_development_dependency 'rubocop-rspec', '~> 2.10.0' - s.add_runtime_dependency 'asciidoctor', '>= 1.5.6', '< 3.0.0' + s.add_runtime_dependency 'asciidoctor', '~> 2.0' s.add_runtime_dependency 'gepub', '~> 1.0.0' s.add_runtime_dependency 'mime-types', '~> 3.0' diff --git a/spec/cli_spec.rb b/spec/cli_spec.rb index e8980e3..86f57ba 100644 --- a/spec/cli_spec.rb +++ b/spec/cli_spec.rb @@ -15,9 +15,7 @@ describe 'asciidoctor-epub3' do expect(err).to match(/input file \/nonexistent( is)? missing/) end - it 'exits with 1 when epub validation fails on Asciidoctor >= 1.5.7 with --failure-level=ERROR' do - skip_unless_has_logger - + it 'exits with 1 when epub validation fails with --failure-level=ERROR' do _, err, res = run_command asciidoctor_epub3_bin, '--failure-level=ERROR', '-a', 'ebook-validate', diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 427ed25..6eac717 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -61,14 +61,6 @@ RSpec.configure do |config| examples_dir.join(*path) end - def has_logger? - defined? Asciidoctor::LoggerManager - end - - def skip_unless_has_logger - skip 'Logger is unavailable on Asciidoctor < 1.5.7' unless has_logger? - end - def skip_unless_has_kindlegen require 'kindlegen' rescue LoadError |