-
Notifications
You must be signed in to change notification settings - Fork 24.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[ios] Upgrade folly to 2021.06.28.00 and boost to 1.76.0 #31840
Conversation
Base commit: 25a1612 |
Base commit: 25a1612 |
@yungsters has imported this pull request. If you are a Facebook employee, you can view this diff on Phabricator. |
looks like it failed internally. please let me know anything i could help. |
Yup. I have almost everything working, but we have some internal codegen builds that are failing. I'll ping the owner again today to help take a look. |
@yungsters awesome! thanks for your update. |
@yungsters merged this pull request in b77948e. |
Summary: The reason why I'm working on this is to reduce the delta between this and the react-native-macos fork, in particular with the android patch folder "Build": https://github.com/microsoft/react-native-macos/tree/main/android-patches/patches/Build (it's a long story) While checking the changes in there, I noticed that one of them was a bump of boost. Looking back into main (here), I then noticed that there have been two bumps to boot in the repo so far: * a combo update 5 years ago to 1.63: * 193afff * 5c24a91 * and an update for the iOS side to 1.76 by Kudo last year: #31840 So this quickly turned into this: the PR wants to re-align the version of boost used in both iOS and Android. I explored the option of bumping both to 1.78 (latest at the time of writing: https://www.boost.org/users/history/version_1_78_0.html) but then I noticed that there's a Flipper dependency, `Flipper-Boost-iOSX`, on the iOS pods side that has been released only once and it seems to imply that it's 1.76 only compatible https://github.com/priteshrnandgaonkar/Flipper-Boost-iOSX/releases/tag/1.76.0.1.11. So going to 1.78 at least for now seems like a no-go, and I've settled for just aligning everything to 1.76 and just like iOS, move away from `boost-for-react-native` in favour of the original one. While doing so, I also noticed that the `React/third-party.xcconfig` still had a reference to 1.68 instead of 1.76 which seems like a leftover from Kudo's PR... it's probably because it was not doing anything in the first place, so lmk if you want me to delete it. ## Changelog <!-- Help reviewers and the release process by writing your own changelog entry. For an example, see: https://github.com/facebook/react-native/wiki/Changelog --> [Android] [Changed] - Bump boost for Android to 1.76 to align with iOS Pull Request resolved: #33565 Test Plan: CI is green (aside an unrelated ios rntester job that is also broken on main) ✅ Locally both RNTester and new app work: <img width="432" alt="Screenshot 2022-04-05 at 16 42 31" src="https://user-images.githubusercontent.com/16104054/161815444-0de63919-b90d-4a48-963a-872f0cc4ce79.png"> <img width="346" alt="Screenshot 2022-04-05 at 18 06 01" src="https://user-images.githubusercontent.com/16104054/161815438-b7b1c997-9dcd-47bd-acbe-732155941bb0.png"> Reviewed By: sshic Differential Revision: D35433032 Pulled By: cortinico fbshipit-source-id: 0d93f61f8c26eda1dd04127a8b20e799ab6828cb
Summary: The reason why I'm working on this is to reduce the delta between this and the react-native-macos fork, in particular with the android patch folder "Build": https://github.com/microsoft/react-native-macos/tree/main/android-patches/patches/Build (it's a long story) While checking the changes in there, I noticed that one of them was a bump of boost. Looking back into main (here), I then noticed that there have been two bumps to boot in the repo so far: * a combo update 5 years ago to 1.63: * facebook@193afff * facebook@5c24a91 * and an update for the iOS side to 1.76 by Kudo last year: facebook#31840 So this quickly turned into this: the PR wants to re-align the version of boost used in both iOS and Android. I explored the option of bumping both to 1.78 (latest at the time of writing: https://www.boost.org/users/history/version_1_78_0.html) but then I noticed that there's a Flipper dependency, `Flipper-Boost-iOSX`, on the iOS pods side that has been released only once and it seems to imply that it's 1.76 only compatible https://github.com/priteshrnandgaonkar/Flipper-Boost-iOSX/releases/tag/1.76.0.1.11. So going to 1.78 at least for now seems like a no-go, and I've settled for just aligning everything to 1.76 and just like iOS, move away from `boost-for-react-native` in favour of the original one. While doing so, I also noticed that the `React/third-party.xcconfig` still had a reference to 1.68 instead of 1.76 which seems like a leftover from Kudo's PR... it's probably because it was not doing anything in the first place, so lmk if you want me to delete it. ## Changelog <!-- Help reviewers and the release process by writing your own changelog entry. For an example, see: https://github.com/facebook/react-native/wiki/Changelog --> [Android] [Changed] - Bump boost for Android to 1.76 to align with iOS Pull Request resolved: facebook#33565 Test Plan: CI is green (aside an unrelated ios rntester job that is also broken on main) ✅ Locally both RNTester and new app work: <img width="432" alt="Screenshot 2022-04-05 at 16 42 31" src="https://user-images.githubusercontent.com/16104054/161815444-0de63919-b90d-4a48-963a-872f0cc4ce79.png"> <img width="346" alt="Screenshot 2022-04-05 at 18 06 01" src="https://user-images.githubusercontent.com/16104054/161815438-b7b1c997-9dcd-47bd-acbe-732155941bb0.png"> Reviewed By: sshic Differential Revision: D35433032 Pulled By: cortinico fbshipit-source-id: 0d93f61f8c26eda1dd04127a8b20e799ab6828cb
Summary
std::unordered_map::insert_or_assign
.Changelog
[iOS] [Changed] - Upgrade folly to 2021.06.28.00 and boost to 1.76.0
Test Plan
CI passed