Skip to content
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

Upgrade React Native to version 0.71.15 #6522

Merged
merged 18 commits into from
Jan 30, 2024
Merged

Conversation

fluiddot
Copy link
Contributor

@fluiddot fluiddot commented Jan 9, 2024

Related PRs:

To test:
Nothing in particular, it should be enough by smoke testing the editor.

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered if this change warrants user-facing release notes more info and have added them to RELEASE-NOTES.txt if necessary.

The changes in the Xcode project were automatically made after installing pods.
@fluiddot fluiddot added the dependencies Pull requests that update a dependency file label Jan 16, 2024
@@ -60,7 +60,6 @@
"Yoga": [],
"DoubleConversion": [],
"glog": [],
"React-jsc": [],
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory, we no longer use JSC as for both platforms we use hermes. This dependency was introduced here when RN version was upgraded to 0.71.11, but seems it wasn't necessary. That said, I wonder if we could remove the podspec (i.e. third-party-podspecs/React-jsc.podspec.json).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That said, I wonder if we could remove the podspec (i.e. third-party-podspecs/React-jsc.podspec.json).

I think we could remove it since we are not using it, should we do it with these changes or in a separate PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I agree. I'd rather remove the file in a separate PR as the change shouldn't be related to the RN upgrade.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather remove the file in a separate PR as the change shouldn't be related to the RN upgrade.

Sounds good!

Comment on lines +77 to +81
# The following workaround is needed to avoid the error `typedef redefinition with different types ('uint8_t' (aka 'unsigned char') vs 'enum clockid_t')`.
# This solution is referenced in https://github.com/facebook/react-native/issues/39568#issuecomment-1762890606.
# It will be needed until RCT-Folly version is bumped in React Native to version v2022.08.29.00 or above.
# Referece: https://github.com/facebook/folly/commit/4a2410fae65afb85e1fec6d922005054b05de59f
__apply_Xcode_12_5_M1_post_install_workaround(installer)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

More info can be found in the Gutenberg PR: WordPress/gutenberg#57667

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes have been introduced in React Native version 0.71.14 as part of an Xcode 15 patch.

Copy link
Contributor

@geriux geriux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved via WordPress/gutenberg#57667 (review)

There's a failing E2E test but it looks like it's related to the Xpath locator, I've tested the Buttons block and it works as expected 🚀

@fluiddot
Copy link
Contributor Author

There's a failing E2E test but it looks like it's related to the Xpath locator, I've tested the Buttons block and it works as expected 🚀

@geriux I addressed this issue in:

I'll trigger full test suites again to confirm it no longer happens.

# Conflicts:
#	ios-xcframework/Podfile.lock
@fluiddot
Copy link
Contributor Author

I'll trigger full test suites again to confirm it no longer happens.

I saw that Test iOS on Device – Canary Pages and Test Android on Device – Full failed but they succeeded after retrying the job. I'll now proceed to merge the PRs and create an alpha tag.

@fluiddot fluiddot added this to the 1.112.0 (24.2) milestone Jan 30, 2024
@fluiddot fluiddot merged commit 556f9d1 into trunk Jan 30, 2024
23 checks passed
@fluiddot fluiddot deleted the upgrade/react-native-0.71.15 branch January 30, 2024 13:44
@derekblank derekblank mentioned this pull request Feb 1, 2024
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants