From b7ae9a68ebf580f86826acb24d9ca526488ddc81 Mon Sep 17 00:00:00 2001 From: Bruce Bolt Date: Thu, 21 Nov 2024 16:43:16 +0000 Subject: [PATCH 1/2] Update ruby to version 3.3.6 --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index bea438e9a..9c25013db 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.1 +3.3.6 From 568c5c72ac1c8a6908d380728925f098ae0aa740 Mon Sep 17 00:00:00 2001 From: Bruce Bolt Date: Thu, 21 Nov 2024 16:44:13 +0000 Subject: [PATCH 2/2] Run `bundle update` after Ruby upgrade --- Gemfile.lock | 308 ++++++++++++++++++++++++++------------------------- 1 file changed, 157 insertions(+), 151 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4e0d73932..05cf4de2b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,29 +80,29 @@ GEM minitest (>= 5.1) securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) - acts-as-taggable-on (11.0.0) - activerecord (>= 7.0, < 8.0) + acts-as-taggable-on (12.0.0) + activerecord (>= 7.1, < 8.1) zeitwerk (>= 2.4, < 3.0) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) ast (2.4.2) - autoprefixer-rails (10.4.16.0) + autoprefixer-rails (10.4.19.0) execjs (~> 2) aws-eventstream (1.3.0) - aws-partitions (1.992.0) - aws-sdk-core (3.210.0) + aws-partitions (1.1011.0) + aws-sdk-core (3.213.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.95.0) + aws-sdk-kms (1.96.0) aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.169.0) + aws-sdk-s3 (1.172.0) aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sigv4 (1.10.0) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) bigdecimal (3.1.8) @@ -112,7 +112,7 @@ GEM bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) - brakeman (6.1.2) + brakeman (6.2.2) racc builder (3.3.0) capybara (3.40.0) @@ -125,8 +125,8 @@ GEM regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) capybara-select-2 (0.5.1) - cgi (0.3.6) - chartkick (5.1.1) + cgi (0.4.1) + chartkick (5.1.2) coderay (1.1.3) concurrent-ruby (1.3.4) connection_pool (2.4.1) @@ -134,34 +134,35 @@ GEM bigdecimal rexml crass (1.0.6) - cucumber (9.0.2) - builder (~> 3.2, >= 3.2.4) - cucumber-ci-environment (~> 9.2, >= 9.2.0) - cucumber-core (~> 11.1, >= 11.1.0) - cucumber-cucumber-expressions (~> 16.1, >= 16.1.2) - cucumber-gherkin (>= 24, < 26.2.1) - cucumber-html-formatter (~> 20.4, >= 20.4.0) - cucumber-messages (>= 19, < 23) - diff-lcs (~> 1.5, >= 1.5.0) - mini_mime (~> 1.1, >= 1.1.5) - multi_test (~> 1.1, >= 1.1.0) - sys-uname (~> 1.2, >= 1.2.3) - cucumber-ci-environment (9.2.0) - cucumber-core (11.1.0) - cucumber-gherkin (>= 24, < 27) - cucumber-messages (>= 19, < 22) - cucumber-tag-expressions (~> 4.1, >= 4.1.0) - cucumber-cucumber-expressions (16.1.2) - cucumber-gherkin (26.2.0) - cucumber-messages (>= 19.1.4, < 22.1) - cucumber-html-formatter (20.4.0) - cucumber-messages (>= 18.0, < 22.1) - cucumber-messages (21.0.1) - cucumber-rails (3.0.0) + cucumber (9.2.0) + builder (~> 3.2) + cucumber-ci-environment (> 9, < 11) + cucumber-core (> 13, < 14) + cucumber-cucumber-expressions (~> 17.0) + cucumber-gherkin (> 24, < 28) + cucumber-html-formatter (> 20.3, < 22) + cucumber-messages (> 19, < 25) + diff-lcs (~> 1.5) + mini_mime (~> 1.1) + multi_test (~> 1.1) + sys-uname (~> 1.2) + cucumber-ci-environment (10.0.1) + cucumber-core (13.0.3) + cucumber-gherkin (>= 27, < 28) + cucumber-messages (>= 20, < 23) + cucumber-tag-expressions (> 5, < 7) + cucumber-cucumber-expressions (17.1.0) + bigdecimal + cucumber-gherkin (27.0.0) + cucumber-messages (>= 19.1.4, < 23) + cucumber-html-formatter (21.7.0) + cucumber-messages (> 19, < 27) + cucumber-messages (22.0.0) + cucumber-rails (3.0.1) capybara (>= 3.11, < 4) cucumber (>= 5, < 10) railties (>= 5.2, < 8) - cucumber-tag-expressions (4.1.0) + cucumber-tag-expressions (6.1.1) dartsass-rails (0.5.1) railties (>= 6.0.0) sass-embedded (~> 1.63) @@ -171,28 +172,30 @@ GEM activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - date (3.3.4) + date (3.4.0) declarative (0.0.20) diff-lcs (1.5.1) - docile (1.4.0) + docile (1.4.1) domain_name (0.6.20240107) drb (2.2.1) erubi (1.13.0) - execjs (2.9.1) - factory_bot (6.4.5) + execjs (2.10.0) + factory_bot (6.5.0) activesupport (>= 5.0.0) - factory_bot_rails (6.4.3) - factory_bot (~> 6.4) + factory_bot_rails (6.4.4) + factory_bot (~> 6.5) railties (>= 5.0.0) - faraday (2.9.0) - faraday-net_http (>= 2.0, < 3.2) - faraday-net_http (3.1.0) - net-http + faraday (2.12.1) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-net_http (3.4.0) + net-http (>= 0.5.0) ffi (1.17.0) ffi (1.17.0-aarch64-linux-gnu) ffi (1.17.0-arm64-darwin) ffi (1.17.0-x86_64-linux-gnu) - gds-api-adapters (97.1.0) + gds-api-adapters (97.3.0) addressable link_header null_logger @@ -207,45 +210,47 @@ GEM rails (>= 7) warden (~> 1.2) warden-oauth2 (~> 0.0.1) - gems (1.2.0) + gems (1.3.0) globalid (1.2.1) activesupport (>= 6.1) google-api-client (0.53.0) google-apis-core (~> 0.1) google-apis-generator (~> 0.1) - google-apis-core (0.11.2) + google-apis-core (0.15.1) addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.16.2, < 2.a) - httpclient (>= 2.8.1, < 3.a) + googleauth (~> 1.9) + httpclient (>= 2.8.3, < 3.a) mini_mime (~> 1.0) + mutex_m representable (~> 3.0) retriable (>= 2.0, < 4.a) - rexml - webrick - google-apis-discovery_v1 (0.14.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-generator (0.12.0) + google-apis-discovery_v1 (0.19.0) + google-apis-core (>= 0.15.0, < 2.a) + google-apis-generator (0.15.1) activesupport (>= 5.0) gems (~> 1.2) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-discovery_v1 (~> 0.5) + google-apis-core (>= 0.15.0, < 2.a) + google-apis-discovery_v1 (~> 0.18) thor (>= 0.20, < 2.a) - google-protobuf (4.28.2) + google-cloud-env (2.2.1) + faraday (>= 1.0, < 3.a) + google-protobuf (4.28.3) bigdecimal rake (>= 13) - google-protobuf (4.28.2-aarch64-linux) + google-protobuf (4.28.3-aarch64-linux) bigdecimal rake (>= 13) - google-protobuf (4.28.2-arm64-darwin) + google-protobuf (4.28.3-arm64-darwin) bigdecimal rake (>= 13) - google-protobuf (4.28.2-x86_64-linux) + google-protobuf (4.28.3-x86_64-linux) bigdecimal rake (>= 13) googleapis-common-protos-types (1.16.0) google-protobuf (>= 3.18, < 5.a) - googleauth (1.8.1) - faraday (>= 0.17.3, < 3.a) + googleauth (1.11.2) + faraday (>= 1.0, < 3.a) + google-cloud-env (~> 2.1) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) @@ -255,10 +260,10 @@ GEM jquery-rails (~> 4.3) plek (>= 2.1) rails (>= 6) - govuk_app_config (9.14.4) + govuk_app_config (9.15.1) logstasher (~> 2.1) opentelemetry-exporter-otlp (>= 0.25, < 0.30) - opentelemetry-instrumentation-all (>= 0.39.1, < 0.67.0) + opentelemetry-instrumentation-all (>= 0.39.1, < 0.69.0) opentelemetry-sdk (~> 1.2) plek (>= 4, < 6) prometheus_exporter (~> 2.0) @@ -267,10 +272,10 @@ GEM sentry-rails (~> 5.3) sentry-ruby (~> 5.3) statsd-ruby (~> 1.5) - govuk_personalisation (1.0.0) + govuk_personalisation (1.1.0) plek (>= 1.9.0) - rails (>= 6, < 8) - govuk_publishing_components (44.5.0) + rails (>= 6, < 9) + govuk_publishing_components (45.6.1) chartkick govuk_app_config govuk_personalisation (>= 0.7.0) @@ -294,7 +299,7 @@ GEM gretel (5.0.1) actionview (>= 6.1) railties (>= 6.1) - hashdiff (1.1.1) + hashdiff (1.1.2) hashie (5.0.0) htmlentities (4.3.4) http-accept (1.7.0) @@ -312,8 +317,8 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.7.2) - jwt (2.8.1) + json (2.8.2) + jwt (2.9.3) base64 kaminari (1.2.2) activesupport (>= 4.1.0) @@ -327,15 +332,15 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - kramdown (2.4.0) - rexml + kramdown (2.5.1) + rexml (>= 3.3.9) language_server-protocol (3.17.0.3) link_header (0.0.8) logger (1.6.1) logstasher (2.1.5) activesupport (>= 5.2) request_store - loofah (2.22.0) + loofah (2.23.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -345,23 +350,25 @@ GEM net-smtp marcel (1.0.4) matrix (0.4.2) - method_source (1.0.0) + method_source (1.1.0) mime-types (3.6.0) logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.1001) + mime-types-data (3.2024.1105) mini_mime (1.1.5) - mini_portile2 (2.8.7) + mini_portile2 (2.8.8) minitest (5.25.1) mlanett-redis-lock (0.2.7) redis - msgpack (1.7.2) + msgpack (1.7.5) multi_json (1.15.0) multi_test (1.1.0) - multi_xml (0.6.0) - net-http (0.4.1) + multi_xml (0.7.1) + bigdecimal (~> 3.1) + mutex_m (0.3.0) + net-http (0.5.0) uri - net-imap (0.5.0) + net-imap (0.5.1) date net-protocol net-pop (0.1.2) @@ -371,7 +378,7 @@ GEM net-smtp (0.5.0) net-protocol netrc (0.11.0) - nio4r (2.7.3) + nio4r (2.7.4) nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) @@ -411,7 +418,7 @@ GEM opentelemetry-common (~> 0.21) opentelemetry-helpers-sql-obfuscation (0.2.0) opentelemetry-common (~> 0.21) - opentelemetry-instrumentation-action_mailer (0.1.0) + opentelemetry-instrumentation-action_mailer (0.2.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-active_support (~> 0.1) opentelemetry-instrumentation-base (~> 0.22.1) @@ -423,19 +430,19 @@ GEM opentelemetry-api (~> 1.0) opentelemetry-instrumentation-active_support (~> 0.6) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-active_job (0.7.7) + opentelemetry-instrumentation-active_job (0.7.8) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-active_model_serializers (0.20.2) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-active_record (0.7.4) + opentelemetry-instrumentation-active_record (0.8.1) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-active_support (0.6.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-all (0.66.0) + opentelemetry-instrumentation-all (0.68.0) opentelemetry-instrumentation-active_model_serializers (~> 0.20.1) opentelemetry-instrumentation-aws_lambda (~> 0.1.0) opentelemetry-instrumentation-aws_sdk (~> 0.7.0) @@ -459,8 +466,8 @@ GEM opentelemetry-instrumentation-pg (~> 0.29.0) opentelemetry-instrumentation-que (~> 0.8.0) opentelemetry-instrumentation-racecar (~> 0.3.0) - opentelemetry-instrumentation-rack (~> 0.24.0) - opentelemetry-instrumentation-rails (~> 0.31.0) + opentelemetry-instrumentation-rack (~> 0.25.0) + opentelemetry-instrumentation-rails (~> 0.32.0) opentelemetry-instrumentation-rake (~> 0.2.1) opentelemetry-instrumentation-rdkafka (~> 0.4.0) opentelemetry-instrumentation-redis (~> 0.25.1) @@ -544,16 +551,16 @@ GEM opentelemetry-instrumentation-racecar (0.3.4) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rack (0.24.6) + opentelemetry-instrumentation-rack (0.25.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rails (0.31.2) + opentelemetry-instrumentation-rails (0.32.0) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-action_mailer (~> 0.1.0) + opentelemetry-instrumentation-action_mailer (~> 0.2.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) + opentelemetry-instrumentation-active_record (~> 0.8.0) opentelemetry-instrumentation-active_support (~> 0.6.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rake (0.2.2) @@ -599,42 +606,42 @@ GEM optic14n (3.0.0) addressable (~> 2.7) os (1.1.4) - ostruct (0.6.0) - paper_trail (15.1.0) + ostruct (0.6.1) + paper_trail (16.0.0) activerecord (>= 6.1) request_store (~> 1.4) - parallel (1.25.1) - parser (3.3.3.0) + parallel (1.26.3) + parser (3.3.6.0) ast (~> 2.4.1) racc pg (1.5.9) plek (5.2.0) prometheus_exporter (2.1.1) webrick - pry (0.14.2) + pry (0.15.0) coderay (~> 1.1) method_source (~> 1.0) - psych (5.1.2) + psych (5.2.0) stringio public_suffix (6.0.1) puma (6.4.3) nio4r (~> 2.0) racc (1.8.1) - rack (2.2.10) - rack-protection (3.2.0) + rack (3.1.8) + rack-protection (4.1.1) base64 (>= 0.1.0) - rack (~> 2.2, >= 2.2.4) + logger (>= 1.6.0) + rack (>= 3.0.0, < 4) rack-proxy (0.7.7) rack - rack-session (1.0.2) - rack (< 3) + rack-session (2.0.0) + rack (>= 3.0.0) rack-test (2.1.0) rack (>= 1.3) rack-utf8_sanitizer (1.9.1) rack (>= 1.0, < 4.0) - rackup (1.0.0) - rack (< 3) - webrick + rackup (2.2.1) + rack (>= 3) rails (7.2.1.1) actioncable (= 7.2.1.1) actionmailbox (= 7.2.1.1) @@ -670,17 +677,17 @@ GEM zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.2.1) - rb-fsevent (0.11.1) - rb-inotify (0.10.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) - rdoc (6.7.0) + rdoc (6.8.1) psych (>= 4.0.0) redis (5.3.0) redis-client (>= 0.22.0) redis-client (0.22.2) connection_pool regexp_parser (2.9.2) - reline (0.5.10) + reline (0.5.11) io-console (~> 0.5) representable (3.2.0) declarative (< 0.1.0) @@ -695,18 +702,18 @@ GEM netrc (~> 0.8) retriable (3.1.2) rexml (3.3.9) - rouge (4.4.0) + rouge (4.5.1) rspec-collection_matchers (1.2.1) rspec-expectations (>= 2.99.0.beta1) - rspec-core (3.13.1) + rspec-core (3.13.2) rspec-support (~> 3.13.0) - rspec-expectations (3.13.2) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.1) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (7.0.1) + rspec-rails (7.1.0) actionpack (>= 7.0) activesupport (>= 7.0) railties (>= 7.0) @@ -715,59 +722,59 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.64.1) + rubocop (1.68.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.31.1, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) + rubocop-ast (1.36.1) parser (>= 3.3.1.0) rubocop-capybara (2.21.0) rubocop (~> 1.41) - rubocop-govuk (5.0.2) - rubocop (= 1.64.1) - rubocop-ast (= 1.31.3) + rubocop-govuk (5.0.3) + rubocop (= 1.68.0) + rubocop-ast (= 1.36.1) rubocop-capybara (= 2.21.0) - rubocop-rails (= 2.25.1) + rubocop-rails (= 2.27.0) rubocop-rake (= 0.6.0) - rubocop-rspec (= 3.0.1) - rubocop-rails (2.25.1) + rubocop-rspec (= 3.2.0) + rubocop-rails (2.27.0) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.33.0, < 2.0) + rubocop (>= 1.52.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (3.0.1) + rubocop-rspec (3.2.0) rubocop (~> 1.61) ruby-progressbar (1.13.0) rubyzip (2.3.2) sass (3.7.4) sass-listen (~> 4.0.0) - sass-embedded (1.77.8) - google-protobuf (~> 4.26) + sass-embedded (1.81.0) + google-protobuf (~> 4.28) rake (>= 13) - sass-embedded (1.77.8-aarch64-linux-gnu) - google-protobuf (~> 4.26) - sass-embedded (1.77.8-arm64-darwin) - google-protobuf (~> 4.26) - sass-embedded (1.77.8-x86_64-linux-gnu) - google-protobuf (~> 4.26) + sass-embedded (1.81.0-aarch64-linux-gnu) + google-protobuf (~> 4.28) + sass-embedded (1.81.0-arm64-darwin) + google-protobuf (~> 4.28) + sass-embedded (1.81.0-x86_64-linux-gnu) + google-protobuf (~> 4.28) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) sassc (2.4.0) ffi (~> 1.9) - securerandom (0.3.1) + securerandom (0.3.2) select2-rails (3.5.11) - selenium-webdriver (4.21.1) + selenium-webdriver (4.26.0) base64 (~> 0.2) + logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -782,13 +789,12 @@ GEM sidekiq (>= 3.0) shoulda-matchers (6.4.0) activesupport (>= 5.2.0) - sidekiq (7.3.2) - concurrent-ruby (< 2) + sidekiq (7.3.6) connection_pool (>= 2.3.0) logger rack (>= 2.2.4) redis-client (>= 0.22.2) - signet (0.18.0) + signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -797,7 +803,7 @@ GEM docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) snaky_hash (2.0.1) hashie @@ -810,20 +816,20 @@ GEM activesupport (>= 6.1) sprockets (>= 3.0.0) statsd-ruby (1.5.0) - stringio (3.1.1) - sys-uname (1.2.3) + stringio (3.1.2) + sys-uname (1.3.1) ffi (~> 1.1) terser (1.2.4) execjs (>= 0.3.0, < 3) thor (1.3.2) timecop (0.9.10) - timeout (0.4.1) + timeout (0.4.2) trailblazer-option (0.1.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - unicode-display_width (2.5.0) - uri (0.13.0) + unicode-display_width (2.6.0) + uri (1.0.2) useragent (0.16.10) version_gem (1.1.4) warden (1.2.9) @@ -839,8 +845,8 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.8.2) - websocket (1.2.10) + webrick (1.9.0) + websocket (1.2.11) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -901,4 +907,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.22 + 2.5.22