From 472e3cec8a67a3c0ab3b0b1ab5dbb3e7f20ec506 Mon Sep 17 00:00:00 2001 From: Chris Bobbe Date: Fri, 28 Apr 2023 08:40:10 -0400 Subject: [PATCH] deps: Upgrade to RN v0.68.7, from v0.68.5 Aimed at fixing #5729. This small upgrade is nice and easy; the upgrade helper doesn't show any other changes we need to make: https://react-native-community.github.io/upgrade-helper/?from=0.68.5&to=0.68.7 Release notes: https://github.com/facebook/react-native/releases/tag/v0.68.7 Incidentally we also get facebook/react-native@c3ad8ec7e in this release, which makes the change we've been patching in with `patch-package` to fix an Xcode build failure, so we can remove our `patch-package` patch. Tested on an iOS simulator (iPhone 14 Pro running iOS 16.4), and on the office Android device (Samsung Galaxy S9 running Android 9). We haven't managed to reproduce #5729 ourselves so I can't report an observation of how this upgrade affects that issue. But upstream discussion is promising, and from a quick look nothing seems to break. Fixes: #5729 --- ios/Podfile.lock | 430 +++++++++++++++--------------- package.json | 2 +- patches/react-native+0.68.5.patch | 13 - yarn.lock | 8 +- 4 files changed, 220 insertions(+), 233 deletions(-) delete mode 100644 patches/react-native+0.68.5.patch diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e7a91a88d09..a1548fc2a96 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -30,14 +30,14 @@ PODS: - React-Core - EXSQLite (10.2.0): - ExpoModulesCore - - FBLazyVector (0.68.5) - - FBReactNativeSpec (0.68.5): + - FBLazyVector (0.68.7) + - FBReactNativeSpec (0.68.7): - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.68.5) - - RCTTypeSafety (= 0.68.5) - - React-Core (= 0.68.5) - - React-jsi (= 0.68.5) - - ReactCommon/turbomodule/core (= 0.68.5) + - RCTRequired (= 0.68.7) + - RCTTypeSafety (= 0.68.7) + - React-Core (= 0.68.7) + - React-jsi (= 0.68.7) + - ReactCommon/turbomodule/core (= 0.68.7) - Flipper (0.125.0): - Flipper-Folly (~> 2.6) - Flipper-RSocket (~> 1.4) @@ -114,201 +114,201 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - RCTRequired (0.68.5) - - RCTTypeSafety (0.68.5): - - FBLazyVector (= 0.68.5) + - RCTRequired (0.68.7) + - RCTTypeSafety (0.68.7): + - FBLazyVector (= 0.68.7) - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.68.5) - - React-Core (= 0.68.5) - - React (0.68.5): - - React-Core (= 0.68.5) - - React-Core/DevSupport (= 0.68.5) - - React-Core/RCTWebSocket (= 0.68.5) - - React-RCTActionSheet (= 0.68.5) - - React-RCTAnimation (= 0.68.5) - - React-RCTBlob (= 0.68.5) - - React-RCTImage (= 0.68.5) - - React-RCTLinking (= 0.68.5) - - React-RCTNetwork (= 0.68.5) - - React-RCTSettings (= 0.68.5) - - React-RCTText (= 0.68.5) - - React-RCTVibration (= 0.68.5) - - React-callinvoker (0.68.5) - - React-Codegen (0.68.5): - - FBReactNativeSpec (= 0.68.5) + - RCTRequired (= 0.68.7) + - React-Core (= 0.68.7) + - React (0.68.7): + - React-Core (= 0.68.7) + - React-Core/DevSupport (= 0.68.7) + - React-Core/RCTWebSocket (= 0.68.7) + - React-RCTActionSheet (= 0.68.7) + - React-RCTAnimation (= 0.68.7) + - React-RCTBlob (= 0.68.7) + - React-RCTImage (= 0.68.7) + - React-RCTLinking (= 0.68.7) + - React-RCTNetwork (= 0.68.7) + - React-RCTSettings (= 0.68.7) + - React-RCTText (= 0.68.7) + - React-RCTVibration (= 0.68.7) + - React-callinvoker (0.68.7) + - React-Codegen (0.68.7): + - FBReactNativeSpec (= 0.68.7) - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.68.5) - - RCTTypeSafety (= 0.68.5) - - React-Core (= 0.68.5) - - React-jsi (= 0.68.5) - - React-jsiexecutor (= 0.68.5) - - ReactCommon/turbomodule/core (= 0.68.5) - - React-Core (0.68.5): + - RCTRequired (= 0.68.7) + - RCTTypeSafety (= 0.68.7) + - React-Core (= 0.68.7) + - React-jsi (= 0.68.7) + - React-jsiexecutor (= 0.68.7) + - ReactCommon/turbomodule/core (= 0.68.7) + - React-Core (0.68.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.68.5) - - React-cxxreact (= 0.68.5) - - React-jsi (= 0.68.5) - - React-jsiexecutor (= 0.68.5) - - React-perflogger (= 0.68.5) + - React-Core/Default (= 0.68.7) + - React-cxxreact (= 0.68.7) + - React-jsi (= 0.68.7) + - React-jsiexecutor (= 0.68.7) + - React-perflogger (= 0.68.7) - Yoga - - React-Core/CoreModulesHeaders (0.68.5): + - React-Core/CoreModulesHeaders (0.68.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.5) - - React-jsi (= 0.68.5) - - React-jsiexecutor (= 0.68.5) - - React-perflogger (= 0.68.5) + - React-cxxreact (= 0.68.7) + - React-jsi (= 0.68.7) + - React-jsiexecutor (= 0.68.7) + - React-perflogger (= 0.68.7) - Yoga - - React-Core/Default (0.68.5): + - React-Core/Default (0.68.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-cxxreact (= 0.68.5) - - React-jsi (= 0.68.5) - - React-jsiexecutor (= 0.68.5) - - React-perflogger (= 0.68.5) + - React-cxxreact (= 0.68.7) + - React-jsi (= 0.68.7) + - React-jsiexecutor (= 0.68.7) + - React-perflogger (= 0.68.7) - Yoga - - React-Core/DevSupport (0.68.5): + - React-Core/DevSupport (0.68.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.68.5) - - React-Core/RCTWebSocket (= 0.68.5) - - React-cxxreact (= 0.68.5) - - React-jsi (= 0.68.5) - - React-jsiexecutor (= 0.68.5) - - React-jsinspector (= 0.68.5) - - React-perflogger (= 0.68.5) + - React-Core/Default (= 0.68.7) + - React-Core/RCTWebSocket (= 0.68.7) + - React-cxxreact (= 0.68.7) + - React-jsi (= 0.68.7) + - React-jsiexecutor (= 0.68.7) + - React-jsinspector (= 0.68.7) + - React-perflogger (= 0.68.7) - Yoga - - React-Core/RCTActionSheetHeaders (0.68.5): + - React-Core/RCTActionSheetHeaders (0.68.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.5) - - React-jsi (= 0.68.5) - - React-jsiexecutor (= 0.68.5) - - React-perflogger (= 0.68.5) + - React-cxxreact (= 0.68.7) + - React-jsi (= 0.68.7) + - React-jsiexecutor (= 0.68.7) + - React-perflogger (= 0.68.7) - Yoga - - React-Core/RCTAnimationHeaders (0.68.5): + - React-Core/RCTAnimationHeaders (0.68.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.5) - - React-jsi (= 0.68.5) - - React-jsiexecutor (= 0.68.5) - - React-perflogger (= 0.68.5) + - React-cxxreact (= 0.68.7) + - React-jsi (= 0.68.7) + - React-jsiexecutor (= 0.68.7) + - React-perflogger (= 0.68.7) - Yoga - - React-Core/RCTBlobHeaders (0.68.5): + - React-Core/RCTBlobHeaders (0.68.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.5) - - React-jsi (= 0.68.5) - - React-jsiexecutor (= 0.68.5) - - React-perflogger (= 0.68.5) + - React-cxxreact (= 0.68.7) + - React-jsi (= 0.68.7) + - React-jsiexecutor (= 0.68.7) + - React-perflogger (= 0.68.7) - Yoga - - React-Core/RCTImageHeaders (0.68.5): + - React-Core/RCTImageHeaders (0.68.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.5) - - React-jsi (= 0.68.5) - - React-jsiexecutor (= 0.68.5) - - React-perflogger (= 0.68.5) + - React-cxxreact (= 0.68.7) + - React-jsi (= 0.68.7) + - React-jsiexecutor (= 0.68.7) + - React-perflogger (= 0.68.7) - Yoga - - React-Core/RCTLinkingHeaders (0.68.5): + - React-Core/RCTLinkingHeaders (0.68.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.5) - - React-jsi (= 0.68.5) - - React-jsiexecutor (= 0.68.5) - - React-perflogger (= 0.68.5) + - React-cxxreact (= 0.68.7) + - React-jsi (= 0.68.7) + - React-jsiexecutor (= 0.68.7) + - React-perflogger (= 0.68.7) - Yoga - - React-Core/RCTNetworkHeaders (0.68.5): + - React-Core/RCTNetworkHeaders (0.68.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.5) - - React-jsi (= 0.68.5) - - React-jsiexecutor (= 0.68.5) - - React-perflogger (= 0.68.5) + - React-cxxreact (= 0.68.7) + - React-jsi (= 0.68.7) + - React-jsiexecutor (= 0.68.7) + - React-perflogger (= 0.68.7) - Yoga - - React-Core/RCTSettingsHeaders (0.68.5): + - React-Core/RCTSettingsHeaders (0.68.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.5) - - React-jsi (= 0.68.5) - - React-jsiexecutor (= 0.68.5) - - React-perflogger (= 0.68.5) + - React-cxxreact (= 0.68.7) + - React-jsi (= 0.68.7) + - React-jsiexecutor (= 0.68.7) + - React-perflogger (= 0.68.7) - Yoga - - React-Core/RCTTextHeaders (0.68.5): + - React-Core/RCTTextHeaders (0.68.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.5) - - React-jsi (= 0.68.5) - - React-jsiexecutor (= 0.68.5) - - React-perflogger (= 0.68.5) + - React-cxxreact (= 0.68.7) + - React-jsi (= 0.68.7) + - React-jsiexecutor (= 0.68.7) + - React-perflogger (= 0.68.7) - Yoga - - React-Core/RCTVibrationHeaders (0.68.5): + - React-Core/RCTVibrationHeaders (0.68.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.5) - - React-jsi (= 0.68.5) - - React-jsiexecutor (= 0.68.5) - - React-perflogger (= 0.68.5) + - React-cxxreact (= 0.68.7) + - React-jsi (= 0.68.7) + - React-jsiexecutor (= 0.68.7) + - React-perflogger (= 0.68.7) - Yoga - - React-Core/RCTWebSocket (0.68.5): + - React-Core/RCTWebSocket (0.68.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.68.5) - - React-cxxreact (= 0.68.5) - - React-jsi (= 0.68.5) - - React-jsiexecutor (= 0.68.5) - - React-perflogger (= 0.68.5) + - React-Core/Default (= 0.68.7) + - React-cxxreact (= 0.68.7) + - React-jsi (= 0.68.7) + - React-jsiexecutor (= 0.68.7) + - React-perflogger (= 0.68.7) - Yoga - - React-CoreModules (0.68.5): + - React-CoreModules (0.68.7): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.5) - - React-Codegen (= 0.68.5) - - React-Core/CoreModulesHeaders (= 0.68.5) - - React-jsi (= 0.68.5) - - React-RCTImage (= 0.68.5) - - ReactCommon/turbomodule/core (= 0.68.5) - - React-cxxreact (0.68.5): + - RCTTypeSafety (= 0.68.7) + - React-Codegen (= 0.68.7) + - React-Core/CoreModulesHeaders (= 0.68.7) + - React-jsi (= 0.68.7) + - React-RCTImage (= 0.68.7) + - ReactCommon/turbomodule/core (= 0.68.7) + - React-cxxreact (0.68.7): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.68.5) - - React-jsi (= 0.68.5) - - React-jsinspector (= 0.68.5) - - React-logger (= 0.68.5) - - React-perflogger (= 0.68.5) - - React-runtimeexecutor (= 0.68.5) - - React-jsi (0.68.5): + - React-callinvoker (= 0.68.7) + - React-jsi (= 0.68.7) + - React-jsinspector (= 0.68.7) + - React-logger (= 0.68.7) + - React-perflogger (= 0.68.7) + - React-runtimeexecutor (= 0.68.7) + - React-jsi (0.68.7): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-jsi/Default (= 0.68.5) - - React-jsi/Default (0.68.5): + - React-jsi/Default (= 0.68.7) + - React-jsi/Default (0.68.7): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-jsiexecutor (0.68.5): + - React-jsiexecutor (0.68.7): - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-cxxreact (= 0.68.5) - - React-jsi (= 0.68.5) - - React-perflogger (= 0.68.5) - - React-jsinspector (0.68.5) - - React-logger (0.68.5): + - React-cxxreact (= 0.68.7) + - React-jsi (= 0.68.7) + - React-perflogger (= 0.68.7) + - React-jsinspector (0.68.7) + - React-logger (0.68.7): - glog - react-native-cameraroll (5.2.4): - React-Core @@ -331,71 +331,71 @@ PODS: - Toast (~> 4.0.0) - react-native-webview (11.26.1): - React-Core - - React-perflogger (0.68.5) - - React-RCTActionSheet (0.68.5): - - React-Core/RCTActionSheetHeaders (= 0.68.5) - - React-RCTAnimation (0.68.5): + - React-perflogger (0.68.7) + - React-RCTActionSheet (0.68.7): + - React-Core/RCTActionSheetHeaders (= 0.68.7) + - React-RCTAnimation (0.68.7): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.5) - - React-Codegen (= 0.68.5) - - React-Core/RCTAnimationHeaders (= 0.68.5) - - React-jsi (= 0.68.5) - - ReactCommon/turbomodule/core (= 0.68.5) - - React-RCTBlob (0.68.5): + - RCTTypeSafety (= 0.68.7) + - React-Codegen (= 0.68.7) + - React-Core/RCTAnimationHeaders (= 0.68.7) + - React-jsi (= 0.68.7) + - ReactCommon/turbomodule/core (= 0.68.7) + - React-RCTBlob (0.68.7): - RCT-Folly (= 2021.06.28.00-v2) - - React-Codegen (= 0.68.5) - - React-Core/RCTBlobHeaders (= 0.68.5) - - React-Core/RCTWebSocket (= 0.68.5) - - React-jsi (= 0.68.5) - - React-RCTNetwork (= 0.68.5) - - ReactCommon/turbomodule/core (= 0.68.5) - - React-RCTImage (0.68.5): + - React-Codegen (= 0.68.7) + - React-Core/RCTBlobHeaders (= 0.68.7) + - React-Core/RCTWebSocket (= 0.68.7) + - React-jsi (= 0.68.7) + - React-RCTNetwork (= 0.68.7) + - ReactCommon/turbomodule/core (= 0.68.7) + - React-RCTImage (0.68.7): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.5) - - React-Codegen (= 0.68.5) - - React-Core/RCTImageHeaders (= 0.68.5) - - React-jsi (= 0.68.5) - - React-RCTNetwork (= 0.68.5) - - ReactCommon/turbomodule/core (= 0.68.5) - - React-RCTLinking (0.68.5): - - React-Codegen (= 0.68.5) - - React-Core/RCTLinkingHeaders (= 0.68.5) - - React-jsi (= 0.68.5) - - ReactCommon/turbomodule/core (= 0.68.5) - - React-RCTNetwork (0.68.5): + - RCTTypeSafety (= 0.68.7) + - React-Codegen (= 0.68.7) + - React-Core/RCTImageHeaders (= 0.68.7) + - React-jsi (= 0.68.7) + - React-RCTNetwork (= 0.68.7) + - ReactCommon/turbomodule/core (= 0.68.7) + - React-RCTLinking (0.68.7): + - React-Codegen (= 0.68.7) + - React-Core/RCTLinkingHeaders (= 0.68.7) + - React-jsi (= 0.68.7) + - ReactCommon/turbomodule/core (= 0.68.7) + - React-RCTNetwork (0.68.7): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.5) - - React-Codegen (= 0.68.5) - - React-Core/RCTNetworkHeaders (= 0.68.5) - - React-jsi (= 0.68.5) - - ReactCommon/turbomodule/core (= 0.68.5) - - React-RCTSettings (0.68.5): + - RCTTypeSafety (= 0.68.7) + - React-Codegen (= 0.68.7) + - React-Core/RCTNetworkHeaders (= 0.68.7) + - React-jsi (= 0.68.7) + - ReactCommon/turbomodule/core (= 0.68.7) + - React-RCTSettings (0.68.7): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.5) - - React-Codegen (= 0.68.5) - - React-Core/RCTSettingsHeaders (= 0.68.5) - - React-jsi (= 0.68.5) - - ReactCommon/turbomodule/core (= 0.68.5) - - React-RCTText (0.68.5): - - React-Core/RCTTextHeaders (= 0.68.5) - - React-RCTVibration (0.68.5): + - RCTTypeSafety (= 0.68.7) + - React-Codegen (= 0.68.7) + - React-Core/RCTSettingsHeaders (= 0.68.7) + - React-jsi (= 0.68.7) + - ReactCommon/turbomodule/core (= 0.68.7) + - React-RCTText (0.68.7): + - React-Core/RCTTextHeaders (= 0.68.7) + - React-RCTVibration (0.68.7): - RCT-Folly (= 2021.06.28.00-v2) - - React-Codegen (= 0.68.5) - - React-Core/RCTVibrationHeaders (= 0.68.5) - - React-jsi (= 0.68.5) - - ReactCommon/turbomodule/core (= 0.68.5) - - React-runtimeexecutor (0.68.5): - - React-jsi (= 0.68.5) - - ReactCommon/turbomodule/core (0.68.5): + - React-Codegen (= 0.68.7) + - React-Core/RCTVibrationHeaders (= 0.68.7) + - React-jsi (= 0.68.7) + - ReactCommon/turbomodule/core (= 0.68.7) + - React-runtimeexecutor (0.68.7): + - React-jsi (= 0.68.7) + - ReactCommon/turbomodule/core (0.68.7): - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.68.5) - - React-Core (= 0.68.5) - - React-cxxreact (= 0.68.5) - - React-jsi (= 0.68.5) - - React-logger (= 0.68.5) - - React-perflogger (= 0.68.5) + - React-callinvoker (= 0.68.7) + - React-Core (= 0.68.7) + - React-cxxreact (= 0.68.7) + - React-jsi (= 0.68.7) + - React-logger (= 0.68.7) + - React-perflogger (= 0.68.7) - rn-fetch-blob (0.11.2): - React-Core - RNCAsyncStorage (1.17.12): @@ -705,8 +705,8 @@ SPEC CHECKSUMS: ExpoWebBrowser: 4b5f9633e5f169dc948587cb6d26d2d1d1406187 EXScreenOrientation: e3c072fb0add472a3037482ea43ccbade9b88a25 EXSQLite: 2b9accd925438293f9f39e0a57a08cca13bdffb2 - FBLazyVector: 2b47ff52037bd9ae07cc9b051c9975797814b736 - FBReactNativeSpec: 0e0d384ef17a33b385f13f0c7f97702c7cd17858 + FBLazyVector: 63b89dc85804d5817261f56dc4cfb43a9b6d57f5 + FBReactNativeSpec: 1fa200a9862d9369a53b6fddbbfcdc22bab24062 Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 3d3d04a078d4f3a1b6c6916587f159dc11f232c4 @@ -721,18 +721,18 @@ SPEC CHECKSUMS: libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8 - RCTRequired: 0f06b6068f530932d10e1a01a5352fad4eaacb74 - RCTTypeSafety: b0ee81f10ef1b7d977605a2b266823dabd565e65 - React: 3becd12bd51ea8a43bdde7e09d0f40fba7820e03 - React-callinvoker: 11abfff50e6bf7a55b3a90b4dc2187f71f224593 - React-Codegen: f8946ce0768fb8e92e092e30944489c4b2955b2d - React-Core: 203cdb6ee2657b198d97d41031c249161060e6ca - React-CoreModules: 6eb0c06a4a223fde2cb6a8d0f44f58b67e808942 - React-cxxreact: afb0c6c07d19adbd850747fedeac20c6832d40b9 - React-jsi: 14d37a6db2af2c1a49f6f5c2e4ee667c364ae45c - React-jsiexecutor: 45c0496ca8cef6b02d9fa0274c25cf458fe91a56 - React-jsinspector: eb202e43b3879aba9a14f3f65788aec85d4e1ea9 - React-logger: 98f663b292a60967ebbc6d803ae96c1381183b6d + RCTRequired: 530916cd48c5f7cf1fc16966ad5ea01638ca4799 + RCTTypeSafety: 5fb4cb3080efd582e5563c3e9a0e459fc51396c5 + React: 097b19fbc7aecb3bd23de54b462d2051d7ca8a38 + React-callinvoker: 4f118545cf884f0d8fce5bcd6e1847147ea9cc05 + React-Codegen: 24e59be16f8ed24b3e49e5ff0738dad91988c760 + React-Core: 0b464d0bec18dde90fa819c4be14dbcbdbf3077f + React-CoreModules: 9bb7d5d5530d474cf8514e2dc8274af82a0bcf2f + React-cxxreact: 027e192b8008ba5c200163ab6ded55d134c839d5 + React-jsi: 9019a0a0b42e9eac6c1e8c251a8dffe65055a2f1 + React-jsiexecutor: 7c0bd030a84f2ec446fb104b7735af2f5ed11eea + React-jsinspector: cab4d37ebde480f84c79ac89568abbf76b916c3e + React-logger: b75b80500ea80457b2cf169427d66de986cdcb29 react-native-cameraroll: cb752fda6d5268f1646b4390bd5be1f27706b9a0 react-native-document-picker: 495c444c0c773c6e83a5d91165890ecb1c0a399a react-native-image-picker: 60f4246eb5bb7187fc15638a8c1f13abd3820695 @@ -741,18 +741,18 @@ SPEC CHECKSUMS: react-native-safe-area-context: 39c2d8be3328df5d437ac1700f4f3a4f75716acc react-native-simple-toast: 8ee5d23f0b92b935ab7434cdb65159ce12dfb4b7 react-native-webview: 9f111dfbcfc826084d6c507f569e5e03342ee1c1 - React-perflogger: 0458a87ea9a7342079e7a31b0d32b3734fb8415f - React-RCTActionSheet: 22538001ea2926dea001111dd2846c13a0730bc9 - React-RCTAnimation: 732ce66878d4aa151d56a0d142b1105aa12fd313 - React-RCTBlob: 9cb9e3e9a41d27be34aaf89b0e0f52c7ca415d57 - React-RCTImage: 6bd16627eb9c4bb79903c4cdec7c551266ee1a5b - React-RCTLinking: e9edfc8919c8fa9a3f3c7b34362811f58a2ebba4 - React-RCTNetwork: 880eccd21bbe2660a0b63da5ccba75c46eceeaa6 - React-RCTSettings: 8c85d8188c97d6c6bd470af6631a6c4555b79bb3 - React-RCTText: bbd275ee287730c5acbab1aadc0db39c25c5c64e - React-RCTVibration: 9819a3bf6230e4b2a99877c21268b0b2416157a1 - React-runtimeexecutor: b1f1995089b90696dbc2a7ffe0059a80db5c8eb1 - ReactCommon: 149e2c0acab9bac61378da0db5b2880a1b5ff59b + React-perflogger: 44436b315d757100a53dfb1ab6b77c58cb646d7d + React-RCTActionSheet: 1888a229684762c40cc96c7ff4716f809655dc09 + React-RCTAnimation: f05da175751867521d14b02ab4d3994a7b96f131 + React-RCTBlob: 792b966e48d599383d7a0753f75e8f2ff71be1ce + React-RCTImage: 065cf66546f625295efd36bce3a1806a9b93399c + React-RCTLinking: 8246290c072bd2d1f336792038d7ec4b91f9847a + React-RCTNetwork: 6b2331c74684fae61b1ef38f4510fe5da3de3f3a + React-RCTSettings: 2898e15b249b085f8b8c7401cfab71983a2d40da + React-RCTText: bd1da1cd805e0765e3ba9089a9fd807d4860a901 + React-RCTVibration: 2a4bf853281d4981ab471509102300d3c9e6c693 + React-runtimeexecutor: 18932e685b4893be88d1efc18f5f8ca1c9cd39d8 + ReactCommon: 29bb6fad3242e30e9d049bc9d592736fa3da9e50 rn-fetch-blob: f525a73a78df9ed5d35e67ea65e79d53c15255bc RNCAsyncStorage: 09fc8595e6d6f6d5abf16b23a56b257d9c6b7c5b RNCClipboard: 3f0451a8100393908bea5c5c5b16f96d45f30bfc @@ -766,7 +766,7 @@ SPEC CHECKSUMS: Sentry: 0c5cd63d714187b4a39c331c1f0eb04ba7868341 SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 - Yoga: c4d61225a466f250c35c1ee78d2d0b3d41fe661c + Yoga: 0bc4b37c3b8a345336ff601e2cf7d9704bab7e93 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: d89f3b1e89d483f9f945122b7b9ecb7c39b9fe75 diff --git a/package.json b/package.json index 53c4720a755..5df6b5980a6 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "lodash.uniq": "^4.5.0", "react": "17.0.2", "react-intl": "5.24.6", - "react-native": "0.68.5", + "react-native": "0.68.7", "react-native-document-picker": "^8.1.3", "react-native-gesture-handler": "^2.8.0", "react-native-image-picker": "4.10.3", diff --git a/patches/react-native+0.68.5.patch b/patches/react-native+0.68.5.patch deleted file mode 100644 index 8c923b6fb4a..00000000000 --- a/patches/react-native+0.68.5.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp b/node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp -index 9986279..20389d4 100644 ---- a/node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp -+++ b/node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp -@@ -2229,7 +2229,7 @@ static float YGDistributeFreeSpaceSecondPass( - depth, - generationCount); - node->setLayoutHadOverflow( -- node->getLayout().hadOverflow() | -+ node->getLayout().hadOverflow() || - currentRelativeChild->getLayout().hadOverflow()); - } - return deltaFreeSpace; diff --git a/yarn.lock b/yarn.lock index d3b72a2f0a0..b377dc7d326 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10478,10 +10478,10 @@ react-native-webview@^11.6.4: escape-string-regexp "2.0.0" invariant "2.2.4" -react-native@0.68.5: - version "0.68.5" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.68.5.tgz#8ba7389e00b757c59b6ea23bf38303d52367d155" - integrity sha512-t3kiQ/gumFV+0r/NRSIGtYxanjY4da0utFqHgkMcRPJVwXFWC0Fr8YiOeRGYO1dp8EfrSsOjtfWic/inqVYlbQ== +react-native@0.68.7: + version "0.68.7" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.68.7.tgz#9b179f909ac8640e369957696f98070ddf7c32e7" + integrity sha512-t7XvcwKyXhN9vR8GfgLUyEYYccwI390pG7debFSGns/5Vb0+/ZiGuSmVZGLNt1NVc3UH2zI2GGkDdSJR8Locig== dependencies: "@jest/create-cache-key-function" "^27.0.1" "@react-native-community/cli" "^7.0.3"