Merge pull request #6522 from wordpress-mobile/upgrade/react-native-0…

….71.15 Upgrade React Native to version 0.71.15
wordpress-mobile · Jan 30, 2024 · 556f9d1 · 556f9d1
2 parents 3b47098 + 56f08df
commit 556f9d1
Show file tree

Hide file tree

Showing 9 changed files with 271 additions and 244 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,5 +1,6 @@
 Unreleased
 ---
+* [*] [internal] Upgrade React Native to version 0.71.15 [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6522]
 
 1.111.2
 ---

diff --git a/__device-tests__/gutenberg-editor-functionality-test-1-visual.test.js b/__device-tests__/gutenberg-editor-functionality-test-1-visual.test.js
@@ -15,7 +15,7 @@ const {
 import { NESTED_COLUMNS_3_LEVELS } from './test-editor-data';
 
 const ANDROID_COLUMN_APPENDER_BUTTON_XPATH =
-	'//android.widget.Button[@content-desc="Column Block. Row 1"]/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup/android.widget.Button';
+	'//android.widget.Button[@content-desc="Column Block. Row 1"]/android.view.ViewGroup/android.view.ViewGroup/android.widget.Button';
 
 describe( 'Gutenberg Editor - Test Suite 1', () => {
 	describe( 'Columns block', () => {
@@ -298,7 +298,7 @@ describe( 'Gutenberg Editor - Test Suite 1', () => {
 			await clickIfClickable( editorPage.driver, twitterIconXpath );
 			await editorPage.toggleFormatting( 'Add link to Twitter' );
 			const uRLFieldXpath = isAndroid()
-				? '//android.widget.Button[@content-desc="URL. Empty"]/android.view.ViewGroup[1]/android.widget.EditText'
+				? '//android.widget.Button[@content-desc="URL. Empty"]/android.widget.EditText'
 				: '//XCUIElementTypeOther[@name="Add URL"]/XCUIElementTypeTextField';
 			const uRLField = await waitForVisible(
 				editorPage.driver,
@@ -347,7 +347,7 @@ describe( 'Gutenberg Editor - Test Suite 1', () => {
 			await clickIfClickable( editorPage.driver, amazonBlockXPath );
 
 			const uRLFieldXpath = isAndroid()
-				? '//android.widget.Button[@content-desc="URL. Empty"]/android.view.ViewGroup[1]/android.widget.EditText'
+				? '//android.widget.Button[@content-desc="URL. Empty"]/android.widget.EditText'
 				: '//XCUIElementTypeOther[@name="Add URL"]/XCUIElementTypeTextField';
 			const uRLField = await waitForVisible(
 				editorPage.driver,

diff --git a/__device-tests__/gutenberg-editor-functionality-test-4-visual.test.js b/__device-tests__/gutenberg-editor-functionality-test-4-visual.test.js
@@ -273,7 +273,7 @@ describe( 'Gutenberg Editor - Test Suite 4', () => {
 			for ( let i = 1; i <= GROUP_NESTED_STRUCTURE_LEVELS; i++ ) {
 				await editorPage.moveBlockSelectionUp();
 
-				await editorPage.driver.pause( 250 );
+				await editorPage.driver.pause( 500 );
 
 				// Visual test check
 				screenshot = await takeScreenshot();

diff --git a/gutenberg b/gutenberg
diff --git a/ios-xcframework/Podfile b/ios-xcframework/Podfile
@@ -78,6 +78,12 @@ end
 post_install do |installer|
   react_native_post_install(installer, REACT_NATIVE_PATH)
 
+  # 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)
+
   installer.pods_project.targets.each do |target|
     # Work around issue with embedding the Hermes XCFramework
     #