[RNMobile] Upgrade React Native to version 0.71.15 (#57667)

* Upgrade `react-native` to version 0.71.15 * Add `activesupport` gem * Upgrade `react-native` in `react-native-editor` package * Update `Podfile.lock` * Update Xcode demo project The modifications were automatically made when installing pods. * Update `react-native` patch file * Apply workaround in `Podfile` to address build failure The workaround solves the issue related to redefining `clockid_t` in the pod `RCT-Folly`. * Update inline comment in `Podfile` * Fix XPath locator of `addButtonWithInlineAppender` E2E helper * Update `react-native-editor` changelog * Update `hermes-engine` pod to version 0.71.15 This update was already made in 66fa7bc but we to apply it again after updating with `trunk`.
WordPress · Jan 30, 2024 · 90e9bc9 · 90e9bc9
1 parent 0124e7e
commit 90e9bc9
Show file tree

Hide file tree

Showing 12 changed files with 1,324 additions and 1,649 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -232,7 +232,7 @@
 		"progress": "2.0.3",
 		"react": "18.2.0",
 		"react-dom": "18.2.0",
-		"react-native": "0.71.11",
+		"react-native": "0.71.15",
 		"react-native-url-polyfill": "1.1.2",
 		"react-refresh": "0.14.0",
 		"react-test-renderer": "18.2.0",

diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md
@@ -10,6 +10,7 @@ For each user feature we should also add a importance categorization label  to i
 -->
 
 ## Unreleased
+-   [*] [internal] Upgrade React Native to version 0.71.15 [#57667]
 
 ## 1.111.2
 -   [*] [internal] Remove `mediaFilesCollectionBlock` initial prop [#58140]

diff --git a/packages/react-native-editor/__device-tests__/pages/editor-page.js b/packages/react-native-editor/__device-tests__/pages/editor-page.js
@@ -1022,7 +1022,7 @@ class EditorPage {
 	async addButtonWithInlineAppender( position = 1 ) {
 		const appenderButton = isAndroid()
 			? await this.waitForElementToBeDisplayedByXPath(
-					`//android.widget.Button[@content-desc="Buttons Block. Row 1"]/android.view.ViewGroup/android.view.ViewGroup[1]/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup[${ position }]/android.view.ViewGroup/android.widget.Button`
+					`//android.widget.Button[@content-desc="Buttons Block. Row 1"]/android.view.ViewGroup/android.view.ViewGroup[1]/android.widget.Button[${ position }]`
 			  )
 			: await this.waitForElementToBeDisplayedById( 'appender-button' );
 		await appenderButton.click();

diff --git a/packages/react-native-editor/ios/Gemfile b/packages/react-native-editor/ios/Gemfile
@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'cocoapods', '>= 1.11.3'
+gem 'cocoapods', '>= 1.11.3'
+gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
diff --git a/packages/react-native-editor/ios/Gemfile.lock b/packages/react-native-editor/ios/Gemfile.lock
@@ -93,6 +93,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (>= 6.1.7.3, < 7.1.0)
   cocoapods (>= 1.11.3)
 
 BUNDLED WITH

diff --git a/packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj b/packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj
@@ -694,6 +694,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
+					_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -705,6 +706,11 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-Wl",
+					"-ld_classic",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 5.0;
@@ -733,6 +739,10 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
+				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -741,6 +751,11 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-Wl",
+					"-ld_classic",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 5.0;

diff --git a/packages/react-native-editor/ios/Podfile b/packages/react-native-editor/ios/Podfile
@@ -62,6 +62,12 @@ target 'GutenbergDemo' do
       :mac_catalyst_enabled => false
     )
 
+    # 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)
+
     # Let Pods targets inherit deployment target from the app
     # This solution is suggested here: https://github.com/CocoaPods/CocoaPods/issues/4859
     installer.pods_project.targets.each do |target|