Merge pull request #1374 from alphagov/sengi/ruby33

Update to Ruby 3.3 and update all deps.
alphagov · Jan 25, 2024 · de57050 · de57050
2 parents 4baa201 + d49b4d9
commit de57050
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 39 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.2.2
+3.3.0
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG ruby_version=3.2
+ARG ruby_version=3.3
 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
@@ -80,7 +80,7 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     base64 (0.2.0)
@@ -123,27 +123,26 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.3.4)
-    debug_inspector (1.1.0)
+    debug_inspector (1.2.0)
     docile (1.4.0)
-    domain_name (0.6.20231109)
+    domain_name (0.6.20240107)
     drb (2.2.0)
       ruby2_keywords
     erubi (1.12.0)
-    execjs (2.8.1)
+    execjs (2.9.1)
     factory_bot (6.4.5)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
-    faraday (2.7.11)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
-    ffi (1.15.5)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
+    ffi (1.16.3)
     friendly_id (5.5.1)
       activerecord (>= 4.0.0)
-    gds-api-adapters (91.1.0)
+    gds-api-adapters (93.0.0)
       addressable
       link_header
       null_logger
@@ -162,10 +161,10 @@ GEM
     google-protobuf (3.25.2)
     googleapis-common-protos-types (1.11.0)
       google-protobuf (~> 3.18)
-    govuk_app_config (9.8.1)
+    govuk_app_config (9.8.2)
       logstasher (~> 2.1)
       opentelemetry-exporter-otlp (>= 0.25, < 0.27)
-      opentelemetry-instrumentation-all (>= 0.39.1, < 0.55.0)
+      opentelemetry-instrumentation-all (>= 0.39.1, < 0.57.0)
       opentelemetry-sdk (~> 1.2)
       plek (>= 4, < 6)
       prometheus_exporter (~> 2.0)
@@ -177,7 +176,7 @@ GEM
     govuk_personalisation (0.15.0)
       plek (>= 1.9.0)
       rails (>= 6, < 8)
-    govuk_publishing_components (37.2.3)
+    govuk_publishing_components (37.2.4)
       govuk_app_config
       govuk_personalisation (>= 0.7.0)
       kramdown
@@ -191,7 +190,7 @@ GEM
       govuk_app_config (>= 1.1)
       redis-namespace (~> 1.6)
       sidekiq (~> 6.5, >= 6.5.12)
-    hashdiff (1.0.1)
+    hashdiff (1.1.0)
     hashie (5.0.0)
     http-accept (1.7.0)
     http-cookie (1.0.5)
@@ -226,9 +225,9 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
-    mime-types (3.5.1)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.1003)
+    mime-types-data (3.2023.1205)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
     minitest (5.21.2)
@@ -238,6 +237,8 @@ GEM
     multi_xml (0.6.0)
     mutex_m (0.2.0)
     mysql2 (0.5.5)
+    net-http (0.4.1)
+      uri
     net-imap (0.4.9.1)
       date
       net-protocol
@@ -268,7 +269,7 @@ GEM
     octokit (8.0.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    omniauth (2.1.1)
+    omniauth (2.1.2)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
@@ -278,14 +279,14 @@ GEM
     opentelemetry-api (1.2.3)
     opentelemetry-common (0.20.0)
       opentelemetry-api (~> 1.0)
-    opentelemetry-exporter-otlp (0.26.1)
+    opentelemetry-exporter-otlp (0.26.2)
       google-protobuf (~> 3.14)
       googleapis-common-protos-types (~> 1.3)
       opentelemetry-api (~> 1.1)
       opentelemetry-common (~> 0.20)
       opentelemetry-sdk (~> 1.2)
       opentelemetry-semantic_conventions
-    opentelemetry-instrumentation-action_pack (0.8.0)
+    opentelemetry-instrumentation-action_pack (0.9.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
       opentelemetry-instrumentation-rack (~> 0.21)
@@ -306,7 +307,7 @@ GEM
     opentelemetry-instrumentation-active_support (0.5.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-all (0.54.0)
+    opentelemetry-instrumentation-all (0.56.0)
       opentelemetry-instrumentation-active_model_serializers (~> 0.20.1)
       opentelemetry-instrumentation-aws_sdk (~> 0.5.0)
       opentelemetry-instrumentation-bunny (~> 0.21.0)
@@ -329,8 +330,8 @@ GEM
       opentelemetry-instrumentation-pg (~> 0.26.0)
       opentelemetry-instrumentation-que (~> 0.7.0)
       opentelemetry-instrumentation-racecar (~> 0.3.0)
-      opentelemetry-instrumentation-rack (~> 0.23.1)
-      opentelemetry-instrumentation-rails (~> 0.29.0)
+      opentelemetry-instrumentation-rack (~> 0.24.0)
+      opentelemetry-instrumentation-rails (~> 0.30.0)
       opentelemetry-instrumentation-rake (~> 0.2.1)
       opentelemetry-instrumentation-rdkafka (~> 0.4.0)
       opentelemetry-instrumentation-redis (~> 0.25.1)
@@ -339,7 +340,7 @@ GEM
       opentelemetry-instrumentation-ruby_kafka (~> 0.21.0)
       opentelemetry-instrumentation-sidekiq (~> 0.25.0)
       opentelemetry-instrumentation-sinatra (~> 0.23.1)
-      opentelemetry-instrumentation-trilogy (~> 0.57.0)
+      opentelemetry-instrumentation-trilogy (~> 0.58.0)
     opentelemetry-instrumentation-aws_sdk (0.5.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
@@ -414,13 +415,13 @@ GEM
     opentelemetry-instrumentation-racecar (0.3.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rack (0.23.5)
+    opentelemetry-instrumentation-rack (0.24.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rails (0.29.1)
+    opentelemetry-instrumentation-rails (0.30.0)
       opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-action_pack (~> 0.8.0)
+      opentelemetry-instrumentation-action_pack (~> 0.9.0)
       opentelemetry-instrumentation-action_view (~> 0.7.0)
       opentelemetry-instrumentation-active_job (~> 0.7.0)
       opentelemetry-instrumentation-active_record (~> 0.7.0)
@@ -456,21 +457,21 @@ GEM
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
       opentelemetry-instrumentation-rack (~> 0.21)
-    opentelemetry-instrumentation-trilogy (0.57.0)
+    opentelemetry-instrumentation-trilogy (0.58.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
       opentelemetry-semantic_conventions (>= 1.8.0)
     opentelemetry-registry (0.3.0)
       opentelemetry-api (~> 1.1)
-    opentelemetry-sdk (1.3.1)
+    opentelemetry-sdk (1.3.2)
       opentelemetry-api (~> 1.1)
       opentelemetry-common (~> 0.20)
       opentelemetry-registry (~> 0.2)
       opentelemetry-semantic_conventions
     opentelemetry-semantic_conventions (1.10.0)
       opentelemetry-api (~> 1.0)
     parallel (1.24.0)
-    parser (3.2.2.4)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     plek (5.0.0)
@@ -490,7 +491,8 @@ GEM
       nio4r (~> 2.0)
     racc (1.7.3)
     rack (2.2.8)
-    rack-protection (3.1.0)
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
     rack-proxy (0.7.7)
       rack
@@ -541,7 +543,7 @@ GEM
     redis (4.8.1)
     redis-namespace (1.11.0)
       redis (>= 4)
-    regexp_parser (2.8.3)
+    regexp_parser (2.9.0)
     reline (0.4.2)
       io-console (~> 0.5)
     request_store (1.5.1)
@@ -566,10 +568,10 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.19.0)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
-      rubocop (~> 1.33)
     rubocop-govuk (4.13.0)
       rubocop (= 1.59.0)
       rubocop-ast (= 1.30.0)
@@ -632,14 +634,15 @@ GEM
     statsd-ruby (1.5.0)
     stringio (3.1.0)
     thor (1.3.0)
-    tilt (2.0.10)
+    tilt (2.3.0)
     timecop (0.9.8)
     timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (2.5.0)
+    uri (0.13.0)
     version_gem (1.1.3)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -698,4 +701,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.4.14
+   2.5.5