From 48b097011742383a5ace2fab84e4ca3ff83f56ee Mon Sep 17 00:00:00 2001 From: Toshimaru Date: Wed, 27 Jan 2021 09:37:56 +0900 Subject: [PATCH] Support Ruby 3 / Drop Jekyll v3.8 / Drop Ruby v2.4 (#140) * Use ruby/setup-ruby * Drop jekyll 3.8 * Add Ruby 3.0 * Drop Ruby 2.4 * rubocop x Ruby3 * coverage x Ruby3 * v0.17.0 --- .github/workflows/ci.yml | 12 ++---------- .github/workflows/coverage.yml | 4 ++-- .github/workflows/rubocop.yml | 4 ++-- jekyll-toc.gemspec | 2 +- lib/table_of_contents/version.rb | 2 +- 5 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a21da9..028ac35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,27 +4,19 @@ jobs: build: strategy: matrix: - ruby: [2.4, 2.5, 2.6, 2.7] + ruby: [2.5, 2.6, 2.7, 3.0] gemfile: - - gemfiles/jekyll_3.8.gemfile - gemfiles/jekyll_3.9.gemfile - gemfiles/jekyll_4.0.gemfile - gemfiles/jekyll_4.1.gemfile - gemfiles/jekyll_4.2.gemfile - exclude: - - ruby: 2.4 - gemfile: gemfiles/jekyll_4.0.gemfile - - ruby: 2.4 - gemfile: gemfiles/jekyll_4.1.gemfile - - ruby: 2.4 - gemfile: gemfiles/jekyll_4.2.gemfile env: BUNDLE_GEMFILE: ${{ matrix.gemfile }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: Set up Ruby ${{ matrix.ruby }} - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - name: bundle install diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 5a093a8..eb4a549 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -4,13 +4,13 @@ jobs: build: strategy: matrix: - ruby: [2.7] + ruby: [3.0] runs-on: ubuntu-latest name: coverage steps: - uses: actions/checkout@v2 - name: Set up Ruby ${{ matrix.ruby }} - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - name: bundle install diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index d48e98a..2442c8d 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -4,13 +4,13 @@ jobs: build: strategy: matrix: - ruby: [2.7] + ruby: [3.0] runs-on: ubuntu-latest name: rubocop steps: - uses: actions/checkout@v2 - name: Set up Ruby ${{ matrix.ruby }} - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - name: bundle install diff --git a/jekyll-toc.gemspec b/jekyll-toc.gemspec index 4a1d53c..abd1cf3 100644 --- a/jekyll-toc.gemspec +++ b/jekyll-toc.gemspec @@ -19,6 +19,6 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.4' - spec.add_dependency 'jekyll', '>= 3.8' + spec.add_dependency 'jekyll', '>= 3.9' spec.add_dependency 'nokogiri', '~> 1.10' end diff --git a/lib/table_of_contents/version.rb b/lib/table_of_contents/version.rb index e2eaaed..aad5f64 100644 --- a/lib/table_of_contents/version.rb +++ b/lib/table_of_contents/version.rb @@ -2,6 +2,6 @@ module Jekyll module TableOfContents - VERSION = '0.16.1' + VERSION = '0.17.0' end end