Skip to content

Commit 1e6add1

Browse files
barbierifacebook-github-bot
authored andcommitted
iOS Ruby Updates (#32456)
Summary: Fix the `scripts/update-ruby.sh` so it always use the correct [bundle config](https://bundler.io/man/bundle-config.1.html#DESCRIPTION). In the current version it wasn't using the correct configuration inside the `template/` directory, resulting in incorrect platform for `template/Gemfile.lock`. While at that, update the gems to their latest version: - ethon 0.14.0 -> 0.15.0 - json 0.5.1 -> 0.6.0 - zeitwerk 2.4.2 -> 2.5.1 - bundler 2.2.28 -> 2.2.29 ## Changelog No changelog Pull Request resolved: #32456 Test Plan: Run `bump-oss-version.js` and see `template/Gemfile.lock` lists `ruby` as the `PLATFORM` (no diff in that line). ## References - e18cf90#r58230816 Reviewed By: yungsters Differential Revision: D31841524 Pulled By: charlesbdudley fbshipit-source-id: 695c245fcb344c866afed45f747e04233e5c91e4
1 parent ad399f7 commit 1e6add1

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

Gemfile.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ GEM
5656
colored2 (3.1.2)
5757
concurrent-ruby (1.1.9)
5858
escape (0.0.4)
59-
ethon (0.14.0)
59+
ethon (0.15.0)
6060
ffi (>= 1.15.0)
6161
ffi (1.15.4)
6262
fourflusher (2.3.1)
@@ -65,7 +65,7 @@ GEM
6565
httpclient (2.8.3)
6666
i18n (1.8.10)
6767
concurrent-ruby (~> 1.0)
68-
json (2.5.1)
68+
json (2.6.0)
6969
minitest (5.14.4)
7070
molinillo (0.8.0)
7171
nanaimo (0.3.0)
@@ -85,7 +85,7 @@ GEM
8585
colored2 (~> 3.1)
8686
nanaimo (~> 0.3.0)
8787
rexml (~> 3.2.4)
88-
zeitwerk (2.4.2)
88+
zeitwerk (2.5.1)
8989

9090
PLATFORMS
9191
ruby
@@ -97,4 +97,4 @@ RUBY VERSION
9797
ruby 2.7.4p191
9898

9999
BUNDLED WITH
100-
2.2.28
100+
2.2.29

scripts/update-ruby.sh

+3
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ sed_i -e "s/^\(ruby '\)[^']*\('.*\)$/\1$VERSION\2/" template/Gemfile
5555

5656
rm -f Gemfile.lock template/Gemfile.lock
5757

58+
export BUNDLE_APP_CONFIG="$ROOT/.bundle"
59+
cp "$BUNDLE_APP_CONFIG/"* template/_bundle # sync!
60+
5861
bundle lock
5962
(cd template && bundle lock)
6063

template/Gemfile.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ GEM
5656
colored2 (3.1.2)
5757
concurrent-ruby (1.1.9)
5858
escape (0.0.4)
59-
ethon (0.14.0)
59+
ethon (0.15.0)
6060
ffi (>= 1.15.0)
6161
ffi (1.15.4)
6262
fourflusher (2.3.1)
@@ -65,7 +65,7 @@ GEM
6565
httpclient (2.8.3)
6666
i18n (1.8.10)
6767
concurrent-ruby (~> 1.0)
68-
json (2.5.1)
68+
json (2.6.0)
6969
minitest (5.14.4)
7070
molinillo (0.8.0)
7171
nanaimo (0.3.0)
@@ -85,10 +85,10 @@ GEM
8585
colored2 (~> 3.1)
8686
nanaimo (~> 0.3.0)
8787
rexml (~> 3.2.4)
88-
zeitwerk (2.4.2)
88+
zeitwerk (2.5.1)
8989

9090
PLATFORMS
91-
arm64-darwin-20
91+
ruby
9292

9393
DEPENDENCIES
9494
cocoapods (~> 1.11, >= 1.11.2)
@@ -97,4 +97,4 @@ RUBY VERSION
9797
ruby 2.7.4p191
9898

9999
BUNDLED WITH
100-
2.2.28
100+
2.2.29

0 commit comments

Comments
 (0)