From ea3e24d572b216ade17f56cc9467dd83a243ac1c Mon Sep 17 00:00:00 2001 From: Kevin Dew Date: Wed, 20 Apr 2022 10:25:35 +0100 Subject: [PATCH 1/2] Drop support for Ruby 2.6 Ruby 2.6 has reached end-of-life now. --- .ruby-version | 2 +- CHANGELOG.md | 4 ++++ rubocop-govuk.gemspec | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.ruby-version b/.ruby-version index d48d3702..49cdd668 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.9 +2.7.6 diff --git a/CHANGELOG.md b/CHANGELOG.md index f482166b..a996a3b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# Unreleased + +- Drop support for Ruby 2.6 + # 4.3.0 - Update rubocop to 1.25.0 diff --git a/rubocop-govuk.gemspec b/rubocop-govuk.gemspec index 71a134c9..b3520767 100644 --- a/rubocop-govuk.gemspec +++ b/rubocop-govuk.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |spec| spec.files = Dir["config/**/*", "*.md"] - spec.required_ruby_version = ">= 2.6" + spec.required_ruby_version = ">= 2.7" spec.add_development_dependency "rake", "~> 13" From add13e26e47e96d7a66d8b54373f5ea5e496dd34 Mon Sep 17 00:00:00 2001 From: Kevin Dew Date: Wed, 20 Apr 2022 10:26:26 +0100 Subject: [PATCH 2/2] Prepare 4.4.0 This updates the changelog and version so 4.4.0 can be released. I've tested this release against Whitehall, Content Publisher, Smart Answers, Search API and GDS API Adapters. Only two apps had issues (2 violations for Whitehall and 1 for GDS API Adapters) and these were minor and uncontroversial. --- CHANGELOG.md | 6 +++++- rubocop-govuk.gemspec | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a996a3b0..125901a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ -# Unreleased +# 4.4.0 +- Update rubocop to 1.27.0 +- Update rubocop-ast to 1.17.0 +- Update rubocop-rails to 2.14.2 +- Update rubocop-rspec to 2.10.0 - Drop support for Ruby 2.6 # 4.3.0 diff --git a/rubocop-govuk.gemspec b/rubocop-govuk.gemspec index b3520767..d27dd842 100644 --- a/rubocop-govuk.gemspec +++ b/rubocop-govuk.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |spec| spec.name = "rubocop-govuk" - spec.version = "4.3.0" + spec.version = "4.4.0" spec.authors = ["Government Digital Service"] spec.email = ["govuk-dev@digital.cabinet-office.gov.uk"]