From 158b558e500576f434dec09417bb02cc0bc53f7a Mon Sep 17 00:00:00 2001 From: Lorenzo Sciandra Date: Fri, 30 Apr 2021 13:06:49 +0100 Subject: [PATCH 1/6] [local] update detox to work on Xcode 12 --- RNTester/Podfile.lock | 416 +++++++++++++++++++++--------------------- package.json | 4 +- yarn.lock | 29 +-- 3 files changed, 225 insertions(+), 224 deletions(-) diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index 0dfad6a9c6a02c..534cacfa89a0a8 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -3,14 +3,14 @@ PODS: - CocoaAsyncSocket (7.6.3) - CocoaLibEvent (1.0.0) - DoubleConversion (1.1.6) - - FBLazyVector (0.62.0) - - FBReactNativeSpec (0.62.0): - - Folly (= 2018.10.22.00) - - RCTRequired (= 0.62.0) - - RCTTypeSafety (= 0.62.0) - - React-Core (= 0.62.0) - - React-jsi (= 0.62.0) - - ReactCommon/turbomodule/core (= 0.62.0) + - FBLazyVector (0.62.2) + - FBReactNativeSpec (0.62.2): + - Folly (= 2018.10.22.00) + - RCTRequired (= 0.62.2) + - RCTTypeSafety (= 0.62.2) + - React-Core (= 0.62.2) + - React-jsi (= 0.62.2) + - ReactCommon/turbomodule/core (= 0.62.2) - Flipper (0.30.1): - Flipper-Folly (~> 2.1) - Flipper-RSocket (~> 1.0) @@ -68,263 +68,263 @@ PODS: - OpenSSL-Universal (1.0.2.19): - OpenSSL-Universal/Static (= 1.0.2.19) - OpenSSL-Universal/Static (1.0.2.19) - - RCTRequired (0.62.0) - - RCTTypeSafety (0.62.0): - - FBLazyVector (= 0.62.0) - - Folly (= 2018.10.22.00) - - RCTRequired (= 0.62.0) - - React-Core (= 0.62.0) - - React (0.62.0): - - React-Core (= 0.62.0) - - React-Core/DevSupport (= 0.62.0) - - React-Core/RCTWebSocket (= 0.62.0) - - React-RCTActionSheet (= 0.62.0) - - React-RCTAnimation (= 0.62.0) - - React-RCTBlob (= 0.62.0) - - React-RCTImage (= 0.62.0) - - React-RCTLinking (= 0.62.0) - - React-RCTNetwork (= 0.62.0) - - React-RCTSettings (= 0.62.0) - - React-RCTText (= 0.62.0) - - React-RCTVibration (= 0.62.0) - - React-ART (0.62.0): - - React-Core/ARTHeaders (= 0.62.0) - - React-Core (0.62.0): + - RCTRequired (0.62.2) + - RCTTypeSafety (0.62.2): + - FBLazyVector (= 0.62.2) + - Folly (= 2018.10.22.00) + - RCTRequired (= 0.62.2) + - React-Core (= 0.62.2) + - React (0.62.2): + - React-Core (= 0.62.2) + - React-Core/DevSupport (= 0.62.2) + - React-Core/RCTWebSocket (= 0.62.2) + - React-RCTActionSheet (= 0.62.2) + - React-RCTAnimation (= 0.62.2) + - React-RCTBlob (= 0.62.2) + - React-RCTImage (= 0.62.2) + - React-RCTLinking (= 0.62.2) + - React-RCTNetwork (= 0.62.2) + - React-RCTSettings (= 0.62.2) + - React-RCTText (= 0.62.2) + - React-RCTVibration (= 0.62.2) + - React-ART (0.62.2): + - React-Core/ARTHeaders (= 0.62.2) + - React-Core (0.62.2): - Folly (= 2018.10.22.00) - glog - - React-Core/Default (= 0.62.0) - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - React-jsiexecutor (= 0.62.0) + - React-Core/Default (= 0.62.2) + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - React-jsiexecutor (= 0.62.2) - Yoga - - React-Core/ARTHeaders (0.62.0): + - React-Core/ARTHeaders (0.62.2): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - React-jsiexecutor (= 0.62.0) + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - React-jsiexecutor (= 0.62.2) - Yoga - - React-Core/CoreModulesHeaders (0.62.0): + - React-Core/CoreModulesHeaders (0.62.2): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - React-jsiexecutor (= 0.62.0) + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - React-jsiexecutor (= 0.62.2) - Yoga - - React-Core/Default (0.62.0): + - React-Core/Default (0.62.2): - Folly (= 2018.10.22.00) - glog - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - React-jsiexecutor (= 0.62.0) + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - React-jsiexecutor (= 0.62.2) - Yoga - - React-Core/DevSupport (0.62.0): + - React-Core/DevSupport (0.62.2): - Folly (= 2018.10.22.00) - glog - - React-Core/Default (= 0.62.0) - - React-Core/RCTWebSocket (= 0.62.0) - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - React-jsiexecutor (= 0.62.0) - - React-jsinspector (= 0.62.0) + - React-Core/Default (= 0.62.2) + - React-Core/RCTWebSocket (= 0.62.2) + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - React-jsiexecutor (= 0.62.2) + - React-jsinspector (= 0.62.2) - Yoga - - React-Core/RCTActionSheetHeaders (0.62.0): + - React-Core/RCTActionSheetHeaders (0.62.2): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - React-jsiexecutor (= 0.62.0) + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - React-jsiexecutor (= 0.62.2) - Yoga - - React-Core/RCTAnimationHeaders (0.62.0): + - React-Core/RCTAnimationHeaders (0.62.2): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - React-jsiexecutor (= 0.62.0) + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - React-jsiexecutor (= 0.62.2) - Yoga - - React-Core/RCTBlobHeaders (0.62.0): + - React-Core/RCTBlobHeaders (0.62.2): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - React-jsiexecutor (= 0.62.0) + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - React-jsiexecutor (= 0.62.2) - Yoga - - React-Core/RCTImageHeaders (0.62.0): + - React-Core/RCTImageHeaders (0.62.2): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - React-jsiexecutor (= 0.62.0) + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - React-jsiexecutor (= 0.62.2) - Yoga - - React-Core/RCTLinkingHeaders (0.62.0): + - React-Core/RCTLinkingHeaders (0.62.2): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - React-jsiexecutor (= 0.62.0) + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - React-jsiexecutor (= 0.62.2) - Yoga - - React-Core/RCTNetworkHeaders (0.62.0): + - React-Core/RCTNetworkHeaders (0.62.2): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - React-jsiexecutor (= 0.62.0) + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - React-jsiexecutor (= 0.62.2) - Yoga - - React-Core/RCTPushNotificationHeaders (0.62.0): + - React-Core/RCTPushNotificationHeaders (0.62.2): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - React-jsiexecutor (= 0.62.0) + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - React-jsiexecutor (= 0.62.2) - Yoga - - React-Core/RCTSettingsHeaders (0.62.0): + - React-Core/RCTSettingsHeaders (0.62.2): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - React-jsiexecutor (= 0.62.0) + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - React-jsiexecutor (= 0.62.2) - Yoga - - React-Core/RCTTextHeaders (0.62.0): + - React-Core/RCTTextHeaders (0.62.2): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - React-jsiexecutor (= 0.62.0) + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - React-jsiexecutor (= 0.62.2) - Yoga - - React-Core/RCTVibrationHeaders (0.62.0): + - React-Core/RCTVibrationHeaders (0.62.2): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - React-jsiexecutor (= 0.62.0) + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - React-jsiexecutor (= 0.62.2) - Yoga - - React-Core/RCTWebSocket (0.62.0): + - React-Core/RCTWebSocket (0.62.2): - Folly (= 2018.10.22.00) - glog - - React-Core/Default (= 0.62.0) - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - React-jsiexecutor (= 0.62.0) + - React-Core/Default (= 0.62.2) + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - React-jsiexecutor (= 0.62.2) - Yoga - - React-CoreModules (0.62.0): - - FBReactNativeSpec (= 0.62.0) - - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.0) - - React-Core/CoreModulesHeaders (= 0.62.0) - - React-RCTImage (= 0.62.0) - - ReactCommon/turbomodule/core (= 0.62.0) - - React-cxxreact (0.62.0): + - React-CoreModules (0.62.2): + - FBReactNativeSpec (= 0.62.2) + - Folly (= 2018.10.22.00) + - RCTTypeSafety (= 0.62.2) + - React-Core/CoreModulesHeaders (= 0.62.2) + - React-RCTImage (= 0.62.2) + - ReactCommon/turbomodule/core (= 0.62.2) + - React-cxxreact (0.62.2): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsinspector (= 0.62.0) - - React-jsi (0.62.0): + - React-jsinspector (= 0.62.2) + - React-jsi (0.62.2): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsi/Default (= 0.62.0) - - React-jsi/Default (0.62.0): + - React-jsi/Default (= 0.62.2) + - React-jsi/Default (0.62.2): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsiexecutor (0.62.0): + - React-jsiexecutor (0.62.2): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - React-jsinspector (0.62.0) - - React-RCTActionSheet (0.62.0): - - React-Core/RCTActionSheetHeaders (= 0.62.0) - - React-RCTAnimation (0.62.0): - - FBReactNativeSpec (= 0.62.0) - - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.0) - - React-Core/RCTAnimationHeaders (= 0.62.0) - - ReactCommon/turbomodule/core (= 0.62.0) - - React-RCTBlob (0.62.0): - - FBReactNativeSpec (= 0.62.0) - - Folly (= 2018.10.22.00) - - React-Core/RCTBlobHeaders (= 0.62.0) - - React-Core/RCTWebSocket (= 0.62.0) - - React-jsi (= 0.62.0) - - React-RCTNetwork (= 0.62.0) - - ReactCommon/turbomodule/core (= 0.62.0) - - React-RCTImage (0.62.0): - - FBReactNativeSpec (= 0.62.0) - - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.0) - - React-Core/RCTImageHeaders (= 0.62.0) - - React-RCTNetwork (= 0.62.0) - - ReactCommon/turbomodule/core (= 0.62.0) - - React-RCTLinking (0.62.0): - - FBReactNativeSpec (= 0.62.0) - - React-Core/RCTLinkingHeaders (= 0.62.0) - - ReactCommon/turbomodule/core (= 0.62.0) - - React-RCTNetwork (0.62.0): - - FBReactNativeSpec (= 0.62.0) - - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.0) - - React-Core/RCTNetworkHeaders (= 0.62.0) - - ReactCommon/turbomodule/core (= 0.62.0) - - React-RCTPushNotification (0.62.0): - - FBReactNativeSpec (= 0.62.0) - - RCTTypeSafety (= 0.62.0) - - React-Core/RCTPushNotificationHeaders (= 0.62.0) - - ReactCommon/turbomodule/core (= 0.62.0) - - React-RCTSettings (0.62.0): - - FBReactNativeSpec (= 0.62.0) - - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.0) - - React-Core/RCTSettingsHeaders (= 0.62.0) - - ReactCommon/turbomodule/core (= 0.62.0) - - React-RCTTest (0.62.0): - - React-Core (= 0.62.0) - - React-CoreModules (= 0.62.0) - - React-RCTText (0.62.0): - - React-Core/RCTTextHeaders (= 0.62.0) - - React-RCTVibration (0.62.0): - - FBReactNativeSpec (= 0.62.0) - - Folly (= 2018.10.22.00) - - React-Core/RCTVibrationHeaders (= 0.62.0) - - ReactCommon/turbomodule/core (= 0.62.0) - - ReactCommon/callinvoker (0.62.0): + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - React-jsinspector (0.62.2) + - React-RCTActionSheet (0.62.2): + - React-Core/RCTActionSheetHeaders (= 0.62.2) + - React-RCTAnimation (0.62.2): + - FBReactNativeSpec (= 0.62.2) + - Folly (= 2018.10.22.00) + - RCTTypeSafety (= 0.62.2) + - React-Core/RCTAnimationHeaders (= 0.62.2) + - ReactCommon/turbomodule/core (= 0.62.2) + - React-RCTBlob (0.62.2): + - FBReactNativeSpec (= 0.62.2) + - Folly (= 2018.10.22.00) + - React-Core/RCTBlobHeaders (= 0.62.2) + - React-Core/RCTWebSocket (= 0.62.2) + - React-jsi (= 0.62.2) + - React-RCTNetwork (= 0.62.2) + - ReactCommon/turbomodule/core (= 0.62.2) + - React-RCTImage (0.62.2): + - FBReactNativeSpec (= 0.62.2) + - Folly (= 2018.10.22.00) + - RCTTypeSafety (= 0.62.2) + - React-Core/RCTImageHeaders (= 0.62.2) + - React-RCTNetwork (= 0.62.2) + - ReactCommon/turbomodule/core (= 0.62.2) + - React-RCTLinking (0.62.2): + - FBReactNativeSpec (= 0.62.2) + - React-Core/RCTLinkingHeaders (= 0.62.2) + - ReactCommon/turbomodule/core (= 0.62.2) + - React-RCTNetwork (0.62.2): + - FBReactNativeSpec (= 0.62.2) + - Folly (= 2018.10.22.00) + - RCTTypeSafety (= 0.62.2) + - React-Core/RCTNetworkHeaders (= 0.62.2) + - ReactCommon/turbomodule/core (= 0.62.2) + - React-RCTPushNotification (0.62.2): + - FBReactNativeSpec (= 0.62.2) + - RCTTypeSafety (= 0.62.2) + - React-Core/RCTPushNotificationHeaders (= 0.62.2) + - ReactCommon/turbomodule/core (= 0.62.2) + - React-RCTSettings (0.62.2): + - FBReactNativeSpec (= 0.62.2) + - Folly (= 2018.10.22.00) + - RCTTypeSafety (= 0.62.2) + - React-Core/RCTSettingsHeaders (= 0.62.2) + - ReactCommon/turbomodule/core (= 0.62.2) + - React-RCTTest (0.62.2): + - React-Core (= 0.62.2) + - React-CoreModules (= 0.62.2) + - React-RCTText (0.62.2): + - React-Core/RCTTextHeaders (= 0.62.2) + - React-RCTVibration (0.62.2): + - FBReactNativeSpec (= 0.62.2) + - Folly (= 2018.10.22.00) + - React-Core/RCTVibrationHeaders (= 0.62.2) + - ReactCommon/turbomodule/core (= 0.62.2) + - ReactCommon/callinvoker (0.62.2): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-cxxreact (= 0.62.0) - - ReactCommon/turbomodule/core (0.62.0): + - React-cxxreact (= 0.62.2) + - ReactCommon/turbomodule/core (0.62.2): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-Core (= 0.62.0) - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - ReactCommon/callinvoker (= 0.62.0) - - ReactCommon/turbomodule/samples (0.62.0): + - React-Core (= 0.62.2) + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - ReactCommon/callinvoker (= 0.62.2) + - ReactCommon/turbomodule/samples (0.62.2): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-Core (= 0.62.0) - - React-cxxreact (= 0.62.0) - - React-jsi (= 0.62.0) - - ReactCommon/callinvoker (= 0.62.0) - - ReactCommon/turbomodule/core (= 0.62.0) + - React-Core (= 0.62.2) + - React-cxxreact (= 0.62.2) + - React-jsi (= 0.62.2) + - ReactCommon/callinvoker (= 0.62.2) + - ReactCommon/turbomodule/core (= 0.62.2) - Yoga (1.14.0) - YogaKit (1.18.1): - Yoga (~> 1.14) @@ -369,7 +369,7 @@ DEPENDENCIES: - Yoga (from `../ReactCommon/yoga`) SPEC REPOS: - https://cdn.cocoapods.org/: + trunk: - boost-for-react-native - CocoaAsyncSocket - CocoaLibEvent @@ -444,8 +444,8 @@ SPEC CHECKSUMS: CocoaAsyncSocket: eafaa68a7e0ec99ead0a7b35015e0bf25d2c8987 CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 - FBLazyVector: 545eccf4f6ef2de8fd450fd8a1edb3f913c7371a - FBReactNativeSpec: 85c7f8347f4a6e911742228e89e245187afa298e + FBLazyVector: 4aab18c93cd9546e4bfed752b4084585eca8b245 + FBReactNativeSpec: 5465d51ccfeecb7faa12f9ae0024f2044ce4044e Flipper: d591b88245dc8c8147819aa249f911923c7417fc Flipper-Folly: bcae82405dafd18ac9f8d9d4902fd1c2ef2a7e77 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 @@ -454,31 +454,31 @@ SPEC CHECKSUMS: Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 - RCTRequired: 0873f5bdb1762d2b9b1ae16a01c4f91d6ee3b6dd - RCTTypeSafety: a605e0cc0e4220f6e65896bd9e675073c2978f35 - React: 8abf6bdd2b05538e9445f7bbda800df744068bfe - React-ART: 815f382e56c662740eeb48c296224f936d35dd21 - React-Core: d6daa0d60a4180915e889a5e81f28522cb30359a - React-CoreModules: 9d5343b095a52e830954a1dd7ae1cb9321ceeddc - React-cxxreact: c108ca236585b9c802f1eeab11fed1a023faac3a - React-jsi: bc8166d6833cdcb0848c80710b26ce63fad2c099 - React-jsiexecutor: 8bf0b2707f05865113415088c398a7f98c0cf546 - React-jsinspector: 8e5913c4c6c54f0d3f9c9fc630c465a89cded65d - React-RCTActionSheet: 674afbc8b9c76e0a83520e0a51da29a70802c03f - React-RCTAnimation: f5f24330d09ee677fb49e0782f8321868f4df431 - React-RCTBlob: b773ce6138ab0d172ebd8a455fd4efd200a92549 - React-RCTImage: 8dbaa77916f9d21ff8faa0f3f5f06d4069c28e93 - React-RCTLinking: 312a2b3511e2829e68c300c2cdcae4282fefc7ef - React-RCTNetwork: 4b87acf29c38b8819bea67dad3edeca7b9a20718 - React-RCTPushNotification: 04424ad9d13ebac07ea14ae913df3d5b4edd3967 - React-RCTSettings: be798c8b33392a90d9d551644610ffa349a89255 - React-RCTTest: 9ceb703e7bf6f42d79dd51c01020bc5783baa371 - React-RCTText: 91a0d0ae5434aa28fe0c89c03eb9d660ff53bd9b - React-RCTVibration: 0630aeb11e22f87c180ca9c0c3a0a0aba780cc62 - ReactCommon: d22162ab8f1358c53dfcd0f9c4d82d38facdbc48 - Yoga: 9db9ff2025ad21d1ac0a8b3c85d5ac4e7c29d525 + RCTRequired: cec6a34b3ac8a9915c37e7e4ad3aa74726ce4035 + RCTTypeSafety: 93006131180074cffa227a1075802c89a49dd4ce + React: 29a8b1a02bd764fb7644ef04019270849b9a7ac3 + React-ART: 5f482520ff6ddc8775ca8c03547c421a7d44e06e + React-Core: b12bffb3f567fdf99510acb716ef1abd426e0e05 + React-CoreModules: 4a9b87bbe669d6c3173c0132c3328e3b000783d0 + React-cxxreact: e65f9c2ba0ac5be946f53548c1aaaee5873a8103 + React-jsi: b6dc94a6a12ff98e8877287a0b7620d365201161 + React-jsiexecutor: 1540d1c01bb493ae3124ed83351b1b6a155db7da + React-jsinspector: 512e560d0e985d0e8c479a54a4e5c147a9c83493 + React-RCTActionSheet: f41ea8a811aac770e0cc6e0ad6b270c644ea8b7c + React-RCTAnimation: 49ab98b1c1ff4445148b72a3d61554138565bad0 + React-RCTBlob: a332773f0ebc413a0ce85942a55b064471587a71 + React-RCTImage: e70be9b9c74fe4e42d0005f42cace7981c994ac3 + React-RCTLinking: c1b9739a88d56ecbec23b7f63650e44672ab2ad2 + React-RCTNetwork: 73138b6f45e5a2768ad93f3d57873c2a18d14b44 + React-RCTPushNotification: d544b6b5bf8def493b87da896a1cc0f4b61291c7 + React-RCTSettings: 6e3738a87e21b39a8cb08d627e68c44acf1e325a + React-RCTTest: 5a036f87cdb7f3335d0bbe0d24a83a63f7cfb697 + React-RCTText: fae545b10cfdb3d247c36c56f61a94cfd6dba41d + React-RCTVibration: 4356114dbcba4ce66991096e51a66e61eda51256 + ReactCommon: ed4e11d27609d571e7eee8b65548efc191116eb3 + Yoga: 3ebccbdd559724312790e7742142d062476b698e YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 6c950c0173bc4754b0d9fa5aba9232943ac228b4 -COCOAPODS: 1.8.4 +COCOAPODS: 1.10.1 diff --git a/package.json b/package.json index a76f417b41df8f..c416be0ace332e 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "babel-eslint": "10.0.1", "clang-format": "^1.2.4", "coveralls": "^3.0.2", - "detox": "14.5.1", + "detox": "16.7.2", "eslint": "5.1.0", "eslint-config-fb-strict": "24.3.0", "eslint-config-fbjs": "2.1.0", @@ -174,4 +174,4 @@ } } } -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index 1d9e0bd98b4b06..ede79e07234ffd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2069,10 +2069,10 @@ big-integer@^1.6.7: resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.36.tgz#78631076265d4ae3555c04f85e7d9d2f3a071a36" integrity sha512-t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg== -bluebird@3.5.x: - version "3.5.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a" - integrity sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg== +bluebird@^3.5.4: + version "3.7.2" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== bplist-creator@0.0.7: version "0.0.7" @@ -2804,16 +2804,17 @@ detect-newline@^2.1.0: resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I= -detox@14.5.1: - version "14.5.1" - resolved "https://registry.yarnpkg.com/detox/-/detox-14.5.1.tgz#dd3cbdb4f26aaf461774303eb825f2f0fc8e8260" - integrity sha512-ZFt9LOHRXTxX1HVefysCnF5tLQQRQvr+w4KSXxkdJUa+9afr9/avZyz5kR0elasC2aU6/pnuzUiOJmCCyy7f6w== +detox@16.7.2: + version "16.7.2" + resolved "https://registry.yarnpkg.com/detox/-/detox-16.7.2.tgz#531c98416adf52d4ba95601b669969acadafb970" + integrity sha512-+837eRgk4xOewXmeF5H6vOTn0RbKUFIyCi5UsTXEhvplsMk+KrrqfKik2j8fvubJkByry7HqIN/JF9jKe+meIQ== dependencies: "@babel/core" "^7.4.5" bunyan "^1.8.12" bunyan-debug-stream "^1.1.0" chalk "^2.4.2" child-process-promise "^2.2.0" + find-up "^4.1.0" fs-extra "^4.0.2" funpermaproxy "^1.0.1" get-port "^2.1.0" @@ -2824,7 +2825,7 @@ detox@14.5.1: sanitize-filename "^1.6.1" shell-utils "^1.0.9" tail "^2.0.0" - telnet-client "0.15.3" + telnet-client "1.2.8" tempfile "^2.0.0" which "^1.3.1" ws "^3.3.1" @@ -7124,12 +7125,12 @@ tar@^4: safe-buffer "^5.1.2" yallist "^3.0.2" -telnet-client@0.15.3: - version "0.15.3" - resolved "https://registry.yarnpkg.com/telnet-client/-/telnet-client-0.15.3.tgz#99ec754e4acf6fa51dc69898f574df3c2550712e" - integrity sha512-GSfdzQV0BKIYsmeXq7bJFJ2wHeJud6icaIxCUf6QCGQUD6R0BBGbT1+yLDhq67JRdgRpwyPwUbV7JxFeRrZomQ== +telnet-client@1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/telnet-client/-/telnet-client-1.2.8.tgz#946c0dadc8daa3f19bb40a3e898cb870403a4ca4" + integrity sha512-W+w4k3QAmULVNhBVT2Fei369kGZCh/TH25M7caJAXW+hLxwoQRuw0di3cX4l0S9fgH3Mvq7u+IFMoBDpEw/eIg== dependencies: - bluebird "3.5.x" + bluebird "^3.5.4" temp-dir@^1.0.0: version "1.0.0" From 166a5ddf88aca0d0235e48c624681eec095e9ef8 Mon Sep 17 00:00:00 2001 From: Max Ovtsin Date: Mon, 23 Mar 2020 13:42:09 -0700 Subject: [PATCH 2/6] Get ReactiveNative compiled with Clang 10 (#28362) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/28362 Fixed a few compilation errors emitted by Clang 10. Changelog: [iOS] [Fixed] - Get ready for Clang 10 Differential Revision: D20549970 fbshipit-source-id: dc36a85d90d3e43a05f045feb57c6ab6ded67da7 --- React/CxxBridge/RCTCxxBridge.mm | 2 +- ReactCommon/fabric/graphics/platform/ios/Color.cpp | 1 + .../turbomodule/core/platform/ios/RCTTurboModuleManager.mm | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm index 18b0e09b042366..6e676f9e205752 100644 --- a/React/CxxBridge/RCTCxxBridge.mm +++ b/React/CxxBridge/RCTCxxBridge.mm @@ -768,7 +768,7 @@ - (void)registerExtraLazyModules #endif } -- (NSArray *)_initializeModules:(NSArray> *)modules +- (NSArray *)_initializeModules:(NSArray *)modules withDispatchGroup:(dispatch_group_t)dispatchGroup lazilyDiscovered:(BOOL)lazilyDiscovered { diff --git a/ReactCommon/fabric/graphics/platform/ios/Color.cpp b/ReactCommon/fabric/graphics/platform/ios/Color.cpp index f7100f98dcbc6a..dfde827886e203 100644 --- a/ReactCommon/fabric/graphics/platform/ios/Color.cpp +++ b/ReactCommon/fabric/graphics/platform/ios/Color.cpp @@ -6,6 +6,7 @@ */ #include "Color.h" +#include namespace facebook { namespace react { diff --git a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm index 841f9256807139..c28bc30214e990 100644 --- a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm +++ b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm @@ -304,7 +304,7 @@ - (void)notifyAboutTurboModuleSetup:(const char *)name @"%@ has no setter or ivar for its bridge, which is not " "permitted. You must either @synthesize the bridge property, " "or provide your own setter method.", - RCTBridgeModuleNameForClass(strongModule)); + RCTBridgeModuleNameForClass([strongModule class])); } } From ca09ae82715e33c9ac77b3fa55495cf84ba891c7 Mon Sep 17 00:00:00 2001 From: Neal Poole Date: Thu, 29 Apr 2021 14:51:29 -0700 Subject: [PATCH 3/6] Update validateBaseUrl to use latest regex Summary: Updating the regex to avoid a potential regular expression denial-of-service vulnerability. Changelog: Update validateBaseUrl to use a more robust regular expression. Fixes CVE-2020-1920, GHSL-2020-293 Reviewed By: lunaleaps Differential Revision: D25507604 fbshipit-source-id: c36a03c456881bc655c861e1a2c5cd41a7127c9d --- Libraries/Blob/URL.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Libraries/Blob/URL.js b/Libraries/Blob/URL.js index f2b6f7f277cb7e..df186f36de1ac4 100644 --- a/Libraries/Blob/URL.js +++ b/Libraries/Blob/URL.js @@ -107,7 +107,7 @@ export class URLSearchParams { function validateBaseUrl(url: string) { // from this MIT-licensed gist: https://gist.github.com/dperini/729294 - return /^(?:(?:(?:https?|ftp):)?\/\/)(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,}))?)(?::\d{2,5})?(?:[/?#]\S*)?$/i.test( + return /^(?:(?:(?:https?|ftp):)?\/\/)(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9\u00a1-\uffff][a-z0-9\u00a1-\uffff_-]{0,62})?[a-z0-9\u00a1-\uffff]\.)*(?:[a-z\u00a1-\uffff]{2,}\.?))(?::\d{2,5})?(?:[/?#]\S*)?$/.test( url, ); } From c4ea556d64c7fc146d1412548788c48bbcc0f6bb Mon Sep 17 00:00:00 2001 From: Lorenzo Sciandra Date: Fri, 30 Apr 2021 14:29:16 +0100 Subject: [PATCH 4/6] [local] change podfile to rely on the autolink-ios rb file --- package.json | 1 + template/ios/Podfile | 46 ++------------------------------------------ 2 files changed, 3 insertions(+), 44 deletions(-) diff --git a/package.json b/package.json index c416be0ace332e..cb1aaff867eae7 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "ReactCommon", "README.md", "rn-get-polyfills.js", + "scripts/autolink-ios.rb", "scripts/compose-source-maps.js", "scripts/ios-configure-glog.sh", "scripts/ios-install-third-party.sh", diff --git a/template/ios/Podfile b/template/ios/Podfile index 4394f94761b0c7..22b2243e80ab83 100644 --- a/template/ios/Podfile +++ b/template/ios/Podfile @@ -1,49 +1,7 @@ -platform :ios, '9.0' +platform :ios, '10.0' +require_relative '../node_modules/react-native/scripts/autolink-ios' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' -def add_flipper_pods!(versions = {}) - versions['Flipper'] ||= '~> 0.33.1' - versions['DoubleConversion'] ||= '1.1.7' - versions['Flipper-Folly'] ||= '~> 2.1' - versions['Flipper-Glog'] ||= '0.3.6' - versions['Flipper-PeerTalk'] ||= '~> 0.0.4' - versions['Flipper-RSocket'] ||= '~> 1.0' - - pod 'FlipperKit', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/FlipperKitLayoutPlugin', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/SKIOSNetworkPlugin', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/FlipperKitUserDefaultsPlugin', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/FlipperKitReactPlugin', versions['Flipper'], :configuration => 'Debug' - - # List all transitive dependencies for FlipperKit pods - # to avoid them being linked in Release builds - pod 'Flipper', versions['Flipper'], :configuration => 'Debug' - pod 'Flipper-DoubleConversion', versions['DoubleConversion'], :configuration => 'Debug' - pod 'Flipper-Folly', versions['Flipper-Folly'], :configuration => 'Debug' - pod 'Flipper-Glog', versions['Flipper-Glog'], :configuration => 'Debug' - pod 'Flipper-PeerTalk', versions['Flipper-PeerTalk'], :configuration => 'Debug' - pod 'Flipper-RSocket', versions['Flipper-RSocket'], :configuration => 'Debug' - pod 'FlipperKit/Core', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/CppBridge', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/FBCxxFollyDynamicConvert', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/FBDefines', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/FKPortForwarding', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/FlipperKitHighlightOverlay', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/FlipperKitLayoutTextSearchable', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/FlipperKitNetworkPlugin', versions['Flipper'], :configuration => 'Debug' -end - -# Post Install processing for Flipper -def flipper_post_install(installer) - installer.pods_project.targets.each do |target| - if target.name == 'YogaKit' - target.build_configurations.each do |config| - config.build_settings['SWIFT_VERSION'] = '4.1' - end - end - end -end - target 'HelloWorld' do # Pods for HelloWorld pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector" From c6f4611dcbfbb64d5b54e242570e2a1acffcabef Mon Sep 17 00:00:00 2001 From: Lorenzo Sciandra Date: Fri, 30 Apr 2021 14:59:46 +0100 Subject: [PATCH 5/6] [local] change autolink to match requirements for FlipperFolly working with Xcode 12.5 --- scripts/autolink-ios.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/autolink-ios.rb b/scripts/autolink-ios.rb index 31757ce4528c74..e611e236aac243 100644 --- a/scripts/autolink-ios.rb +++ b/scripts/autolink-ios.rb @@ -58,9 +58,9 @@ def use_react_native! (options={}) end def add_flipper_pods!(versions = {}) - versions['Flipper'] ||= '~> 0.33.1' + versions['Flipper'] ||= '~> 0.75.1' versions['DoubleConversion'] ||= '1.1.7' - versions['Flipper-Folly'] ||= '~> 2.1' + versions['Flipper-Folly'] ||= '2.5.3' versions['Flipper-Glog'] ||= '0.3.6' versions['Flipper-PeerTalk'] ||= '~> 0.0.4' versions['Flipper-RSocket'] ||= '~> 1.0' From 83425fa72f1f9a12f6b6deefd66fa8bd154a3651 Mon Sep 17 00:00:00 2001 From: Lorenzo Sciandra Date: Wed, 5 May 2021 10:33:36 +0100 Subject: [PATCH 6/6] [0.62.3] Bump version numbers --- Libraries/Core/ReactNativeVersion.js | 2 +- React/Base/RCTVersion.m | 2 +- ReactAndroid/gradle.properties | 2 +- .../facebook/react/modules/systeminfo/ReactNativeVersion.java | 2 +- package.json | 4 ++-- template/package.json | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js index 0c88a4c9abd4fa..c3ca77a46e9392 100644 --- a/Libraries/Core/ReactNativeVersion.js +++ b/Libraries/Core/ReactNativeVersion.js @@ -12,6 +12,6 @@ exports.version = { major: 0, minor: 62, - patch: 2, + patch: 3, prerelease: null, }; diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m index e5236b643b7de7..ce95364ae7a800 100644 --- a/React/Base/RCTVersion.m +++ b/React/Base/RCTVersion.m @@ -23,7 +23,7 @@ __rnVersion = @{ RCTVersionMajor: @(0), RCTVersionMinor: @(62), - RCTVersionPatch: @(2), + RCTVersionPatch: @(3), RCTVersionPrerelease: [NSNull null], }; }); diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index 19042584de5962..5fb640513707ed 100644 --- a/ReactAndroid/gradle.properties +++ b/ReactAndroid/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=0.62.2 +VERSION_NAME=0.62.3 GROUP=com.facebook.react POM_NAME=ReactNative diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java index 6c766aaf8b41e4..6612ff509edaec 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java @@ -17,6 +17,6 @@ public class ReactNativeVersion { public static final Map VERSION = MapBuilder.of( "major", 0, "minor", 62, - "patch", 2, + "patch", 3, "prerelease", null); } diff --git a/package.json b/package.json index cb1aaff867eae7..c5d43fac5b84cf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native", - "version": "0.62.2", + "version": "0.62.3", "bin": "./cli.js", "description": "A framework for building native apps using React", "license": "MIT", @@ -175,4 +175,4 @@ } } } -} +} \ No newline at end of file diff --git a/template/package.json b/template/package.json index 69147b50c08887..d0b2d1fcd64b03 100644 --- a/template/package.json +++ b/template/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "react": "16.11.0", - "react-native": "0.62.2" + "react-native": "0.62.3" }, "devDependencies": { "@babel/core": "^7.6.2",