From 6f008d6fc14a0c70f911453fea2eb50af3bb93a3 Mon Sep 17 00:00:00 2001 From: HeyImChris <48299693+HeyImChris@users.noreply.github.com> Date: Wed, 3 Feb 2021 14:18:46 -0800 Subject: [PATCH 1/2] Add nullability checks (#704) * Update RCTCxxBridge.mm * add nullability checks --- RNTester/Podfile.lock | 56 ++++++++++++++++----------------- React/Base/RCTJSInvokerModule.h | 2 +- React/Modules/RCTEventEmitter.h | 10 +++--- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index 2424c5004e5da3..ab4376909d1fc3 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -519,8 +519,8 @@ SPEC CHECKSUMS: CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f DoubleConversion: 56a44bcfd14ab2ff66f5a146b2e875eb4b69b19b - FBLazyVector: b3ff0841fe404f6d35d321bdd7e2971a101ba057 - FBReactNativeSpec: 4e08b13d0b49f20e96adf7e77ca546142ec2aafd + FBLazyVector: 7052b1143402396d305bca87b93912a92ab9f658 + FBReactNativeSpec: 9cc71ea1f039e0b4e1aa78d2cafe7f8004431121 Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3 @@ -533,34 +533,34 @@ SPEC CHECKSUMS: libevent: ee9265726a1fc599dea382964fa304378affaa5f OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 RCT-Folly: 1347093ffe75e152d846f7e45a3ef901b60021aa - RCTRequired: 5b6e3555bf3e4de31f5f9eec6765cb1e1c3f8588 - RCTTypeSafety: 433a5f0c42cffe0dce22d296be466b85134df89a - React: 76089aa2c64e9b8e68d800212aa8aeb29cfe6261 - React-ART: 222b1fab73ae6557fc5d574674edcc3188efb18d - React-callinvoker: ff08dfe52b3a0dc610a79a03e0f6c3e3f10e125c - React-Core: 81b5173e8855498a15a78e42aba1b699221f9b3e - React-CoreModules: 8ab2d55539bde7272ff41a15648c240577756647 - React-cxxreact: 698bc21b02495b901d09fb6925fb7e6520de0238 - React-jsi: a709fa4ff7117075b50ae4616a0866ae9bf6d0d5 - React-jsiexecutor: 3ff187bf23493fec692716a6641dc4a6fc5841ca - React-jsinspector: 551b5d3465e34674a0f77f9928bd400618ac0e61 - React-RCTActionSheet: 9ca162527c21bcff421a35e0e2673e0f5b9816dc - React-RCTAnimation: 649bca7ad18ce605f8c83cad39e24460133c2c7e - React-RCTBlob: ef322dcc9ff4e0432779c7c0bd0b1e538e454ef0 - React-RCTImage: aecac3315930fd44fe728eca2fd2239e7248f27d - React-RCTLinking: 4e894cb3edcac66b38b62728de5848023e044dc7 - React-RCTNetwork: 5aff7081f53f84c066e2fab498c663a3c874862b - React-RCTPushNotification: 9f7935165abe702411d378e3a4ce4576421328ce - React-RCTSettings: f12d385d733dc01db6b61b416dfb0a1876f15527 - React-RCTTest: 26f1ccd3a6de79722aadeb3abacbdcf245cf9ed6 - React-RCTText: 711cd763e14ff8718466a3b492c169b94ddc37ae - React-RCTVibration: 3b52dde3beeab10ca475e61a8016d38290019901 + RCTRequired: 21cb0123c813b395aba4436e18786eed8e9964d7 + RCTTypeSafety: 8dd1d97bbdeebd72eff9caec60baab7a60da19c7 + React: 9bdea7aab7b16e6006a13793757bb847164e50a0 + React-ART: fc6a2121a18ee07757e74f3ad08af8515c84a5ca + React-callinvoker: ec8eb81378a5afd25a4b33540b6f6613b69e322c + React-Core: 577132c3964b6bfc135a8a26d7cff6deb2d095d7 + React-CoreModules: d86c18192d9a3309d2d6ed2f51b615a85ec4e2ff + React-cxxreact: 8f11dbbc3981c4e1a75c563f67a923e0b9acef00 + React-jsi: fad59c093331f8ac8a1a4831599a277a5e709ed1 + React-jsiexecutor: fe2fe79101b11650d45b5b2b437f0d2d74a917a2 + React-jsinspector: f66631a327b51f5b9888bf94f1766868796c34d3 + React-RCTActionSheet: 1693829d61a2aab77629e443ee87168eaddd8a93 + React-RCTAnimation: 3d6995b7346b0ce380d9d1b1548fa6402e174875 + React-RCTBlob: a4ab9a02b6fe3e2177a1052eeebcbd68f7b08c10 + React-RCTImage: 6b311e583ac6865eb575c3617b8490fced70f340 + React-RCTLinking: 10ddfb7da728c5ae9b7a3aed9fa6c72255c265c0 + React-RCTNetwork: 60625519957d31ff17d452a62ed9e5685df719b4 + React-RCTPushNotification: e8089d7a5bcf1d63d5fed9db5b7a2ae5ff172774 + React-RCTSettings: 01080c727da6621d5506db3f23b5a8329c116e0c + React-RCTTest: eda8121aa1bf93b77182d00a361ecaa5e42e080e + React-RCTText: b6c32e44c1a966351ac67d60b1c2a6e3eb6e7949 + React-RCTVibration: 4514a04385da9a3f68eafeba1592abb0d2a94c5a React-TurboModuleCxx-RNW: 4da8eb44b10ab3c5bbab9fcb0a8ae415c20ea3c9 - React-TurboModuleCxx-WinRTPort: c7886867a28587fa55b5cc97f08a7e2acd30d842 - ReactCommon: 9ff853e68f82140864b99aa9094369d36c8d7b21 - Yoga: 620d1137a9da2515a80f96371b5485a9388d575f + React-TurboModuleCxx-WinRTPort: 342d6ea717f0792f21e82baef8d69bb79ae07bd8 + ReactCommon: 0102192eca32ab4ff3860aadfb2e576421fd060b + Yoga: 66378e7fe59400a26aa74fbd7d7329ea36314318 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 18ca7d3b0e7db79041574a8bb6200b9e1c2d5359 -COCOAPODS: 1.9.1 \ No newline at end of file +COCOAPODS: 1.9.1 diff --git a/React/Base/RCTJSInvokerModule.h b/React/Base/RCTJSInvokerModule.h index a0cbfbeacdc16a..ad16accd7e3ff4 100644 --- a/React/Base/RCTJSInvokerModule.h +++ b/React/Base/RCTJSInvokerModule.h @@ -11,6 +11,6 @@ */ @protocol RCTJSInvokerModule -@property (nonatomic, copy, nonnull) void (^invokeJS)(NSString *module, NSString *method, NSArray *args); +@property (nonatomic, copy, nonnull) void (^invokeJS)(NSString * _Nullable module, NSString * _Nullable method, NSArray * _Nullable args); // TODO(macOS ISS#2323203) @end diff --git a/React/Modules/RCTEventEmitter.h b/React/Modules/RCTEventEmitter.h index fef326cee037d1..45c6859b03fe25 100644 --- a/React/Modules/RCTEventEmitter.h +++ b/React/Modules/RCTEventEmitter.h @@ -14,21 +14,21 @@ */ @interface RCTEventEmitter : NSObject -@property (nonatomic, weak) RCTBridge *bridge; -@property (nonatomic, copy, nonnull) void (^invokeJS)(NSString *module, NSString *method, NSArray *args); +@property (nonatomic, weak) RCTBridge * _Nullable bridge; // TODO(macOS ISS#2323203) +@property (nonatomic, copy, nonnull) void (^invokeJS)(NSString * _Nullable module, NSString * _Nullable method, NSArray * _Nullable args); // TODO(macOS ISS#2323203) /** * Override this method to return an array of supported event names. Attempting * to observe or send an event that isn't included in this list will result in * an error. */ -- (NSArray *)supportedEvents; +- (NSArray *_Nullable)supportedEvents; // TODO(macOS ISS#2323203) /** * Send an event that does not relate to a specific view, e.g. a navigation * or data update notification. */ -- (void)sendEventWithName:(NSString *)name body:(id)body; +- (void)sendEventWithName:(NSString *_Nullable)name body:(id _Nullable )body; // TODO(macOS ISS#2323203) /** * These methods will be called when the first observer is added and when the @@ -38,7 +38,7 @@ - (void)startObserving; - (void)stopObserving; -- (void)addListener:(NSString *)eventName; +- (void)addListener:(NSString *_Nullable)eventName; // TODO(macOS ISS#2323203) - (void)removeListeners:(double)count; @end From 576da0afaea9217520d456037e71e7ba925492c3 Mon Sep 17 00:00:00 2001 From: Chris Hogan Date: Mon, 28 Jun 2021 19:54:40 -0700 Subject: [PATCH 2/2] remove extraneous devsettings check --- RNTester/Podfile.lock | 568 +++++++++++++------------------- React/CxxBridge/RCTCxxBridge.mm | 2 - 2 files changed, 233 insertions(+), 337 deletions(-) diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index 91f0b5c30c4211..4d95aeb5453472 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -1,67 +1,15 @@ PODS: - boost-for-react-native (1.63.0) - - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.63.35) - - FBReactNativeSpec (0.63.35): - - RCT-Folly (= 2020.01.13.00) - - RCTRequired (= 0.63.35) - - RCTTypeSafety (= 0.63.35) - - React-Core (= 0.63.35) - - React-jsi (= 0.63.35) - - ReactCommon/turbomodule/core (= 0.63.35) - - Flipper (0.75.1): - - Flipper-Folly (~> 2.5) - - Flipper-RSocket (~> 1.3) - - Flipper-Boost-iOSX (1.76.0.1.11) - - Flipper-DoubleConversion (1.1.7) - - Flipper-Fmt (7.1.7) - - Flipper-Folly (2.6.7): - - Flipper-Boost-iOSX - - Flipper-DoubleConversion - - Flipper-Fmt (= 7.1.7) - - Flipper-Glog - - libevent (~> 2.1.12) - - OpenSSL-Universal (= 1.1.180) - - Flipper-Glog (0.3.6) - - Flipper-PeerTalk (0.0.4) - - Flipper-RSocket (1.4.3): - - Flipper-Folly (~> 2.6) - - FlipperKit (0.75.1): - - FlipperKit/Core (= 0.75.1) - - FlipperKit/Core (0.75.1): - - Flipper (~> 0.75.1) - - FlipperKit/CppBridge - - FlipperKit/FBCxxFollyDynamicConvert - - FlipperKit/FBDefines - - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.75.1): - - Flipper (~> 0.75.1) - - FlipperKit/FBCxxFollyDynamicConvert (0.75.1): - - Flipper-Folly (~> 2.5) - - FlipperKit/FBDefines (0.75.1) - - FlipperKit/FKPortForwarding (0.75.1): - - CocoaAsyncSocket (~> 7.6) - - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.75.1) - - FlipperKit/FlipperKitLayoutPlugin (0.75.1): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutTextSearchable - - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.75.1) - - FlipperKit/FlipperKitNetworkPlugin (0.75.1): - - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.75.1): - - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.75.1): - - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.75.1): - - FlipperKit/Core - - FlipperKit/FlipperKitNetworkPlugin + - FBLazyVector (0.63.36) + - FBReactNativeSpec (0.63.36): + - RCT-Folly (= 2020.01.13.00) + - RCTRequired (= 0.63.36) + - RCTTypeSafety (= 0.63.36) + - React-Core (= 0.63.36) + - React-jsi (= 0.63.36) + - ReactCommon/turbomodule/core (= 0.63.36) - glog (0.3.5) - - libevent (2.1.12) - - OpenSSL-Universal (1.1.180) - RCT-Folly (2020.01.13.00): - boost-for-react-native - DoubleConversion @@ -71,311 +19,290 @@ PODS: - boost-for-react-native - DoubleConversion - glog - - RCTRequired (0.63.35) - - RCTTypeSafety (0.63.35): - - FBLazyVector (= 0.63.35) - - RCT-Folly (= 2020.01.13.00) - - RCTRequired (= 0.63.35) - - React-Core (= 0.63.35) - - React (0.63.35): - - React-Core (= 0.63.35) - - React-Core/DevSupport (= 0.63.35) - - React-Core/RCTWebSocket (= 0.63.35) - - React-RCTActionSheet (= 0.63.35) - - React-RCTAnimation (= 0.63.35) - - React-RCTBlob (= 0.63.35) - - React-RCTImage (= 0.63.35) - - React-RCTLinking (= 0.63.35) - - React-RCTNetwork (= 0.63.35) - - React-RCTSettings (= 0.63.35) - - React-RCTText (= 0.63.35) - - React-RCTVibration (= 0.63.35) - - React-ART (0.63.35): - - React-Core/ARTHeaders (= 0.63.35) - - React-callinvoker (0.63.35) - - React-Core (0.63.35): + - RCTRequired (0.63.36) + - RCTTypeSafety (0.63.36): + - FBLazyVector (= 0.63.36) + - RCT-Folly (= 2020.01.13.00) + - RCTRequired (= 0.63.36) + - React-Core (= 0.63.36) + - React (0.63.36): + - React-Core (= 0.63.36) + - React-Core/DevSupport (= 0.63.36) + - React-Core/RCTWebSocket (= 0.63.36) + - React-RCTActionSheet (= 0.63.36) + - React-RCTAnimation (= 0.63.36) + - React-RCTBlob (= 0.63.36) + - React-RCTImage (= 0.63.36) + - React-RCTLinking (= 0.63.36) + - React-RCTNetwork (= 0.63.36) + - React-RCTSettings (= 0.63.36) + - React-RCTText (= 0.63.36) + - React-RCTVibration (= 0.63.36) + - React-ART (0.63.36): + - React-Core/ARTHeaders (= 0.63.36) + - React-callinvoker (0.63.36) + - React-Core (0.63.36): - glog - RCT-Folly (= 2020.01.13.00) - - React-Core/Default (= 0.63.35) - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - React-jsiexecutor (= 0.63.35) + - React-Core/Default (= 0.63.36) + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - React-jsiexecutor (= 0.63.36) - Yoga - - React-Core/ARTHeaders (0.63.35): + - React-Core/ARTHeaders (0.63.36): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - React-jsiexecutor (= 0.63.35) + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - React-jsiexecutor (= 0.63.36) - Yoga - - React-Core/CoreModulesHeaders (0.63.35): + - React-Core/CoreModulesHeaders (0.63.36): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - React-jsiexecutor (= 0.63.35) + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - React-jsiexecutor (= 0.63.36) - Yoga - - React-Core/Default (0.63.35): + - React-Core/Default (0.63.36): - glog - RCT-Folly (= 2020.01.13.00) - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - React-jsiexecutor (= 0.63.35) + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - React-jsiexecutor (= 0.63.36) - Yoga - - React-Core/DevSupport (0.63.35): + - React-Core/DevSupport (0.63.36): - glog - RCT-Folly (= 2020.01.13.00) - - React-Core/Default (= 0.63.35) - - React-Core/RCTWebSocket (= 0.63.35) - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - React-jsiexecutor (= 0.63.35) - - React-jsinspector (= 0.63.35) + - React-Core/Default (= 0.63.36) + - React-Core/RCTWebSocket (= 0.63.36) + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - React-jsiexecutor (= 0.63.36) + - React-jsinspector (= 0.63.36) - Yoga - - React-Core/RCTActionSheetHeaders (0.63.35): + - React-Core/RCTActionSheetHeaders (0.63.36): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - React-jsiexecutor (= 0.63.35) + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - React-jsiexecutor (= 0.63.36) - Yoga - - React-Core/RCTAnimationHeaders (0.63.35): + - React-Core/RCTAnimationHeaders (0.63.36): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - React-jsiexecutor (= 0.63.35) + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - React-jsiexecutor (= 0.63.36) - Yoga - - React-Core/RCTBlobHeaders (0.63.35): + - React-Core/RCTBlobHeaders (0.63.36): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - React-jsiexecutor (= 0.63.35) + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - React-jsiexecutor (= 0.63.36) - Yoga - - React-Core/RCTImageHeaders (0.63.35): + - React-Core/RCTImageHeaders (0.63.36): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - React-jsiexecutor (= 0.63.35) + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - React-jsiexecutor (= 0.63.36) - Yoga - - React-Core/RCTLinkingHeaders (0.63.35): + - React-Core/RCTLinkingHeaders (0.63.36): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - React-jsiexecutor (= 0.63.35) + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - React-jsiexecutor (= 0.63.36) - Yoga - - React-Core/RCTNetworkHeaders (0.63.35): + - React-Core/RCTNetworkHeaders (0.63.36): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - React-jsiexecutor (= 0.63.35) + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - React-jsiexecutor (= 0.63.36) - Yoga - - React-Core/RCTPushNotificationHeaders (0.63.35): + - React-Core/RCTPushNotificationHeaders (0.63.36): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - React-jsiexecutor (= 0.63.35) + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - React-jsiexecutor (= 0.63.36) - Yoga - - React-Core/RCTSettingsHeaders (0.63.35): + - React-Core/RCTSettingsHeaders (0.63.36): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - React-jsiexecutor (= 0.63.35) + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - React-jsiexecutor (= 0.63.36) - Yoga - - React-Core/RCTTextHeaders (0.63.35): + - React-Core/RCTTextHeaders (0.63.36): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - React-jsiexecutor (= 0.63.35) + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - React-jsiexecutor (= 0.63.36) - Yoga - - React-Core/RCTVibrationHeaders (0.63.35): + - React-Core/RCTVibrationHeaders (0.63.36): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - React-jsiexecutor (= 0.63.35) + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - React-jsiexecutor (= 0.63.36) - Yoga - - React-Core/RCTWebSocket (0.63.35): + - React-Core/RCTWebSocket (0.63.36): - glog - RCT-Folly (= 2020.01.13.00) - - React-Core/Default (= 0.63.35) - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - React-jsiexecutor (= 0.63.35) + - React-Core/Default (= 0.63.36) + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - React-jsiexecutor (= 0.63.36) - Yoga - - React-CoreModules (0.63.35): - - FBReactNativeSpec (= 0.63.35) - - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.35) - - React-Core/CoreModulesHeaders (= 0.63.35) - - React-jsi (= 0.63.35) - - React-RCTImage (= 0.63.35) - - ReactCommon/turbomodule/core (= 0.63.35) - - React-cxxreact (0.63.35): + - React-CoreModules (0.63.36): + - FBReactNativeSpec (= 0.63.36) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.36) + - React-Core/CoreModulesHeaders (= 0.63.36) + - React-jsi (= 0.63.36) + - React-RCTImage (= 0.63.36) + - ReactCommon/turbomodule/core (= 0.63.36) + - React-cxxreact (0.63.36): - boost-for-react-native (= 1.63.0) - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-callinvoker (= 0.63.35) - - React-jsinspector (= 0.63.35) - - React-jsi (0.63.35): + - React-callinvoker (= 0.63.36) + - React-jsinspector (= 0.63.36) + - React-jsi (0.63.36): - boost-for-react-native (= 1.63.0) - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-jsi/Default (= 0.63.35) - - React-jsi/Default (0.63.35): + - React-jsi/Default (= 0.63.36) + - React-jsi/Default (0.63.36): - boost-for-react-native (= 1.63.0) - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-jsiexecutor (0.63.35): + - React-jsiexecutor (0.63.36): - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - React-jsinspector (0.63.35) - - React-RCTActionSheet (0.63.35): - - React-Core/RCTActionSheetHeaders (= 0.63.35) - - React-RCTAnimation (0.63.35): - - FBReactNativeSpec (= 0.63.35) - - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.35) - - React-Core/RCTAnimationHeaders (= 0.63.35) - - React-jsi (= 0.63.35) - - ReactCommon/turbomodule/core (= 0.63.35) - - React-RCTBlob (0.63.35): - - FBReactNativeSpec (= 0.63.35) - - RCT-Folly (= 2020.01.13.00) - - React-Core/RCTBlobHeaders (= 0.63.35) - - React-Core/RCTWebSocket (= 0.63.35) - - React-jsi (= 0.63.35) - - React-RCTNetwork (= 0.63.35) - - ReactCommon/turbomodule/core (= 0.63.35) - - React-RCTImage (0.63.35): - - FBReactNativeSpec (= 0.63.35) - - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.35) - - React-Core/RCTImageHeaders (= 0.63.35) - - React-jsi (= 0.63.35) - - React-RCTNetwork (= 0.63.35) - - ReactCommon/turbomodule/core (= 0.63.35) - - React-RCTLinking (0.63.35): - - FBReactNativeSpec (= 0.63.35) - - React-Core/RCTLinkingHeaders (= 0.63.35) - - React-jsi (= 0.63.35) - - ReactCommon/turbomodule/core (= 0.63.35) - - React-RCTNetwork (0.63.35): - - FBReactNativeSpec (= 0.63.35) - - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.35) - - React-Core/RCTNetworkHeaders (= 0.63.35) - - React-jsi (= 0.63.35) - - ReactCommon/turbomodule/core (= 0.63.35) - - React-RCTPushNotification (0.63.35): - - FBReactNativeSpec (= 0.63.35) - - RCTTypeSafety (= 0.63.35) - - React-Core/RCTPushNotificationHeaders (= 0.63.35) - - React-jsi (= 0.63.35) - - ReactCommon/turbomodule/core (= 0.63.35) - - React-RCTSettings (0.63.35): - - FBReactNativeSpec (= 0.63.35) - - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.35) - - React-Core/RCTSettingsHeaders (= 0.63.35) - - React-jsi (= 0.63.35) - - ReactCommon/turbomodule/core (= 0.63.35) - - React-RCTTest (0.63.35): - - RCT-Folly (= 2020.01.13.00) - - React-Core (= 0.63.35) - - React-CoreModules (= 0.63.35) - - React-jsi (= 0.63.35) - - ReactCommon/turbomodule/core (= 0.63.35) - - React-RCTText (0.63.35): - - React-Core/RCTTextHeaders (= 0.63.35) - - React-RCTVibration (0.63.35): - - FBReactNativeSpec (= 0.63.35) - - RCT-Folly (= 2020.01.13.00) - - React-Core/RCTVibrationHeaders (= 0.63.35) - - React-jsi (= 0.63.35) - - ReactCommon/turbomodule/core (= 0.63.35) - - React-TurboModuleCxx-RNW (0.63.35): - - RCT-Folly (= 2020.01.13.00) - - React-callinvoker (= 0.63.35) - - React-TurboModuleCxx-WinRTPort (= 0.63.35) - - ReactCommon/turbomodule/core (= 0.63.35) - - React-TurboModuleCxx-WinRTPort (0.63.35): - - React-TurboModuleCxx-WinRTPort/Shared (= 0.63.35) - - React-TurboModuleCxx-WinRTPort/WinRT (= 0.63.35) - - React-TurboModuleCxx-WinRTPort/Shared (0.63.35) - - React-TurboModuleCxx-WinRTPort/WinRT (0.63.35): - - React-callinvoker (= 0.63.35) - - React-TurboModuleCxx-WinRTPort/Shared (= 0.63.35) - - ReactCommon/turbomodule/core (0.63.35): + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - React-jsinspector (0.63.36) + - React-RCTActionSheet (0.63.36): + - React-Core/RCTActionSheetHeaders (= 0.63.36) + - React-RCTAnimation (0.63.36): + - FBReactNativeSpec (= 0.63.36) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.36) + - React-Core/RCTAnimationHeaders (= 0.63.36) + - React-jsi (= 0.63.36) + - ReactCommon/turbomodule/core (= 0.63.36) + - React-RCTBlob (0.63.36): + - FBReactNativeSpec (= 0.63.36) + - RCT-Folly (= 2020.01.13.00) + - React-Core/RCTBlobHeaders (= 0.63.36) + - React-Core/RCTWebSocket (= 0.63.36) + - React-jsi (= 0.63.36) + - React-RCTNetwork (= 0.63.36) + - ReactCommon/turbomodule/core (= 0.63.36) + - React-RCTImage (0.63.36): + - FBReactNativeSpec (= 0.63.36) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.36) + - React-Core/RCTImageHeaders (= 0.63.36) + - React-jsi (= 0.63.36) + - React-RCTNetwork (= 0.63.36) + - ReactCommon/turbomodule/core (= 0.63.36) + - React-RCTLinking (0.63.36): + - FBReactNativeSpec (= 0.63.36) + - React-Core/RCTLinkingHeaders (= 0.63.36) + - React-jsi (= 0.63.36) + - ReactCommon/turbomodule/core (= 0.63.36) + - React-RCTNetwork (0.63.36): + - FBReactNativeSpec (= 0.63.36) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.36) + - React-Core/RCTNetworkHeaders (= 0.63.36) + - React-jsi (= 0.63.36) + - ReactCommon/turbomodule/core (= 0.63.36) + - React-RCTPushNotification (0.63.36): + - FBReactNativeSpec (= 0.63.36) + - RCTTypeSafety (= 0.63.36) + - React-Core/RCTPushNotificationHeaders (= 0.63.36) + - React-jsi (= 0.63.36) + - ReactCommon/turbomodule/core (= 0.63.36) + - React-RCTSettings (0.63.36): + - FBReactNativeSpec (= 0.63.36) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.36) + - React-Core/RCTSettingsHeaders (= 0.63.36) + - React-jsi (= 0.63.36) + - ReactCommon/turbomodule/core (= 0.63.36) + - React-RCTTest (0.63.36): + - RCT-Folly (= 2020.01.13.00) + - React-Core (= 0.63.36) + - React-CoreModules (= 0.63.36) + - React-jsi (= 0.63.36) + - ReactCommon/turbomodule/core (= 0.63.36) + - React-RCTText (0.63.36): + - React-Core/RCTTextHeaders (= 0.63.36) + - React-RCTVibration (0.63.36): + - FBReactNativeSpec (= 0.63.36) + - RCT-Folly (= 2020.01.13.00) + - React-Core/RCTVibrationHeaders (= 0.63.36) + - React-jsi (= 0.63.36) + - ReactCommon/turbomodule/core (= 0.63.36) + - React-TurboModuleCxx-RNW (0.63.36): + - RCT-Folly (= 2020.01.13.00) + - React-callinvoker (= 0.63.36) + - React-TurboModuleCxx-WinRTPort (= 0.63.36) + - ReactCommon/turbomodule/core (= 0.63.36) + - React-TurboModuleCxx-WinRTPort (0.63.36): + - React-TurboModuleCxx-WinRTPort/Shared (= 0.63.36) + - React-TurboModuleCxx-WinRTPort/WinRT (= 0.63.36) + - React-TurboModuleCxx-WinRTPort/Shared (0.63.36) + - React-TurboModuleCxx-WinRTPort/WinRT (0.63.36): + - React-callinvoker (= 0.63.36) + - React-TurboModuleCxx-WinRTPort/Shared (= 0.63.36) + - ReactCommon/turbomodule/core (0.63.36): - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-callinvoker (= 0.63.35) - - React-Core (= 0.63.35) - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - ReactCommon/turbomodule/samples (0.63.35): + - React-callinvoker (= 0.63.36) + - React-Core (= 0.63.36) + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - ReactCommon/turbomodule/samples (0.63.36): - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-callinvoker (= 0.63.35) - - React-Core (= 0.63.35) - - React-cxxreact (= 0.63.35) - - React-jsi (= 0.63.35) - - ReactCommon/turbomodule/core (= 0.63.35) + - React-callinvoker (= 0.63.36) + - React-Core (= 0.63.36) + - React-cxxreact (= 0.63.36) + - React-jsi (= 0.63.36) + - ReactCommon/turbomodule/core (= 0.63.36) - Yoga (1.14.0) - - YogaKit (1.18.1): - - Yoga (~> 1.14) DEPENDENCIES: - boost-for-react-native (from `../third-party-podspecs/boost-for-react-native.podspec`) - DoubleConversion (from `../third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../Libraries/FBLazyVector`) - FBReactNativeSpec (from `../Libraries/FBReactNativeSpec`) - - Flipper (~> 0.75.1) - - Flipper-DoubleConversion (= 1.1.7) - - Flipper-Folly (~> 2.5) - - Flipper-Glog (= 0.3.6) - - Flipper-PeerTalk (~> 0.0.4) - - Flipper-RSocket (~> 1.3) - - FlipperKit (~> 0.75.1) - - FlipperKit/Core (~> 0.75.1) - - FlipperKit/CppBridge (~> 0.75.1) - - FlipperKit/FBCxxFollyDynamicConvert (~> 0.75.1) - - FlipperKit/FBDefines (~> 0.75.1) - - FlipperKit/FKPortForwarding (~> 0.75.1) - - FlipperKit/FlipperKitHighlightOverlay (~> 0.75.1) - - FlipperKit/FlipperKitLayoutPlugin (~> 0.75.1) - - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.75.1) - - FlipperKit/FlipperKitNetworkPlugin (~> 0.75.1) - - FlipperKit/FlipperKitReactPlugin (~> 0.75.1) - - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.75.1) - - FlipperKit/SKIOSNetworkPlugin (~> 0.75.1) - glog (from `../third-party-podspecs/glog.podspec`) - RCT-Folly (from `../third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../Libraries/RCTRequired`) @@ -408,22 +335,6 @@ DEPENDENCIES: - ReactCommon/turbomodule/samples (from `../ReactCommon`) - Yoga (from `../ReactCommon/yoga`) -SPEC REPOS: - trunk: - - CocoaAsyncSocket - - Flipper - - Flipper-Boost-iOSX - - Flipper-DoubleConversion - - Flipper-Fmt - - Flipper-Folly - - Flipper-Glog - - Flipper-PeerTalk - - Flipper-RSocket - - FlipperKit - - libevent - - OpenSSL-Universal - - YogaKit - EXTERNAL SOURCES: boost-for-react-native: :podspec: "../third-party-podspecs/boost-for-react-native.podspec" @@ -492,51 +403,38 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: dabda8622e76020607c2ae1e65cc0cda8b61479d - CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 56a44bcfd14ab2ff66f5a146b2e875eb4b69b19b - FBLazyVector: 9276b61136f589d7d6d06582d64339cce2c4af76 - FBReactNativeSpec: 4024e06c6b67b86a85131214dfd2c013b7fc5883 - Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021 - Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c - Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 - Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b - Flipper-Folly: 83af37379faa69497529e414bd43fbfc7cae259a - Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 - Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 - FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00 + FBLazyVector: 0a9070829baaf7af315d4b85e992f24315ee0588 + FBReactNativeSpec: e41705afe0a17d636081a7c077d34caf205ca13d glog: 1cb7c408c781ae8f35bbababe459b45e3dee4ec1 - libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b RCT-Folly: 1347093ffe75e152d846f7e45a3ef901b60021aa - RCTRequired: 5c1d81e7e475dc1a245ed626e480a3d479086416 - RCTTypeSafety: a526a16a85a8ae4cf577811a178c89bbd05e6196 - React: a78ac2c6311ff96c2486cee60586f0a76104ab7b - React-ART: dd31de92a6afd311fd95415610bbd45f3fa655a6 - React-callinvoker: 8afe157bbafcf22a6ab002fbf7a9eedbe7e9206b - React-Core: e40d4122e87c73ed14c02ce6516032d964f02e4b - React-CoreModules: 966153891095c20269a143d43c307c18e64ef97a - React-cxxreact: 9ce5eb91cf7fe4e8800bab89dbe4585ed12189e8 - React-jsi: 20679e5af89625fc064438e38ecea0afa2a4a8f4 - React-jsiexecutor: a9bfadb3f21e146d5b00b6e4b142d60861505431 - React-jsinspector: 4ca898a545d102557f01edb0478e529631bedf21 - React-RCTActionSheet: 1affae330807ac51ac54b3320cdf3719c4b490a9 - React-RCTAnimation: f46fec66717c6ca7ff4e148ab6f480b3c66c21c7 - React-RCTBlob: 9b226256ff05b96965ed2260fc02e8d4a95af44f - React-RCTImage: 1793ff8d1f40d884289c9dc16fe2fbac26c15828 - React-RCTLinking: 66bce797f25b722007f32b6bd9f95647dbec53a1 - React-RCTNetwork: 419e10fb0feb663c146e142fd7ad17dbe3f0e1b7 - React-RCTPushNotification: 33540ff2428d4209b1cefa631af85f7d458675c2 - React-RCTSettings: dc71374b4a501548e510fa7de20fb98a6c38b3e2 - React-RCTTest: 92ada192b37f7df8211549931e7e548db22d6083 - React-RCTText: 41810612d6c9b429bfafbb59e8238bb702132532 - React-RCTVibration: 841a6aa4662f1b369186e73eedcaa1f83f95d4c1 - React-TurboModuleCxx-RNW: 58055dfe02390e97a0afe4da62e252d05d126106 - React-TurboModuleCxx-WinRTPort: 94b7d0fe6c5b12a4ef8064f71ce1728dee424c6b - ReactCommon: 6a4cc0420a81d73b144d304a194a52c8ede472b3 - Yoga: 2f768e565b91d1e3a9d09bf741458623edeef42d - YogaKit: f782866e155069a2cca2517aafea43200b01fd5a + RCTRequired: f84e12b899c38552d6a29f143cd45e2457d8b291 + RCTTypeSafety: 8eeb4763b9abca903bee88705b1c9d49d1793751 + React: 39d7e85e83660b53e35a0992b8c7e02069786df2 + React-ART: 561a1e919496413fb294826133737eb870a7ad58 + React-callinvoker: b17367fc9df0be66f294a7d9f216f6e7fee0bdc3 + React-Core: 7d5192635b2a1e339ece8568f6d28822b5692b07 + React-CoreModules: 743a1e48d6f4c122865ad4d5ef9e4d5b5c959b8f + React-cxxreact: 94f493f48dea13e07ffb8ea202db49adad4c15ac + React-jsi: 6b7c2a4bf424c349d54de60388f4df6f06b42b3b + React-jsiexecutor: f4b3fdea0937ad930eec939e49341a26ae181240 + React-jsinspector: 7237cfc1cea329713ee5079d824f6f73d8a84c21 + React-RCTActionSheet: 2590694b11874f5e4557925b44602944e57dbde0 + React-RCTAnimation: 5b2544feae919c11a0979c08cd85cef00029073b + React-RCTBlob: 633728c1c1a88bfb9a940188077e58e6e8224d28 + React-RCTImage: 6aa8710e711c564fa5753dafd04cfd2b41b98bc7 + React-RCTLinking: cdcd75833512de57b527c15d4c0c0204d76071c8 + React-RCTNetwork: 4b93b2006a32825cc80d7deda1f0c9454dcff921 + React-RCTPushNotification: c699ecea3b6ebea35a3e044c3cafc77e270b3dab + React-RCTSettings: ff204d18857b0b8b8dd2f186db2ce2fead4a20d7 + React-RCTTest: 58e08366c31ebb2a454744bdef3bbab3705eb987 + React-RCTText: b5613f3b26ce07497fbcb0f4c8496c1c4fcb3405 + React-RCTVibration: e5464e5e9dd67b4f5c6983046be2e941708343f8 + React-TurboModuleCxx-RNW: 481ef80f9ddf8ecf9b978cdcbc88ee4bbaf1fd27 + React-TurboModuleCxx-WinRTPort: 0b139fe2e5dbf76ae7ef419d1ec339bc0b4058d1 + ReactCommon: 85b3897abcb25a478b26cda3154a51fb56f405d2 + Yoga: f2da5366fe2be821a64c84a2e455042eab763cf5 -PODFILE CHECKSUM: 5778caa6b51e058eeab6b9d1c539074c087ef830 +PODFILE CHECKSUM: dbdccdd110aedfbfec53a1685103e6291c57a217 COCOAPODS: 1.10.1 diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm index a278d8e6a80d72..88606802a31664 100644 --- a/React/CxxBridge/RCTCxxBridge.mm +++ b/React/CxxBridge/RCTCxxBridge.mm @@ -594,9 +594,7 @@ - (void)_initializeBridge:(std::shared_ptr)executorFactory // This can only be false if the bridge was invalidated before startup completed if (_reactInstance) { #if RCT_DEV - if ([[self devSettings] isDevModeEnabled]) { // TODO(OSS Candidate ISS#2710739) executorFactory = std::make_shared(self, executorFactory); - } // TODO(OSS Candidate ISS#2710739) #endif [self _initializeBridgeLocked:executorFactory];