diff --git a/Gemfile.lock b/Gemfile.lock index de5f3d29a1b71c..e0f260750f1659 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,7 +56,7 @@ GEM colored2 (3.1.2) concurrent-ruby (1.1.9) escape (0.0.4) - ethon (0.14.0) + ethon (0.15.0) ffi (>= 1.15.0) ffi (1.15.4) fourflusher (2.3.1) @@ -65,7 +65,7 @@ GEM httpclient (2.8.3) i18n (1.8.10) concurrent-ruby (~> 1.0) - json (2.5.1) + json (2.6.0) minitest (5.14.4) molinillo (0.8.0) nanaimo (0.3.0) @@ -85,7 +85,7 @@ GEM colored2 (~> 3.1) nanaimo (~> 0.3.0) rexml (~> 3.2.4) - zeitwerk (2.4.2) + zeitwerk (2.5.1) PLATFORMS ruby @@ -97,4 +97,4 @@ RUBY VERSION ruby 2.7.4p191 BUNDLED WITH - 2.2.28 + 2.2.29 diff --git a/scripts/update-ruby.sh b/scripts/update-ruby.sh index a220ad84735996..bb72719c43a376 100755 --- a/scripts/update-ruby.sh +++ b/scripts/update-ruby.sh @@ -55,6 +55,9 @@ sed_i -e "s/^\(ruby '\)[^']*\('.*\)$/\1$VERSION\2/" template/Gemfile rm -f Gemfile.lock template/Gemfile.lock +export BUNDLE_APP_CONFIG="$ROOT/.bundle" +cp "$BUNDLE_APP_CONFIG/"* template/_bundle # sync! + bundle lock (cd template && bundle lock) diff --git a/template/Gemfile.lock b/template/Gemfile.lock index f0b073f27b1d18..e0f260750f1659 100644 --- a/template/Gemfile.lock +++ b/template/Gemfile.lock @@ -56,7 +56,7 @@ GEM colored2 (3.1.2) concurrent-ruby (1.1.9) escape (0.0.4) - ethon (0.14.0) + ethon (0.15.0) ffi (>= 1.15.0) ffi (1.15.4) fourflusher (2.3.1) @@ -65,7 +65,7 @@ GEM httpclient (2.8.3) i18n (1.8.10) concurrent-ruby (~> 1.0) - json (2.5.1) + json (2.6.0) minitest (5.14.4) molinillo (0.8.0) nanaimo (0.3.0) @@ -85,10 +85,10 @@ GEM colored2 (~> 3.1) nanaimo (~> 0.3.0) rexml (~> 3.2.4) - zeitwerk (2.4.2) + zeitwerk (2.5.1) PLATFORMS - arm64-darwin-20 + ruby DEPENDENCIES cocoapods (~> 1.11, >= 1.11.2) @@ -97,4 +97,4 @@ RUBY VERSION ruby 2.7.4p191 BUNDLED WITH - 2.2.28 + 2.2.29