From 124de6ba98349aeb4b65fc369127700aff1ec078 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 9 Jan 2024 11:16:59 +0100 Subject: [PATCH 01/15] Update Gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index e8b0a4c459..e11f2c0f9b 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit e8b0a4c459dd2dd8f6775f312128cc6e7106a6bc +Subproject commit e11f2c0f9bd0200afd728a8a0c58c9baff6a92da From d3b3937ed91c4c055b48f7e0e7b5fcb9f136043c Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 9 Jan 2024 12:15:21 +0100 Subject: [PATCH 02/15] Update Gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index e11f2c0f9b..0456b3e96a 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit e11f2c0f9bd0200afd728a8a0c58c9baff6a92da +Subproject commit 0456b3e96a875c910417aedba903555687c538b9 From d3cfc8ee5562a98ca4e5f86dd070d975e0ecb075 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 9 Jan 2024 12:17:05 +0100 Subject: [PATCH 03/15] Update XCFramework The changes in the Xcode project were automatically made after installing pods. --- ios-xcframework/Podfile.lock | 442 +++++++++--------- .../project.pbxproj | 18 + 2 files changed, 239 insertions(+), 221 deletions(-) diff --git a/ios-xcframework/Podfile.lock b/ios-xcframework/Podfile.lock index 0988fc9bd8..d9e01ffc9b 100644 --- a/ios-xcframework/Podfile.lock +++ b/ios-xcframework/Podfile.lock @@ -3,14 +3,14 @@ PODS: - BVLinearGradient (2.7.3): - React-Core - DoubleConversion (1.1.6) - - FBLazyVector (0.71.11) - - FBReactNativeSpec (0.71.11): + - FBLazyVector (0.71.15) + - FBReactNativeSpec (0.71.15): - RCT-Folly (= 2021.07.22.00) - - RCTRequired (= 0.71.11) - - RCTTypeSafety (= 0.71.11) - - React-Core (= 0.71.11) - - React-jsi (= 0.71.11) - - ReactCommon/turbomodule/core (= 0.71.11) + - RCTRequired (= 0.71.15) + - RCTTypeSafety (= 0.71.15) + - React-Core (= 0.71.15) + - React-jsi (= 0.71.15) + - ReactCommon/turbomodule/core (= 0.71.15) - fmt (6.2.1) - glog (0.3.5) - hermes-engine (0.71.11): @@ -43,26 +43,26 @@ PODS: - fmt (~> 6.2.1) - glog - libevent - - RCTRequired (0.71.11) - - RCTTypeSafety (0.71.11): - - FBLazyVector (= 0.71.11) - - RCTRequired (= 0.71.11) - - React-Core (= 0.71.11) - - React (0.71.11): - - React-Core (= 0.71.11) - - React-Core/DevSupport (= 0.71.11) - - React-Core/RCTWebSocket (= 0.71.11) - - React-RCTActionSheet (= 0.71.11) - - React-RCTAnimation (= 0.71.11) - - React-RCTBlob (= 0.71.11) - - React-RCTImage (= 0.71.11) - - React-RCTLinking (= 0.71.11) - - React-RCTNetwork (= 0.71.11) - - React-RCTSettings (= 0.71.11) - - React-RCTText (= 0.71.11) - - React-RCTVibration (= 0.71.11) - - React-callinvoker (0.71.11) - - React-Codegen (0.71.11): + - RCTRequired (0.71.15) + - RCTTypeSafety (0.71.15): + - FBLazyVector (= 0.71.15) + - RCTRequired (= 0.71.15) + - React-Core (= 0.71.15) + - React (0.71.15): + - React-Core (= 0.71.15) + - React-Core/DevSupport (= 0.71.15) + - React-Core/RCTWebSocket (= 0.71.15) + - React-RCTActionSheet (= 0.71.15) + - React-RCTAnimation (= 0.71.15) + - React-RCTBlob (= 0.71.15) + - React-RCTImage (= 0.71.15) + - React-RCTLinking (= 0.71.15) + - React-RCTNetwork (= 0.71.15) + - React-RCTSettings (= 0.71.15) + - React-RCTText (= 0.71.15) + - React-RCTVibration (= 0.71.15) + - React-callinvoker (0.71.15) + - React-Codegen (0.71.15): - FBReactNativeSpec - hermes-engine - RCT-Folly @@ -73,209 +73,209 @@ PODS: - React-jsiexecutor - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - React-Core (0.71.11): + - React-Core (0.71.15): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.71.11) - - React-cxxreact (= 0.71.11) + - React-Core/Default (= 0.71.15) + - React-cxxreact (= 0.71.15) - React-hermes - - React-jsi (= 0.71.11) - - React-jsiexecutor (= 0.71.11) - - React-perflogger (= 0.71.11) + - React-jsi (= 0.71.15) + - React-jsiexecutor (= 0.71.15) + - React-perflogger (= 0.71.15) - Yoga - - React-Core/CoreModulesHeaders (0.71.11): + - React-Core/CoreModulesHeaders (0.71.15): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.11) + - React-cxxreact (= 0.71.15) - React-hermes - - React-jsi (= 0.71.11) - - React-jsiexecutor (= 0.71.11) - - React-perflogger (= 0.71.11) + - React-jsi (= 0.71.15) + - React-jsiexecutor (= 0.71.15) + - React-perflogger (= 0.71.15) - Yoga - - React-Core/Default (0.71.11): + - React-Core/Default (0.71.15): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.71.11) + - React-cxxreact (= 0.71.15) - React-hermes - - React-jsi (= 0.71.11) - - React-jsiexecutor (= 0.71.11) - - React-perflogger (= 0.71.11) + - React-jsi (= 0.71.15) + - React-jsiexecutor (= 0.71.15) + - React-perflogger (= 0.71.15) - Yoga - - React-Core/DevSupport (0.71.11): + - React-Core/DevSupport (0.71.15): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.71.11) - - React-Core/RCTWebSocket (= 0.71.11) - - React-cxxreact (= 0.71.11) + - React-Core/Default (= 0.71.15) + - React-Core/RCTWebSocket (= 0.71.15) + - React-cxxreact (= 0.71.15) - React-hermes - - React-jsi (= 0.71.11) - - React-jsiexecutor (= 0.71.11) - - React-jsinspector (= 0.71.11) - - React-perflogger (= 0.71.11) + - React-jsi (= 0.71.15) + - React-jsiexecutor (= 0.71.15) + - React-jsinspector (= 0.71.15) + - React-perflogger (= 0.71.15) - Yoga - - React-Core/RCTActionSheetHeaders (0.71.11): + - React-Core/RCTActionSheetHeaders (0.71.15): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.11) + - React-cxxreact (= 0.71.15) - React-hermes - - React-jsi (= 0.71.11) - - React-jsiexecutor (= 0.71.11) - - React-perflogger (= 0.71.11) + - React-jsi (= 0.71.15) + - React-jsiexecutor (= 0.71.15) + - React-perflogger (= 0.71.15) - Yoga - - React-Core/RCTAnimationHeaders (0.71.11): + - React-Core/RCTAnimationHeaders (0.71.15): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.11) + - React-cxxreact (= 0.71.15) - React-hermes - - React-jsi (= 0.71.11) - - React-jsiexecutor (= 0.71.11) - - React-perflogger (= 0.71.11) + - React-jsi (= 0.71.15) + - React-jsiexecutor (= 0.71.15) + - React-perflogger (= 0.71.15) - Yoga - - React-Core/RCTBlobHeaders (0.71.11): + - React-Core/RCTBlobHeaders (0.71.15): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.11) + - React-cxxreact (= 0.71.15) - React-hermes - - React-jsi (= 0.71.11) - - React-jsiexecutor (= 0.71.11) - - React-perflogger (= 0.71.11) + - React-jsi (= 0.71.15) + - React-jsiexecutor (= 0.71.15) + - React-perflogger (= 0.71.15) - Yoga - - React-Core/RCTImageHeaders (0.71.11): + - React-Core/RCTImageHeaders (0.71.15): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.11) + - React-cxxreact (= 0.71.15) - React-hermes - - React-jsi (= 0.71.11) - - React-jsiexecutor (= 0.71.11) - - React-perflogger (= 0.71.11) + - React-jsi (= 0.71.15) + - React-jsiexecutor (= 0.71.15) + - React-perflogger (= 0.71.15) - Yoga - - React-Core/RCTLinkingHeaders (0.71.11): + - React-Core/RCTLinkingHeaders (0.71.15): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.11) + - React-cxxreact (= 0.71.15) - React-hermes - - React-jsi (= 0.71.11) - - React-jsiexecutor (= 0.71.11) - - React-perflogger (= 0.71.11) + - React-jsi (= 0.71.15) + - React-jsiexecutor (= 0.71.15) + - React-perflogger (= 0.71.15) - Yoga - - React-Core/RCTNetworkHeaders (0.71.11): + - React-Core/RCTNetworkHeaders (0.71.15): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.11) + - React-cxxreact (= 0.71.15) - React-hermes - - React-jsi (= 0.71.11) - - React-jsiexecutor (= 0.71.11) - - React-perflogger (= 0.71.11) + - React-jsi (= 0.71.15) + - React-jsiexecutor (= 0.71.15) + - React-perflogger (= 0.71.15) - Yoga - - React-Core/RCTSettingsHeaders (0.71.11): + - React-Core/RCTSettingsHeaders (0.71.15): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.11) + - React-cxxreact (= 0.71.15) - React-hermes - - React-jsi (= 0.71.11) - - React-jsiexecutor (= 0.71.11) - - React-perflogger (= 0.71.11) + - React-jsi (= 0.71.15) + - React-jsiexecutor (= 0.71.15) + - React-perflogger (= 0.71.15) - Yoga - - React-Core/RCTTextHeaders (0.71.11): + - React-Core/RCTTextHeaders (0.71.15): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.11) + - React-cxxreact (= 0.71.15) - React-hermes - - React-jsi (= 0.71.11) - - React-jsiexecutor (= 0.71.11) - - React-perflogger (= 0.71.11) + - React-jsi (= 0.71.15) + - React-jsiexecutor (= 0.71.15) + - React-perflogger (= 0.71.15) - Yoga - - React-Core/RCTVibrationHeaders (0.71.11): + - React-Core/RCTVibrationHeaders (0.71.15): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.11) + - React-cxxreact (= 0.71.15) - React-hermes - - React-jsi (= 0.71.11) - - React-jsiexecutor (= 0.71.11) - - React-perflogger (= 0.71.11) + - React-jsi (= 0.71.15) + - React-jsiexecutor (= 0.71.15) + - React-perflogger (= 0.71.15) - Yoga - - React-Core/RCTWebSocket (0.71.11): + - React-Core/RCTWebSocket (0.71.15): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.71.11) - - React-cxxreact (= 0.71.11) + - React-Core/Default (= 0.71.15) + - React-cxxreact (= 0.71.15) - React-hermes - - React-jsi (= 0.71.11) - - React-jsiexecutor (= 0.71.11) - - React-perflogger (= 0.71.11) + - React-jsi (= 0.71.15) + - React-jsiexecutor (= 0.71.15) + - React-perflogger (= 0.71.15) - Yoga - - React-CoreModules (0.71.11): + - React-CoreModules (0.71.15): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.11) - - React-Codegen (= 0.71.11) - - React-Core/CoreModulesHeaders (= 0.71.11) - - React-jsi (= 0.71.11) + - RCTTypeSafety (= 0.71.15) + - React-Codegen (= 0.71.15) + - React-Core/CoreModulesHeaders (= 0.71.15) + - React-jsi (= 0.71.15) - React-RCTBlob - - React-RCTImage (= 0.71.11) - - ReactCommon/turbomodule/core (= 0.71.11) - - React-cxxreact (0.71.11): + - React-RCTImage (= 0.71.15) + - ReactCommon/turbomodule/core (= 0.71.15) + - React-cxxreact (0.71.15): - boost (= 1.76.0) - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.71.11) - - React-jsi (= 0.71.11) - - React-jsinspector (= 0.71.11) - - React-logger (= 0.71.11) - - React-perflogger (= 0.71.11) - - React-runtimeexecutor (= 0.71.11) - - React-hermes (0.71.11): + - React-callinvoker (= 0.71.15) + - React-jsi (= 0.71.15) + - React-jsinspector (= 0.71.15) + - React-logger (= 0.71.15) + - React-perflogger (= 0.71.15) + - React-runtimeexecutor (= 0.71.15) + - React-hermes (0.71.15): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - RCT-Folly/Futures (= 2021.07.22.00) - - React-cxxreact (= 0.71.11) + - React-cxxreact (= 0.71.15) - React-jsi - - React-jsiexecutor (= 0.71.11) - - React-jsinspector (= 0.71.11) - - React-perflogger (= 0.71.11) - - React-jsi (0.71.11): + - React-jsiexecutor (= 0.71.15) + - React-jsinspector (= 0.71.15) + - React-perflogger (= 0.71.15) + - React-jsi (0.71.15): - boost (= 1.76.0) - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-jsiexecutor (0.71.11): + - React-jsiexecutor (0.71.15): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.71.11) - - React-jsi (= 0.71.11) - - React-perflogger (= 0.71.11) - - React-jsinspector (0.71.11) - - React-logger (0.71.11): + - React-cxxreact (= 0.71.15) + - React-jsi (= 0.71.15) + - React-perflogger (= 0.71.15) + - React-jsinspector (0.71.15) + - React-logger (0.71.15): - glog - react-native-blur (3.6.1): - React-Core @@ -298,90 +298,90 @@ PODS: - React-Core - react-native-webview (11.26.1): - React-Core - - React-perflogger (0.71.11) - - React-RCTActionSheet (0.71.11): - - React-Core/RCTActionSheetHeaders (= 0.71.11) - - React-RCTAnimation (0.71.11): + - React-perflogger (0.71.15) + - React-RCTActionSheet (0.71.15): + - React-Core/RCTActionSheetHeaders (= 0.71.15) + - React-RCTAnimation (0.71.15): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.11) - - React-Codegen (= 0.71.11) - - React-Core/RCTAnimationHeaders (= 0.71.11) - - React-jsi (= 0.71.11) - - ReactCommon/turbomodule/core (= 0.71.11) - - React-RCTAppDelegate (0.71.11): + - RCTTypeSafety (= 0.71.15) + - React-Codegen (= 0.71.15) + - React-Core/RCTAnimationHeaders (= 0.71.15) + - React-jsi (= 0.71.15) + - ReactCommon/turbomodule/core (= 0.71.15) + - React-RCTAppDelegate (0.71.15): - RCT-Folly - RCTRequired - RCTTypeSafety - React-Core - ReactCommon/turbomodule/core - - React-RCTBlob (0.71.11): + - React-RCTBlob (0.71.15): - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.71.11) - - React-Core/RCTBlobHeaders (= 0.71.11) - - React-Core/RCTWebSocket (= 0.71.11) - - React-jsi (= 0.71.11) - - React-RCTNetwork (= 0.71.11) - - ReactCommon/turbomodule/core (= 0.71.11) - - React-RCTImage (0.71.11): + - React-Codegen (= 0.71.15) + - React-Core/RCTBlobHeaders (= 0.71.15) + - React-Core/RCTWebSocket (= 0.71.15) + - React-jsi (= 0.71.15) + - React-RCTNetwork (= 0.71.15) + - ReactCommon/turbomodule/core (= 0.71.15) + - React-RCTImage (0.71.15): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.11) - - React-Codegen (= 0.71.11) - - React-Core/RCTImageHeaders (= 0.71.11) - - React-jsi (= 0.71.11) - - React-RCTNetwork (= 0.71.11) - - ReactCommon/turbomodule/core (= 0.71.11) - - React-RCTLinking (0.71.11): - - React-Codegen (= 0.71.11) - - React-Core/RCTLinkingHeaders (= 0.71.11) - - React-jsi (= 0.71.11) - - ReactCommon/turbomodule/core (= 0.71.11) - - React-RCTNetwork (0.71.11): + - RCTTypeSafety (= 0.71.15) + - React-Codegen (= 0.71.15) + - React-Core/RCTImageHeaders (= 0.71.15) + - React-jsi (= 0.71.15) + - React-RCTNetwork (= 0.71.15) + - ReactCommon/turbomodule/core (= 0.71.15) + - React-RCTLinking (0.71.15): + - React-Codegen (= 0.71.15) + - React-Core/RCTLinkingHeaders (= 0.71.15) + - React-jsi (= 0.71.15) + - ReactCommon/turbomodule/core (= 0.71.15) + - React-RCTNetwork (0.71.15): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.11) - - React-Codegen (= 0.71.11) - - React-Core/RCTNetworkHeaders (= 0.71.11) - - React-jsi (= 0.71.11) - - ReactCommon/turbomodule/core (= 0.71.11) - - React-RCTSettings (0.71.11): + - RCTTypeSafety (= 0.71.15) + - React-Codegen (= 0.71.15) + - React-Core/RCTNetworkHeaders (= 0.71.15) + - React-jsi (= 0.71.15) + - ReactCommon/turbomodule/core (= 0.71.15) + - React-RCTSettings (0.71.15): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.11) - - React-Codegen (= 0.71.11) - - React-Core/RCTSettingsHeaders (= 0.71.11) - - React-jsi (= 0.71.11) - - ReactCommon/turbomodule/core (= 0.71.11) - - React-RCTText (0.71.11): - - React-Core/RCTTextHeaders (= 0.71.11) - - React-RCTVibration (0.71.11): + - RCTTypeSafety (= 0.71.15) + - React-Codegen (= 0.71.15) + - React-Core/RCTSettingsHeaders (= 0.71.15) + - React-jsi (= 0.71.15) + - ReactCommon/turbomodule/core (= 0.71.15) + - React-RCTText (0.71.15): + - React-Core/RCTTextHeaders (= 0.71.15) + - React-RCTVibration (0.71.15): - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.71.11) - - React-Core/RCTVibrationHeaders (= 0.71.11) - - React-jsi (= 0.71.11) - - ReactCommon/turbomodule/core (= 0.71.11) - - React-runtimeexecutor (0.71.11): - - React-jsi (= 0.71.11) - - ReactCommon/turbomodule/bridging (0.71.11): + - React-Codegen (= 0.71.15) + - React-Core/RCTVibrationHeaders (= 0.71.15) + - React-jsi (= 0.71.15) + - ReactCommon/turbomodule/core (= 0.71.15) + - React-runtimeexecutor (0.71.15): + - React-jsi (= 0.71.15) + - ReactCommon/turbomodule/bridging (0.71.15): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.71.11) - - React-Core (= 0.71.11) - - React-cxxreact (= 0.71.11) - - React-jsi (= 0.71.11) - - React-logger (= 0.71.11) - - React-perflogger (= 0.71.11) - - ReactCommon/turbomodule/core (0.71.11): + - React-callinvoker (= 0.71.15) + - React-Core (= 0.71.15) + - React-cxxreact (= 0.71.15) + - React-jsi (= 0.71.15) + - React-logger (= 0.71.15) + - React-perflogger (= 0.71.15) + - ReactCommon/turbomodule/core (0.71.15): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.71.11) - - React-Core (= 0.71.11) - - React-cxxreact (= 0.71.11) - - React-jsi (= 0.71.11) - - React-logger (= 0.71.11) - - React-perflogger (= 0.71.11) + - React-callinvoker (= 0.71.15) + - React-Core (= 0.71.15) + - React-cxxreact (= 0.71.15) + - React-jsi (= 0.71.15) + - React-logger (= 0.71.15) + - React-perflogger (= 0.71.15) - RNCClipboard (1.11.2): - React-Core - RNCMaskedView (0.2.9): @@ -611,27 +611,27 @@ SPEC CHECKSUMS: boost: 57d2868c099736d80fcd648bf211b4431e51a558 BVLinearGradient: 1f859bad5f9ead6a57ac43dc42bfc4c587192618 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - FBLazyVector: c511d4cd0210f416cb5c289bd5ae6b36d909b048 - FBReactNativeSpec: 5e9099c564036150bf3660dffc84448392c1a2fc + FBLazyVector: d06bbe89e3a89ee90c4deab1c84bf306ffa5ed37 + FBReactNativeSpec: f4d210fbbae3494993fa38f4d5045de19ad172c7 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b hermes-engine: 34c863b446d0135b85a6536fa5fd89f48196f848 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 - RCTRequired: f6187ec763637e6a57f5728dd9a3bdabc6d6b4e0 - RCTTypeSafety: a01aca2dd3b27fa422d5239252ad38e54e958750 - React: 741b4f5187e7a2137b69c88e65f940ba40600b4b - React-callinvoker: 72ba74b2d5d690c497631191ae6eeca0c043d9cf - React-Codegen: 8a7cda1633e4940de8a710f6bf5cae5dd673546e - React-Core: 72bb19702c465b6451a40501a2879532bec9acee - React-CoreModules: ffd19b082fc36b9b463fedf30955138b5426c053 - React-cxxreact: 8b3dd87e3b8ea96dd4ad5c7bac8f31f1cc3da97f - React-hermes: be95942c3f47fc032da1387360413f00dae0ea68 - React-jsi: 9978e2a64c2a4371b40e109f4ef30a33deaa9bcb - React-jsiexecutor: 18b5b33c5f2687a784a61bc8176611b73524ae77 - React-jsinspector: b6ed4cb3ffa27a041cd440300503dc512b761450 - React-logger: 186dd536128ae5924bc38ed70932c00aa740cd5b + RCTRequired: 4ce9da4fa2f8a134f62c70e4ab9d971b9d640f41 + RCTTypeSafety: decfec2884f0c523f799600d2b6105cdc15e13db + React: ca22a0b3f199b6acac95416ef7eb96cc84a55103 + React-callinvoker: 366d4449bc2901e89da3f30c6d203c491d060350 + React-Codegen: f85e26699043bc9015552c21bbf0da24d9e8c6ad + React-Core: 169395096d2c22872e22cd74e3694a4b041cce76 + React-CoreModules: 8c2a970d9fd778e6016b9297f2c2dddbe78b04ec + React-cxxreact: e61b3e92887bb8fc241326b83d667953ff732923 + React-hermes: 476b93736605b457d1bc390336656c94460205b7 + React-jsi: 9fe8766963aa3aea90bbd477ea63255eb847d404 + React-jsiexecutor: e0cde8d57cee18097b3d2b1bf6404ad25dd8d33b + React-jsinspector: 4ade58a6a355d97a53f847543b14f4cb5033cb70 + React-logger: 56699550750c013096a11dce3bc996e7dd583835 react-native-blur: 14c75aa19da8734c1656d5b6ca5adb859b2c26aa react-native-get-random-values: 2869478c635a6e33080b917ce33f2803cb69262c react-native-safe-area: e3de9e959c7baaae8db9bcb015d99ed1da25c9d5 @@ -639,19 +639,19 @@ SPEC CHECKSUMS: react-native-slider: fe24b59d1cdf9ce3adc7dc53f87cfdde8da9498a react-native-video: acfe36130a7476cf82eb543c7ee2b9e96794ff9e react-native-webview: 07834cb4097a1c1785ac8ac13126fa03b24ae81c - React-perflogger: e706562ab7eb8eb590aa83a224d26fa13963d7f2 - React-RCTActionSheet: 57d4bd98122f557479a3359ad5dad8e109e20c5a - React-RCTAnimation: ccf3ef00101ea74bda73a045d79a658b36728a60 - React-RCTAppDelegate: d0c28a35c65e9a0aef287ac0dafe1b71b1ac180c - React-RCTBlob: 1700b92ece4357af0a49719c9638185ad2902e95 - React-RCTImage: f2e4904566ccccaa4b704170fcc5ae144ca347bf - React-RCTLinking: 52a3740e3651e30aa11dff5a6debed7395dd8169 - React-RCTNetwork: ea0976f2b3ffc7877cd7784e351dc460adf87b12 - React-RCTSettings: ed5ac992b23e25c65c3cc31f11b5c940ae5e3e60 - React-RCTText: c9dfc6722621d56332b4f3a19ac38105e7504145 - React-RCTVibration: f09f08de63e4122deb32506e20ca4cae6e4e14c1 - React-runtimeexecutor: 4817d63dbc9d658f8dc0ec56bd9b83ce531129f0 - ReactCommon: 864169d79e7fb2e846ad1257a2afd7ed846d6375 + React-perflogger: 0cc42978a483a47f3696171dac2e7033936fc82d + React-RCTActionSheet: ea922b476d24f6d40b8e02ac3228412bd3637468 + React-RCTAnimation: 7be2c148398eaa5beac950b2b5ec7102389ec3ad + React-RCTAppDelegate: c7bf369749348d9358035c2dcebd9aa4f3f55031 + React-RCTBlob: c1e1e53b334f36b3311c3206036c99f4e5406cdf + React-RCTImage: 4a2cd71dd8c1954cfab50e244b269d47bdcc76da + React-RCTLinking: c8ff9fe7f5741afc05894c7da4a0d2bd1458f247 + React-RCTNetwork: 93c329744baa8c04057a5a29b790618e0c2a6a68 + React-RCTSettings: bcd09cd3ee26967bdfbc8af174404b8ffabfbc3c + React-RCTText: c525eb78cfe9489f130fa69004ff081a5ae33e06 + React-RCTVibration: a97783e3645ddf852e34da2e015656e309f3a083 + React-runtimeexecutor: 8f2ddd9db7874ec7de84f5c55d73aeaaf82908e2 + ReactCommon: a32922c53c10b15a65726536f747837855a52901 RNCClipboard: 6069fd5957cf3750fa03145f8a5d095ec96052fd RNCMaskedView: 94f0f1558fae47042743b31916d5fff39266644b RNFastImage: 9407b5abc43452149a2f628107c64a7d11aa2948 @@ -663,7 +663,7 @@ SPEC CHECKSUMS: SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb - Yoga: f7decafdc5e8c125e6fa0da38a687e35238420fa + Yoga: 68c9c592c3e80ec37ff28db20eedb13d84aae5df PODFILE CHECKSUM: e9562063718a2c990efeba80fc1f8ab6b8e008ac diff --git a/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj b/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj index 35ff46f238..47085505bf 100644 --- a/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj +++ b/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj @@ -354,6 +354,15 @@ buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "c++17"; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION, + ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-Wl", + "-ld_classic", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../gutenberg/node_modules/react-native"; }; name = Debug; @@ -364,6 +373,15 @@ buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "c++17"; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION, + ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-Wl", + "-ld_classic", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../gutenberg/node_modules/react-native"; }; name = Release; From e767ad5d202f23d003544141016349f03227a5f1 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 9 Jan 2024 12:21:43 +0100 Subject: [PATCH 04/15] Update Gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 0456b3e96a..5684fe1493 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 0456b3e96a875c910417aedba903555687c538b9 +Subproject commit 5684fe14933dfff05b8f1ed70c1814a389a018fc From 452ee893d5a3934a8f913ae6c220f26cdc2acf47 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 16 Jan 2024 15:39:12 +0100 Subject: [PATCH 05/15] Update Gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 5684fe1493..6f8871fb1b 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 5684fe14933dfff05b8f1ed70c1814a389a018fc +Subproject commit 6f8871fb1be4acead8a390c0e5e4ff85fe35f1e9 From ddc6eb780d01c0b1db499c225cf4c1bb60c69f27 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 16 Jan 2024 15:39:58 +0100 Subject: [PATCH 06/15] Apply workaround in `Podfile` to address build failure The workaround solves the issue related to redefining `clockid_t` in the pod `RCT-Folly`. --- ios-xcframework/Podfile | 6 ++++++ ios-xcframework/Podfile.lock | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ios-xcframework/Podfile b/ios-xcframework/Podfile index 2ae228d8a0..7367211f41 100644 --- a/ios-xcframework/Podfile +++ b/ios-xcframework/Podfile @@ -74,6 +74,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 # diff --git a/ios-xcframework/Podfile.lock b/ios-xcframework/Podfile.lock index d9e01ffc9b..799c750eb6 100644 --- a/ios-xcframework/Podfile.lock +++ b/ios-xcframework/Podfile.lock @@ -665,6 +665,6 @@ SPEC CHECKSUMS: WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb Yoga: 68c9c592c3e80ec37ff28db20eedb13d84aae5df -PODFILE CHECKSUM: e9562063718a2c990efeba80fc1f8ab6b8e008ac +PODFILE CHECKSUM: 821c9828d4204317e78911e6bf747321d1721765 COCOAPODS: 1.13.0 From 124037214978ecb2639163e65b32bdbd5ae12955 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 16 Jan 2024 16:07:59 +0100 Subject: [PATCH 07/15] Generate third-party podspecs --- third-party-podspecs/RNReanimated.podspec.json | 1 - third-party-podspecs/React-jsc.podspec.json | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/third-party-podspecs/RNReanimated.podspec.json b/third-party-podspecs/RNReanimated.podspec.json index f17c581ba7..76ed6fd7af 100644 --- a/third-party-podspecs/RNReanimated.podspec.json +++ b/third-party-podspecs/RNReanimated.podspec.json @@ -60,7 +60,6 @@ "Yoga": [], "DoubleConversion": [], "glog": [], - "React-jsc": [], "React-callinvoker": [] }, "__WARNING!__": "This file is autogenerated by generate-podspecs.sh script. Do not modify manually. Re-run the script if necessary." diff --git a/third-party-podspecs/React-jsc.podspec.json b/third-party-podspecs/React-jsc.podspec.json index c5a7fb17aa..97c22775b1 100644 --- a/third-party-podspecs/React-jsc.podspec.json +++ b/third-party-podspecs/React-jsc.podspec.json @@ -1,6 +1,6 @@ { "name": "React-jsc", - "version": "0.71.11", + "version": "0.71.15", "summary": "JavaScriptCore engine for React Native", "homepage": "https://reactnative.dev/", "license": "MIT", @@ -10,14 +10,14 @@ }, "source": { "git": "https://github.com/facebook/react-native.git", - "tag": "v0.71.11" + "tag": "v0.71.15" }, "source_files": "JSCRuntime.{cpp,h}", "exclude_files": "**/test/*", "frameworks": "JavaScriptCore", "dependencies": { "React-jsi": [ - "0.71.11" + "0.71.15" ] }, "subspecs": [ From 7d493b10ba95a5e41b9a3c9cb1d7a95a611c063e Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 16 Jan 2024 16:10:05 +0100 Subject: [PATCH 08/15] Update `Podfile.lock` --- ios-xcframework/Podfile.lock | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/ios-xcframework/Podfile.lock b/ios-xcframework/Podfile.lock index 799c750eb6..3cf0df5b83 100644 --- a/ios-xcframework/Podfile.lock +++ b/ios-xcframework/Podfile.lock @@ -13,19 +13,22 @@ PODS: - ReactCommon/turbomodule/core (= 0.71.15) - fmt (6.2.1) - glog (0.3.5) - - hermes-engine (0.71.11): - - hermes-engine/Pre-built (= 0.71.11) - - hermes-engine/Pre-built (0.71.11) + - hermes-engine (0.71.15): + - hermes-engine/Pre-built (= 0.71.15) + - hermes-engine/Pre-built (0.71.15) - libevent (2.1.12) - - libwebp (1.2.4): - - libwebp/demux (= 1.2.4) - - libwebp/mux (= 1.2.4) - - libwebp/webp (= 1.2.4) - - libwebp/demux (1.2.4): + - libwebp (1.3.2): + - libwebp/demux (= 1.3.2) + - libwebp/mux (= 1.3.2) + - libwebp/sharpyuv (= 1.3.2) + - libwebp/webp (= 1.3.2) + - libwebp/demux (1.3.2): - libwebp/webp - - libwebp/mux (1.2.4): + - libwebp/mux (1.3.2): - libwebp/demux - - libwebp/webp (1.2.4) + - libwebp/sharpyuv (1.3.2) + - libwebp/webp (1.3.2): + - libwebp/sharpyuv - RCT-Folly (2021.07.22.00): - boost - DoubleConversion @@ -604,20 +607,20 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: RNReanimated: - :commit: 310ff71ea469f7cf8458d1dd7c3b1988a3d2e802 + :commit: 9172a88e9e8be931582b58b0b91c363122781713 :git: https://github.com/wordpress-mobile/react-native-reanimated SPEC CHECKSUMS: - boost: 57d2868c099736d80fcd648bf211b4431e51a558 + boost: 7dcd2de282d72e344012f7d6564d024930a6a440 BVLinearGradient: 1f859bad5f9ead6a57ac43dc42bfc4c587192618 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 FBLazyVector: d06bbe89e3a89ee90c4deab1c84bf306ffa5ed37 FBReactNativeSpec: f4d210fbbae3494993fa38f4d5045de19ad172c7 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b - hermes-engine: 34c863b446d0135b85a6536fa5fd89f48196f848 + hermes-engine: 04437e4291ede4af0c76c25e7efd0eacb8fd25e5 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef + libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCTRequired: 4ce9da4fa2f8a134f62c70e4ab9d971b9d640f41 RCTTypeSafety: decfec2884f0c523f799600d2b6105cdc15e13db From 6f8c346ef8a182d8ece2c4f041392f7f8962f9e4 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 16 Jan 2024 19:14:50 +0100 Subject: [PATCH 09/15] Update Gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 6f8871fb1b..ed37f8e711 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 6f8871fb1be4acead8a390c0e5e4ff85fe35f1e9 +Subproject commit ed37f8e7117e93ca298843b1209831d510574e94 From 29e2d2d055491a69bd5b0b300c74bbad8b7eeec5 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Wed, 17 Jan 2024 16:00:53 +0100 Subject: [PATCH 10/15] Update Gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index ed37f8e711..1acf93e292 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit ed37f8e7117e93ca298843b1209831d510574e94 +Subproject commit 1acf93e292cb9569810267b73db1cf4d830360b8 From d04c9c7097229f4bc26e19b5bccd6bd2e22577fa Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Wed, 17 Jan 2024 16:03:57 +0100 Subject: [PATCH 11/15] Fix XPath locators for Android E2E tests --- .../gutenberg-editor-functionality-test-1-visual.test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/__device-tests__/gutenberg-editor-functionality-test-1-visual.test.js b/__device-tests__/gutenberg-editor-functionality-test-1-visual.test.js index e7df653232..48b3fefad7 100644 --- 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, From 8d54041cfff93e58ae6d4217dcebfe446a32cb87 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Wed, 17 Jan 2024 16:04:52 +0100 Subject: [PATCH 12/15] Increase delay when traversing blocks in `should traverse up and down nested blocks` E2E test --- .../gutenberg-editor-functionality-test-4-visual.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__device-tests__/gutenberg-editor-functionality-test-4-visual.test.js b/__device-tests__/gutenberg-editor-functionality-test-4-visual.test.js index e6740f2b05..5cacfc0f89 100644 --- 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(); From 640739560c539d6e53d224f558123fe4756d9c65 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 30 Jan 2024 11:27:31 +0100 Subject: [PATCH 13/15] Update Gutenberg ref with merge commit --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 1acf93e292..90e9bc9566 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 1acf93e292cb9569810267b73db1cf4d830360b8 +Subproject commit 90e9bc9566f470748b28114b55517019d0a93399 From a86b0f7af1a27f65c9b0f97a3fb90b981e2b1d1c Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 30 Jan 2024 11:28:49 +0100 Subject: [PATCH 14/15] Update release notes --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 7eb2e0b240..36d705f2db 100644 --- 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 --- From 56f08df65c3d330a8afd3a6a8ab2f335434feccd Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 30 Jan 2024 11:30:15 +0100 Subject: [PATCH 15/15] Update Gutenberg ref with merge commit --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 9a049b6d56..90e9bc9566 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 9a049b6d563ef358b647c14a926f6ab1fb62d5ae +Subproject commit 90e9bc9566f470748b28114b55517019d0a93399