From 6c375d5f496b1fc8ab9f908ac45100875b6b3ea2 Mon Sep 17 00:00:00 2001
From: Christian Sutter <git@doublesignal.com>
Date: Tue, 7 Jan 2025 10:25:57 +0000
Subject: [PATCH] Upgrade Ruby to 3.4

- Update Ruby and Bundler versions
- Use new non-arch specific Protobuf and GRPC gems
- Fix test failure of debug text caused by slightly different
  stringification of Hash values in 3.4
---
 .ruby-version                                 |  2 +-
 Dockerfile                                    |  2 +-
 Gemfile.lock                                  | 24 +++----------------
 .../publishing_api_message_processor_spec.rb  |  2 +-
 4 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 9c25013..47b322c 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.3.6
+3.4.1
diff --git a/Dockerfile b/Dockerfile
index 1bec952..4d51c32 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG ruby_version=3.3
+ARG ruby_version=3.4
 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.lock b/Gemfile.lock
index 618d1c2..2482d4d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -108,16 +108,7 @@ GEM
       gapic-common (>= 0.24.0, < 2.a)
       google-cloud-errors (~> 1.0)
     google-logging-utils (0.1.0)
-    google-protobuf (4.29.2-aarch64-linux)
-      bigdecimal
-      rake (>= 13)
-    google-protobuf (4.29.2-arm64-darwin)
-      bigdecimal
-      rake (>= 13)
-    google-protobuf (4.29.2-x86_64-darwin)
-      bigdecimal
-      rake (>= 13)
-    google-protobuf (4.29.2-x86_64-linux)
+    google-protobuf (4.29.2)
       bigdecimal
       rake (>= 13)
     googleapis-common-protos (1.6.0)
@@ -153,16 +144,7 @@ GEM
       capybara (>= 3.36)
       puma
       selenium-webdriver (>= 4.0)
-    grpc (1.68.1-aarch64-linux)
-      google-protobuf (>= 3.25, < 5.0)
-      googleapis-common-protos-types (~> 1.0)
-    grpc (1.68.1-arm64-darwin)
-      google-protobuf (>= 3.25, < 5.0)
-      googleapis-common-protos-types (~> 1.0)
-    grpc (1.68.1-x86_64-darwin)
-      google-protobuf (>= 3.25, < 5.0)
-      googleapis-common-protos-types (~> 1.0)
-    grpc (1.68.1-x86_64-linux)
+    grpc (1.68.1)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     grpc_mock (0.4.6)
@@ -596,4 +578,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   2.4.10
+   2.6.2
diff --git a/spec/message_processors/publishing_api_message_processor_spec.rb b/spec/message_processors/publishing_api_message_processor_spec.rb
index 0828973..15b1034 100644
--- a/spec/message_processors/publishing_api_message_processor_spec.rb
+++ b/spec/message_processors/publishing_api_message_processor_spec.rb
@@ -46,7 +46,7 @@
         expect(logger).to have_received(:error).with(<<~MSG)
           Failed to process incoming document message:
           RuntimeError: Could not synchronize
-          Message content: {:\"I am\"=>\"a message\"}
+          Message content: {\"I am\": \"a message\"}
         MSG
       end