From 301cad9c8d0e4239bbc5ff6df87c164ea66694f5 Mon Sep 17 00:00:00 2001
From: Peter Hartshorn <peter.hartshorn@digital.cabinet-office.gov.uk>
Date: Thu, 28 Sep 2023 14:01:39 +0100
Subject: [PATCH] Upgrade Ruby version

Upgrades `.ruby-version` file which is used in Github CI and local
development.

Specify floating patch Ruby version (3.2.x). This has the benefit of
allowing patch versions of Ruby to be deployed by updating the Ruby
Docker image tag and rebuilding the app.

Trello:
https://trello.com/c/nKilDK4W/2198-dart-sass-upgrade-ruby-to-314-across-govuk-publishing-components-and-other-ux-apps
---
 .ruby-version | 2 +-
 Dockerfile    | 2 +-
 Gemfile       | 2 ++
 Gemfile.lock  | 3 +++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index ef538c281..be94e6f53 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.1.2
+3.2.2
diff --git a/Dockerfile b/Dockerfile
index df6bc8f72..c5bf4345d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG ruby_version=3.1.2
+ARG ruby_version=3.2
 ARG base_image=ghcr.io/alphagov/govuk-ruby-base:$ruby_version
 ARG builder_image=ghcr.io/alphagov/govuk-ruby-builder:$ruby_version
 
diff --git a/Gemfile b/Gemfile
index 0a61b2a3d..e5b5d517c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,7 @@
 source "https://rubygems.org"
 
+ruby "~> 3.2.0"
+
 gem "rails", "7.0.7.2"
 
 gem "bootsnap", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 7037533b4..e38b41519 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -655,5 +655,8 @@ DEPENDENCIES
   uglifier
   webmock
 
+RUBY VERSION
+   ruby 3.2.2p53
+
 BUNDLED WITH
    2.3.22