Skip to content

Commit

Permalink
Merge pull request #250 from koic/change_drop_ruby_2_6_support
Browse files Browse the repository at this point in the history
Drop Ruby 2.6 support
koic authored Apr 18, 2023
2 parents 2d049d1 + 109bc4e commit 9069a46
Showing 7 changed files with 6 additions and 16 deletions.
6 changes: 0 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -35,9 +35,6 @@ workflows:
build:
jobs:
- documentation-checks
- rake_default:
name: Ruby 2.6
image: cimg/ruby:2.6
- rake_default:
name: Ruby 2.7
image: cimg/ruby:2.7
@@ -53,6 +50,3 @@ workflows:
- rake_default:
name: Ruby HEAD
image: rubocophq/circleci-ruby-snapshot:latest # Nightly snapshot build
- rake_default:
name: JRuby 9.3
image: circleci/jruby:9.3
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ require:

AllCops:
NewCops: enable
TargetRubyVersion: 2.6
TargetRubyVersion: 2.7
SuggestExtensions: false

InternalAffairs/NodeMatcherDirective:
1 change: 1 addition & 0 deletions changelog/change_drop_ruby_2_6_support.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* [#250](https://github.com/rubocop/rubocop-minitest/pull/250): **(Breaking)** Drop Ruby 2.6 support. ([@koic][])
2 changes: 1 addition & 1 deletion lib/rubocop/minitest/assert_offense.rb
Original file line number Diff line number Diff line change
@@ -216,7 +216,7 @@ def registry
end

def ruby_version
2.6
RuboCop::TargetRuby::DEFAULT_VERSION
end
end
# rubocop:enable Metrics/ModuleLength
2 changes: 1 addition & 1 deletion rubocop-minitest.gemspec
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
DESCRIPTION
spec.license = 'MIT'

spec.required_ruby_version = '>= 2.6.0'
spec.required_ruby_version = '>= 2.7.0'
spec.metadata = {
'homepage_uri' => 'https://docs.rubocop.org/rubocop-minitest/',
'changelog_uri' => 'https://github.com/rubocop/rubocop-minitest/blob/master/CHANGELOG.md',
5 changes: 0 additions & 5 deletions tasks/changelog.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# frozen_string_literal: true

if RUBY_VERSION < '2.6'
puts 'Changelog utilities available only for Ruby 2.6+'
exit(1)
end

# Changelog utility
class Changelog
ENTRIES_PATH = 'changelog/'
4 changes: 2 additions & 2 deletions test/project_test.rb
Original file line number Diff line number Diff line change
@@ -156,9 +156,9 @@ def load_feature_entries
end

def prepare_changelog_entries(entries)
@issues += entries.map do |entry|
@issues += entries.filter_map do |entry|
entry.match(/\[(?<number>[#\d]+)\]\((?<url>[^)]+)\)/)
end.compact
end

@bodies += entries.map do |entry|
entry.gsub(/`[^`]+`/, '``').sub(/^\*\s*(?:\[.+?\):\s*)?/, '').sub(/\s*\([^)]+\)$/, '')

0 comments on commit 9069a46

Please sign in to comment.