From 3a79736da226d2162fc93ab741cee03d7ad4a23d Mon Sep 17 00:00:00 2001
From: Murilo Dal Ri <murilodalri@gmail.com>
Date: Mon, 3 Jun 2024 11:03:35 +0100
Subject: [PATCH 1/4] Remove support for Ruby 3.0

Ruby 3.0 is not supported by the ruby-core team any longer and does not receive any fixes. No further patch release will be released.

[Ruby 3.0 EOL status](https://www.ruby-lang.org/en/downloads/branches/).

[GOV.UK's Ruby version compatibility docs](https://docs.publishing.service.gov.uk/manual/publishing-a-ruby-gem.html#ruby-version-compatibility)

This PR will be reviewed and merged by the Platform Security and Reliability team. Any questions or concerns, please reach out in our channel: #govuk-platform-security-reliability-team.

[Trello card](https://trello.com/c/StwaSbSh/3549-drop-support-for-ruby-30-in-our-gems-2)
---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index eca690e..3ad0595 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.0.5
+3.1.5

From 5a045d44658821cc4cb904b4883ae7b19646fd2b Mon Sep 17 00:00:00 2001
From: Murilo Dal Ri <murilodalri@gmail.com>
Date: Mon, 3 Jun 2024 11:23:31 +0100
Subject: [PATCH 2/4] Remove support for Ruby 3.0

Update Ruby version in gemspec file
---
 govuk_admin_template.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/govuk_admin_template.gemspec b/govuk_admin_template.gemspec
index 4e1f082..1bcd02d 100644
--- a/govuk_admin_template.gemspec
+++ b/govuk_admin_template.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.files         = Dir["{app,config,lib}/**/*"] + Dir["*.md"] + ["LICENCE.txt"]
   gem.require_paths = %w[lib]
 
-  gem.required_ruby_version = ">= 3.0"
+  gem.required_ruby_version = ">= 3.1"
 
   gem.add_dependency "bootstrap-sass", "~> 3.4"
   gem.add_dependency "jquery-rails", "~> 4.3"

From a272c3c77eed27a516fd86ef06f46c524690f7b0 Mon Sep 17 00:00:00 2001
From: Murilo Dal Ri <murilodalri@gmail.com>
Date: Mon, 3 Jun 2024 11:28:26 +0100
Subject: [PATCH 3/4] Remove support for Ruby 3.0

Update CI file
---
 .github/workflows/ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3088447..36ca53e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,8 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: ['3.0', 3.1, 3.2]
+        ruby: [3.1, 3.2]
         # Test against multiple Rails versions
         gemfile: [rails_6, rails_7]
     runs-on: ubuntu-latest

From 522d6d8cf857d6b3a599c27c018ff93591c23e35 Mon Sep 17 00:00:00 2001
From: Murilo Dal Ri <murilodalri@gmail.com>
Date: Mon, 3 Jun 2024 11:59:07 +0100
Subject: [PATCH 4/4] Bump version

---
 CHANGELOG.md                        | 4 ++--
 lib/govuk_admin_template/version.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e29ba4f..4fab501 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
-## Unreleased
+# 6.11.0
 
-* Drop support for Ruby 2.7.
+* Drop support for Ruby 3.0
 
 # 6.10.0
 
diff --git a/lib/govuk_admin_template/version.rb b/lib/govuk_admin_template/version.rb
index 5f026b5..11c1e25 100644
--- a/lib/govuk_admin_template/version.rb
+++ b/lib/govuk_admin_template/version.rb
@@ -1,3 +1,3 @@
 module GovukAdminTemplate
-  VERSION = "6.10.0".freeze
+  VERSION = "6.11.0".freeze
 end