Skip to content

Commit

Permalink
iOS Ruby Updates (facebook#32456)
Browse files Browse the repository at this point in the history
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: facebook#32456

Test Plan:
Run `bump-oss-version.js` and see `template/Gemfile.lock` lists `ruby` as the `PLATFORM` (no diff in that line).

## References
 - facebook@e18cf90#r58230816

Reviewed By: yungsters

Differential Revision: D31841524

Pulled By: charlesbdudley

fbshipit-source-id: 695c245fcb344c866afed45f747e04233e5c91e4
  • Loading branch information
barbieri authored and facebook-github-bot committed Oct 21, 2021
1 parent ad399f7 commit 1e6add1
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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
Expand All @@ -97,4 +97,4 @@ RUBY VERSION
ruby 2.7.4p191

BUNDLED WITH
2.2.28
2.2.29
3 changes: 3 additions & 0 deletions scripts/update-ruby.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
10 changes: 5 additions & 5 deletions template/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -97,4 +97,4 @@ RUBY VERSION
ruby 2.7.4p191

BUNDLED WITH
2.2.28
2.2.29

0 comments on commit 1e6add1

Please sign in to comment.