fix(ios): fix Time.h patch not being applied
#32961
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The path to `Time.h` is currently hard-coded and does not take into consideration the `--project-directory` flag when running `pod install`.
facebook-github-bot
added
CLA Signed
|
@lunaleaps, @kelset: Please also backport this to 0.67 as it is a regression. |
kelset
approved these changes
Jan 24, 2022
mikehardy
reviewed
Jan 24, 2022
| @@ -646,5 +646,6 @@ def __apply_Xcode_12_5_M1_post_install_workaround(installer) | |||
| # "Time.h:52:17: error: typedef redefinition with different types" | |||
| # We need to make a patch to RCT-Folly - remove the `__IPHONE_OS_VERSION_MIN_REQUIRED` check. | |||
| # See https://github.com/facebook/flipper/issues/834 for more details. | |||
| `sed -i -e $'s/ && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_10_0)//' Pods/RCT-Folly/folly/portability/Time.h` | |||
| time_header = "#{Pod::Config.instance.installation_root.to_s}/Pods/RCT-Folly/folly/portability/Time.h" | |||
There was a problem hiding this comment.
Ha of course! My hack lives on 😆 but I didn't think about making it durable.
Is there an RCT-Folly issue pursuing this for a non-hack fix? Just curious
There was a problem hiding this comment.
Would the non hack fix not be facebook/folly#1688 ?
There was a problem hiding this comment.
@Saadnajmi that looks like it exactly! Hopefully it lands soon-ish and react-native 0.68 can include it
mikehardy
approved these changes
Jan 24, 2022
34 tasks
|
@lunaleaps has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
|
This pull request was successfully merged by @tido64 in 60cef85. When will my fix make it into a release? | Upcoming Releases |
kelset
pushed a commit
that referenced
this pull request
Jan 31, 2022
Summary: The path to `Time.h` is currently hard-coded and does not take into consideration the `--project-directory` flag when running `pod install`. ## Changelog [iOS] [Fixed] - Fix `Time.h` patch not being applied when running `pod install --project-directory=ios` Pull Request resolved: #32961 Test Plan: ``` git clone https://github.com/microsoft/react-native-test-app.git cd react-native-test-app npm run set-react-version main yarn cd example pod install --project-directory=ios ../scripts/xcodebuild.sh ios/Example.xcworkspace build ``` Reviewed By: christophpurrer Differential Revision: D33748789 Pulled By: lunaleaps fbshipit-source-id: b125734eba30e552ae139e7ecd4e634c8fa1bcd7
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
The path to
Time.his currently hard-coded and does not take intoconsideration the
--project-directoryflag when runningpod install.Changelog
[iOS] [Fixed] - Fix
Time.hpatch not being applied when runningpod install --project-directory=iosTest Plan