Skip to content

Commit

Permalink
Merge pull request #169 from toshimaru/drop-ruby-2.5
Browse files Browse the repository at this point in the history
Drop Ruby 2.5 support / CI against Jekyll 4.3 / Refactoring `gemspec` file
  • Loading branch information
toshimaru committed Jan 22, 2023
2 parents be63afc + 4caf13d commit 748f584
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 15 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ jobs:
test:
strategy:
matrix:
ruby: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
ruby: ['2.6', '2.7', '3.0', '3.1', '3.2']
gemfile:
- gemfiles/jekyll_3.9.gemfile
- gemfiles/jekyll_4.0.gemfile
- gemfiles/jekyll_4.1.gemfile
- gemfiles/jekyll_4.2.gemfile
- gemfiles/jekyll_4.3.gemfile
env:
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AllCops:
TargetRubyVersion: 2.5
TargetRubyVersion: 2.6
NewCops: enable
Exclude:
- "*.gemspec"
Expand Down
2 changes: 1 addition & 1 deletion Appraisals
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

SUPPORTED_VERSIONS = %w[3.9 4.0 4.1 4.2].freeze
SUPPORTED_VERSIONS = %w[3.9 4.0 4.1 4.2 4.3].freeze

SUPPORTED_VERSIONS.each do |version|
appraise "jekyll-#{version}" do
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/jekyll_3.9.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ gem "rubocop-minitest"
gem "rubocop-performance"
gem "rubocop-rake"
gem "rubocop"
gem "simplecov", "~> 0.21.2"
gem "simplecov", "~> 0.22.0"
gem "jekyll", "3.9"

gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/jekyll_4.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ gem "rubocop-minitest"
gem "rubocop-performance"
gem "rubocop-rake"
gem "rubocop"
gem "simplecov", "~> 0.21.2"
gem "simplecov", "~> 0.22.0"
gem "jekyll", "4.0"

gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/jekyll_4.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ gem "rubocop-minitest"
gem "rubocop-performance"
gem "rubocop-rake"
gem "rubocop"
gem "simplecov", "~> 0.21.2"
gem "simplecov", "~> 0.22.0"
gem "jekyll", "4.1"

gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/jekyll_4.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ gem "rubocop-minitest"
gem "rubocop-performance"
gem "rubocop-rake"
gem "rubocop"
gem "simplecov", "~> 0.21.2"
gem "simplecov", "~> 0.22.0"
gem "jekyll", "4.2"

gemspec path: "../"
17 changes: 17 additions & 0 deletions gemfiles/jekyll_4.3.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "appraisal"
gem "minitest-reporters"
gem "minitest"
gem "pry"
gem "rake"
gem "rubocop-minitest"
gem "rubocop-performance"
gem "rubocop-rake"
gem "rubocop"
gem "simplecov", "~> 0.22.0"
gem "jekyll", "4.3"

gemspec path: "../"
25 changes: 17 additions & 8 deletions jekyll-toc.gemspec
Original file line number Diff line number Diff line change
@@ -1,24 +1,33 @@
# frozen_string_literal: true

lib = File.expand_path('../lib', __FILE__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require 'table_of_contents/version'
require_relative 'lib/table_of_contents/version'

Gem::Specification.new do |spec|
spec.name = 'jekyll-toc'
spec.version = Jekyll::TableOfContents::VERSION
spec.summary = 'Jekyll Table of Contents plugin'
spec.description = 'Jekyll (Ruby static website generator) plugin which generates a Table of Contents for the page.'
spec.authors = %w(toshimaru torbjoernk)
spec.authors = %w[toshimaru torbjoernk]
spec.email = '[email protected]'
spec.files = `git ls-files -z`.split("\x0")
spec.homepage = 'https://github.com/toshimaru/jekyll-toc'
spec.license = 'MIT'
spec.test_files = spec.files.grep(%r{^(test|spec)/})
spec.require_paths = ['lib']

spec.required_ruby_version = '>= 2.5'
spec.metadata['homepage_uri'] = spec.homepage
spec.metadata['source_code_uri'] = 'https://github.com/toshimaru/jekyll-toc'
spec.metadata['changelog_uri'] = 'https://github.com/toshimaru/jekyll-toc/releases'
spec.metadata['rubygems_mfa_required'] = 'true'

# Specify which files should be added to the gem when it is released.
# The `git ls-files -z` loads the files in the RubyGem that have been added into git.
spec.files = Dir.chdir(__dir__) do
`git ls-files -z`.split("\x0").reject do |f|
(f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|circleci)|appveyor)})
end
end

spec.required_ruby_version = '>= 2.6'

spec.add_dependency 'jekyll', '>= 3.9'
spec.add_dependency 'nokogiri', '~> 1.11'
spec.add_dependency 'nokogiri', '~> 1.12'
end

0 comments on commit 748f584

Please sign in to comment.