From 93a785dd83ff2d0c0a6b3dce346cfcdc9dbd61e5 Mon Sep 17 00:00:00 2001 From: Seth Boyles Date: Mon, 28 Feb 2022 21:55:23 +0000 Subject: [PATCH 1/2] Bump ruby version to ruby 3 [#2619] Co-authored-by: Seth Boyles Co-authored-by: Alex Rocha --- .ruby-version | 2 +- Gemfile.lock | 2 +- spec/unit/models/runtime/stack_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ruby-version b/.ruby-version index 37c2961c243..75a22a26ac4 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.2 +3.0.3 diff --git a/Gemfile.lock b/Gemfile.lock index be94b7816cf..f9dec3b4a0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -639,4 +639,4 @@ DEPENDENCIES yajl-ruby BUNDLED WITH - 2.1.4 + 2.2.32 diff --git a/spec/unit/models/runtime/stack_spec.rb b/spec/unit/models/runtime/stack_spec.rb index 0e6c6517884..d19050335e0 100644 --- a/spec/unit/models/runtime/stack_spec.rb +++ b/spec/unit/models/runtime/stack_spec.rb @@ -102,7 +102,7 @@ module VCAP::CloudController mock_logger = double allow(Steno).to receive(:logger).and_return(mock_logger) - expect(mock_logger).to receive(:warn).with('stack.populate.collision', 'name' => 'cider', 'description' => 'cider-description') + expect(mock_logger).to receive(:warn).with('stack.populate.collision', { 'name' => 'cider', 'description' => 'cider-description' }) Stack.populate end From d282f495ed1d7fb841d4a88a2216dd1c0ec32d8b Mon Sep 17 00:00:00 2001 From: Michael Oleske Date: Thu, 3 Mar 2022 15:35:54 -0800 Subject: [PATCH 2/2] Bump bundler in docs/v3 - missed it in the other commit Authored-by: Michael Oleske --- docs/v3/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/v3/Gemfile.lock b/docs/v3/Gemfile.lock index 46cf4b81fe5..c9ae32cbea0 100644 --- a/docs/v3/Gemfile.lock +++ b/docs/v3/Gemfile.lock @@ -160,4 +160,4 @@ DEPENDENCIES sass BUNDLED WITH - 2.1.4 + 2.2.32