From aafbe25b40ccbdcd279673e92875f4b81ea3068c Mon Sep 17 00:00:00 2001 From: HeyImChris <48299693+HeyImChris@users.noreply.github.com> Date: Fri, 28 May 2021 13:43:16 -0700 Subject: [PATCH 1/2] Check a nil URL to fix crashes connecting to socket (#785) * Update RCTCxxBridge.mm * Update RCTCxxBridge.mm * nil check websocket URL * use RCTAssertParam Co-authored-by: Chris Hogan --- RNTester/Podfile.lock | 69 +++++++++++++------------ React/CoreModules/RCTWebSocketModule.mm | 59 +++++++++++---------- 2 files changed, 66 insertions(+), 62 deletions(-) diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index bf39ac478dcf85..242dbff3aa662e 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -470,47 +470,48 @@ EXTERNAL SOURCES: :path: "../ReactCommon/yoga" SPEC CHECKSUMS: - boost-for-react-native: a110407d9db2642fd2e1bcd7c5a51c81f2521dc9 - CocoaAsyncSocket: eafaa68a7e0ec99ead0a7b35015e0bf25d2c8987 + boost-for-react-native: dabda8622e76020607c2ae1e65cc0cda8b61479d + CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f - DoubleConversion: 2b45d0f8e156a5b02354c8a4062de64d41ccb4e0 - FBLazyVector: af14bce4bde162174ef634fdd5e0928c15e338f8 - FBReactNativeSpec: 41d7647372edefda5e5599de0662c9fe25ee5958 - Flipper: 10b225e352595f521be0e5badddd90e241336e89 + DoubleConversion: 56a44bcfd14ab2ff66f5a146b2e875eb4b69b19b + FBLazyVector: bc5ce150e5f4749f5f01d37799f15c27e1e6954a + FBReactNativeSpec: a0c81b3a79e747f9adfd098603d1a4b29ce9ce06 + Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3 Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7 - FlipperKit: 88b7f0d0cf907ddc2137b85eeb7f3d4d8d9395c8 - glog: 789873d01e4b200777d0a09bc23d548446758699 - hermes: e6c81c75290bb87d1d62d594c269fba09b84e216 - libevent: 59938c595b8c19e50c83250628ffed9ebf662183 + FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d + glog: 1cb7c408c781ae8f35bbababe459b45e3dee4ec1 OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 - RCT-Folly: 71ece0166f9c96c1ec9279eeb0317baf533c020f - RCTRequired: 04260af7d12f63e95eb0a0e5d85545dd390995e8 - RCTTypeSafety: 81a87067784bc5d1d4fc8253acdb46d246a92d6f - React: f5caf53b844efe074af65af6ae0ffd1424f9f1f5 - React-ART: dfdb6677ef8c8e36dbd6e6c65136be65d7fbacce - React-Core: 37f096fff3a455c65ced609f71d196d7a0621843 - React-CoreModules: 4c065aa34c7eae5e5b27deb6061c8f4e3293c36f - React-cxxreact: e0048745e75cdfd4cccca30e9ad009c68b92641c - React-jsi: c29154f327aa8f161b0d49f47b3be9951ad14d8a - React-jsiexecutor: fac476aa802ce09ab5baa3eccfc62582e5f75f7e - React-jsinspector: cc8306b309a63d464c4f9ebce503e788e77175b4 - React-RCTActionSheet: 35368558c88059d94ff04b0ea71ae1ea8f26a99e - React-RCTAnimation: 665d5ad9467d6975d83f9104be2736bc514191cc - React-RCTBlob: 8a62b6457108bdb1f847db3526193e986f7ae4da - React-RCTImage: 2abdb57456bed623f8e21f061954ee34cb2a08c0 - React-RCTLinking: d776ae4e93565be6aeca4cc8e60e5b8e04608f44 - React-RCTNetwork: ca08efe17eeab8d12406584d852eea7e36c8862d - React-RCTPushNotification: 19e18d7639be38f41b87ef8ae2dc110ad915eb49 - React-RCTSettings: 0009501d88edfd210bab7e786b9773f5ad873527 - React-RCTTest: f68bbdc7c303a2a3e4dc0eb42e4b2e406082903f - React-RCTText: e37c8b352707dfa6a04c6f0cd0a9e9a26d12d8e8 - React-RCTVibration: 40831b853a24aea4a3b1ce4ccd42d7b1f8bf2bf3 - ReactCommon: 0e7f6258a805ddfab59c50953b36ad604cf9d07c - Yoga: 2e32b754931e78f1c1b8e3811c9af82642e41907 + RCT-Folly: 1347093ffe75e152d846f7e45a3ef901b60021aa + RCTRequired: d384d06f7e53728a53805be0caaf22a93fcde73a + RCTTypeSafety: 5e8c2f0a47235842a6f337f8e3fb185180d84ac2 + React: 18243df9102151ea132f439ea47ddfb9788e63c7 + React-ART: 154dc27c84916c491f0eb89aa1a79305fa2e99e6 + React-callinvoker: a3dfac3d6e6a8b83a93493dd279d3c6fb2edb419 + React-Core: c2e49caa4fcf01f490b3e1b276a6c026b515dcee + React-CoreModules: b460bbc3f043214690d9a17f5dd5e03eff31126b + React-cxxreact: 41106ebea02f25ce640f420a971b7728d79e5d26 + React-jsi: 4ebe6a54d45ba9a5338095def75ac3beaf3ed7d3 + React-jsiexecutor: 4a44e1a5e1738fd0439726640d0cabaabcb3d128 + React-jsinspector: 907d9d65b09befdba89a6591adef95b3a4410cb3 + React-RCTActionSheet: 9b222cc72c0bdbbd44bd0c398232d3ca20ccd420 + React-RCTAnimation: 8d4428f176f38b2971e5398ce107c2f7efa98432 + React-RCTBlob: 318d4effcfcdd3fd32b04c8fa5ec6b0da775feae + React-RCTImage: f77fafd8cbbd30a4cf4d4456dc8bcc2f90eec0cc + React-RCTLinking: 87f6cd391ea3ecfe2da3b6f04e4854adc0ea49c9 + React-RCTNetwork: 102d90bddc6e2ab4219fb0a3f89caef41bc1ec8e + React-RCTPushNotification: 33e82afd091b57346fae543f58b6e50888f9b5fb + React-RCTSettings: 044f86e429aa090c93889ddeef91a13e71b9e640 + React-RCTTest: e2b466e0b7cbf86f7e2b31e0022794cea35dd7e5 + React-RCTText: 39df635fcdb466b241d0a10628c4eb6fb4f67105 + React-RCTVibration: f71776f50d657b3ab995760294c2a583704f488f + React-TurboModuleCxx-RNW: 18bb71af41fe34c8b12a56bef60aae7ee32b0817 + React-TurboModuleCxx-WinRTPort: 2240282b245810a346372e696882500001be27dd + ReactCommon: ae64bcd07d789b2712c5cc99cefb2a5cdcc393e7 + Yoga: fd91a8b9c1ea7169c8987bc11af13e376112097a YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 8a50297c26ad9d948d1614b33e20d755094cb377 diff --git a/React/CoreModules/RCTWebSocketModule.mm b/React/CoreModules/RCTWebSocketModule.mm index 06734d324ccf6b..70a109f990672e 100644 --- a/React/CoreModules/RCTWebSocketModule.mm +++ b/React/CoreModules/RCTWebSocketModule.mm @@ -66,37 +66,40 @@ - (void)invalidate RCT_EXPORT_METHOD(connect:(NSURL *)URL protocols:(NSArray *)protocols options:(JS::NativeWebSocketModule::SpecConnectOptions &)options socketID:(double)socketID) { - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL]; - - // We load cookies from sharedHTTPCookieStorage (shared with XHR and - // fetch). To get secure cookies for wss URLs, replace wss with https - // in the URL. - NSURLComponents *components = [NSURLComponents componentsWithURL:URL resolvingAgainstBaseURL:true]; - if ([components.scheme.lowercaseString isEqualToString:@"wss"]) { - components.scheme = @"https"; - } + RCTAssertParam(URL); // TODO: GH#774, prevent crashes when URL is erroneously nil + if (URL != nil) { // TODO: GH#774, prevent crashes when URL is erroneously nil + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL]; + + // We load cookies from sharedHTTPCookieStorage (shared with XHR and + // fetch). To get secure cookies for wss URLs, replace wss with https + // in the URL. + NSURLComponents *components = [NSURLComponents componentsWithURL:URL resolvingAgainstBaseURL:true]; + if ([components.scheme.lowercaseString isEqualToString:@"wss"]) { + components.scheme = @"https"; + } - // Load and set the cookie header. - NSArray *cookies = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:components.URL]; - request.allHTTPHeaderFields = [NSHTTPCookie requestHeaderFieldsWithCookies:cookies]; + // Load and set the cookie header. + NSArray *cookies = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:components.URL]; + request.allHTTPHeaderFields = [NSHTTPCookie requestHeaderFieldsWithCookies:cookies]; - // Load supplied headers - if ([options.headers() isKindOfClass:NSDictionary.class]) { - NSDictionary *headers = (NSDictionary *)options.headers(); - [headers enumerateKeysAndObjectsUsingBlock:^(NSString *key, id value, BOOL *stop) { - [request addValue:[RCTConvert NSString:value] forHTTPHeaderField:key]; - }]; - } + // Load supplied headers + if ([options.headers() isKindOfClass:NSDictionary.class]) { + NSDictionary *headers = (NSDictionary *)options.headers(); + [headers enumerateKeysAndObjectsUsingBlock:^(NSString *key, id value, BOOL *stop) { + [request addValue:[RCTConvert NSString:value] forHTTPHeaderField:key]; + }]; + } - RCTSRWebSocket *webSocket = [[RCTSRWebSocket alloc] initWithURLRequest:request protocols:protocols]; - [webSocket setDelegateDispatchQueue:[self methodQueue]]; - webSocket.delegate = self; - webSocket.reactTag = @(socketID); - if (!_sockets) { - _sockets = [NSMutableDictionary new]; - } - _sockets[@(socketID)] = webSocket; - [webSocket open]; + RCTSRWebSocket *webSocket = [[RCTSRWebSocket alloc] initWithURLRequest:request protocols:protocols]; + [webSocket setDelegateDispatchQueue:[self methodQueue]]; + webSocket.delegate = self; + webSocket.reactTag = @(socketID); + if (!_sockets) { + _sockets = [NSMutableDictionary new]; + } + _sockets[@(socketID)] = webSocket; + [webSocket open]; + } // TODO: GH#774, prevent crashes when URL is erroneously nil } RCT_EXPORT_METHOD(send:(NSString *)message forSocketID:(double)socketID) From f27925515c3960284a06f4ba48e5a27a0ce09a9a Mon Sep 17 00:00:00 2001 From: Chris Hogan Date: Fri, 28 May 2021 13:49:08 -0700 Subject: [PATCH 2/2] disable hermes --- RNTester/Podfile | 2 +- RNTester/Podfile.lock | 449 ++++++++---------- .../RNTesterPods.xcodeproj/project.pbxproj | 18 - 3 files changed, 212 insertions(+), 257 deletions(-) diff --git a/RNTester/Podfile b/RNTester/Podfile index 04f0b4304c0803..d81e6436a77f5b 100644 --- a/RNTester/Podfile +++ b/RNTester/Podfile @@ -81,7 +81,7 @@ end target 'RNTester-macOS' do platform :osx, '10.13' - pods(:hermes_enabled => true) + pods(:hermes_enabled => false) end target 'RNTesterUnitTests' do diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index 242dbff3aa662e..66206cafb91665 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.32) - - FBReactNativeSpec (0.62.32): - - RCT-Folly (= 2018.10.22.00) - - RCTRequired (= 0.62.32) - - RCTTypeSafety (= 0.62.32) - - React-Core (= 0.62.32) - - React-jsi (= 0.62.32) - - ReactCommon/turbomodule/core (= 0.62.32) + - FBLazyVector (0.62.34) + - FBReactNativeSpec (0.62.34): + - RCT-Folly (= 2018.10.22.00) + - RCTRequired (= 0.62.34) + - RCTTypeSafety (= 0.62.34) + - React-Core (= 0.62.34) + - React-jsi (= 0.62.34) + - ReactCommon/turbomodule/core (= 0.62.34) - Flipper (0.30.2): - Flipper-Folly (~> 2.1) - Flipper-RSocket (~> 1.0) @@ -58,9 +58,6 @@ PODS: - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - glog (0.3.5) - - hermes (0.4.3) - - libevent (2.1.11): - - libevent/core (= 2.1.11) - OpenSSL-Universal (1.0.2.19): - OpenSSL-Universal/Static (= 1.0.2.19) - OpenSSL-Universal/Static (1.0.2.19) @@ -73,277 +70,263 @@ PODS: - boost-for-react-native - DoubleConversion - glog - - RCT-Folly/Futures (2018.10.22.00): - - boost-for-react-native - - DoubleConversion - - glog - - libevent - - RCTRequired (0.62.32) - - RCTTypeSafety (0.62.32): - - FBLazyVector (= 0.62.32) - - RCT-Folly (= 2018.10.22.00) - - RCTRequired (= 0.62.32) - - React-Core (= 0.62.32) - - React (0.62.32): - - React-Core (= 0.62.32) - - React-Core/DevSupport (= 0.62.32) - - React-Core/RCTWebSocket (= 0.62.32) - - React-RCTActionSheet (= 0.62.32) - - React-RCTAnimation (= 0.62.32) - - React-RCTBlob (= 0.62.32) - - React-RCTImage (= 0.62.32) - - React-RCTLinking (= 0.62.32) - - React-RCTNetwork (= 0.62.32) - - React-RCTSettings (= 0.62.32) - - React-RCTText (= 0.62.32) - - React-RCTVibration (= 0.62.32) - - React-ART (0.62.32): - - React-Core/ARTHeaders (= 0.62.32) - - React-Core (0.62.32): + - RCTRequired (0.62.34) + - RCTTypeSafety (0.62.34): + - FBLazyVector (= 0.62.34) + - RCT-Folly (= 2018.10.22.00) + - RCTRequired (= 0.62.34) + - React-Core (= 0.62.34) + - React (0.62.34): + - React-Core (= 0.62.34) + - React-Core/DevSupport (= 0.62.34) + - React-Core/RCTWebSocket (= 0.62.34) + - React-RCTActionSheet (= 0.62.34) + - React-RCTAnimation (= 0.62.34) + - React-RCTBlob (= 0.62.34) + - React-RCTImage (= 0.62.34) + - React-RCTLinking (= 0.62.34) + - React-RCTNetwork (= 0.62.34) + - React-RCTSettings (= 0.62.34) + - React-RCTText (= 0.62.34) + - React-RCTVibration (= 0.62.34) + - React-ART (0.62.34): + - React-Core/ARTHeaders (= 0.62.34) + - React-Core (0.62.34): - glog - RCT-Folly (= 2018.10.22.00) - - React-Core/Default (= 0.62.32) - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - React-jsiexecutor (= 0.62.32) + - React-Core/Default (= 0.62.34) + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - React-jsiexecutor (= 0.62.34) - Yoga - - React-Core/ARTHeaders (0.62.32): + - React-Core/ARTHeaders (0.62.34): - glog - RCT-Folly (= 2018.10.22.00) - React-Core/Default - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - React-jsiexecutor (= 0.62.32) + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - React-jsiexecutor (= 0.62.34) - Yoga - - React-Core/CoreModulesHeaders (0.62.32): + - React-Core/CoreModulesHeaders (0.62.34): - glog - RCT-Folly (= 2018.10.22.00) - React-Core/Default - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - React-jsiexecutor (= 0.62.32) - - Yoga - - React-Core/Default (0.62.32): - - glog - - RCT-Folly (= 2018.10.22.00) - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - React-jsiexecutor (= 0.62.32) + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - React-jsiexecutor (= 0.62.34) - Yoga - - React-Core/DevSupport (0.62.32): + - React-Core/Default (0.62.34): - glog - RCT-Folly (= 2018.10.22.00) - - React-Core/Default (= 0.62.32) - - React-Core/RCTWebSocket (= 0.62.32) - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - React-jsiexecutor (= 0.62.32) - - React-jsinspector (= 0.62.32) + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - React-jsiexecutor (= 0.62.34) - Yoga - - React-Core/Hermes (0.62.32): + - React-Core/DevSupport (0.62.34): - glog - - hermes (~> 0.4.1) - RCT-Folly (= 2018.10.22.00) - - RCT-Folly/Futures - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - React-jsiexecutor (= 0.62.32) + - React-Core/Default (= 0.62.34) + - React-Core/RCTWebSocket (= 0.62.34) + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - React-jsiexecutor (= 0.62.34) + - React-jsinspector (= 0.62.34) - Yoga - - React-Core/RCTActionSheetHeaders (0.62.32): + - React-Core/RCTActionSheetHeaders (0.62.34): - glog - RCT-Folly (= 2018.10.22.00) - React-Core/Default - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - React-jsiexecutor (= 0.62.32) + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - React-jsiexecutor (= 0.62.34) - Yoga - - React-Core/RCTAnimationHeaders (0.62.32): + - React-Core/RCTAnimationHeaders (0.62.34): - glog - RCT-Folly (= 2018.10.22.00) - React-Core/Default - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - React-jsiexecutor (= 0.62.32) + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - React-jsiexecutor (= 0.62.34) - Yoga - - React-Core/RCTBlobHeaders (0.62.32): + - React-Core/RCTBlobHeaders (0.62.34): - glog - RCT-Folly (= 2018.10.22.00) - React-Core/Default - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - React-jsiexecutor (= 0.62.32) + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - React-jsiexecutor (= 0.62.34) - Yoga - - React-Core/RCTImageHeaders (0.62.32): + - React-Core/RCTImageHeaders (0.62.34): - glog - RCT-Folly (= 2018.10.22.00) - React-Core/Default - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - React-jsiexecutor (= 0.62.32) + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - React-jsiexecutor (= 0.62.34) - Yoga - - React-Core/RCTLinkingHeaders (0.62.32): + - React-Core/RCTLinkingHeaders (0.62.34): - glog - RCT-Folly (= 2018.10.22.00) - React-Core/Default - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - React-jsiexecutor (= 0.62.32) + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - React-jsiexecutor (= 0.62.34) - Yoga - - React-Core/RCTNetworkHeaders (0.62.32): + - React-Core/RCTNetworkHeaders (0.62.34): - glog - RCT-Folly (= 2018.10.22.00) - React-Core/Default - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - React-jsiexecutor (= 0.62.32) + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - React-jsiexecutor (= 0.62.34) - Yoga - - React-Core/RCTPushNotificationHeaders (0.62.32): + - React-Core/RCTPushNotificationHeaders (0.62.34): - glog - RCT-Folly (= 2018.10.22.00) - React-Core/Default - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - React-jsiexecutor (= 0.62.32) + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - React-jsiexecutor (= 0.62.34) - Yoga - - React-Core/RCTSettingsHeaders (0.62.32): + - React-Core/RCTSettingsHeaders (0.62.34): - glog - RCT-Folly (= 2018.10.22.00) - React-Core/Default - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - React-jsiexecutor (= 0.62.32) + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - React-jsiexecutor (= 0.62.34) - Yoga - - React-Core/RCTTextHeaders (0.62.32): + - React-Core/RCTTextHeaders (0.62.34): - glog - RCT-Folly (= 2018.10.22.00) - React-Core/Default - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - React-jsiexecutor (= 0.62.32) + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - React-jsiexecutor (= 0.62.34) - Yoga - - React-Core/RCTVibrationHeaders (0.62.32): + - React-Core/RCTVibrationHeaders (0.62.34): - glog - RCT-Folly (= 2018.10.22.00) - React-Core/Default - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - React-jsiexecutor (= 0.62.32) + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - React-jsiexecutor (= 0.62.34) - Yoga - - React-Core/RCTWebSocket (0.62.32): + - React-Core/RCTWebSocket (0.62.34): - glog - RCT-Folly (= 2018.10.22.00) - - React-Core/Default (= 0.62.32) - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - React-jsiexecutor (= 0.62.32) + - React-Core/Default (= 0.62.34) + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - React-jsiexecutor (= 0.62.34) - Yoga - - React-CoreModules (0.62.32): - - FBReactNativeSpec (= 0.62.32) - - RCT-Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.32) - - React-Core/CoreModulesHeaders (= 0.62.32) - - React-RCTImage (= 0.62.32) - - ReactCommon/turbomodule/core (= 0.62.32) - - React-cxxreact (0.62.32): + - React-CoreModules (0.62.34): + - FBReactNativeSpec (= 0.62.34) + - RCT-Folly (= 2018.10.22.00) + - RCTTypeSafety (= 0.62.34) + - React-Core/CoreModulesHeaders (= 0.62.34) + - React-RCTImage (= 0.62.34) + - ReactCommon/turbomodule/core (= 0.62.34) + - React-cxxreact (0.62.34): - boost-for-react-native (= 1.63.0) - DoubleConversion - glog - RCT-Folly (= 2018.10.22.00) - - React-jsinspector (= 0.62.32) - - React-jsi (0.62.32): + - React-jsinspector (= 0.62.34) + - React-jsi (0.62.34): - boost-for-react-native (= 1.63.0) - DoubleConversion - glog - RCT-Folly (= 2018.10.22.00) - - React-jsi/Default (= 0.62.32) - - React-jsi/Default (0.62.32): + - React-jsi/Default (= 0.62.34) + - React-jsi/Default (0.62.34): - boost-for-react-native (= 1.63.0) - DoubleConversion - glog - RCT-Folly (= 2018.10.22.00) - - React-jsiexecutor (0.62.32): + - React-jsiexecutor (0.62.34): - DoubleConversion - glog - RCT-Folly (= 2018.10.22.00) - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - React-jsinspector (0.62.32) - - React-RCTActionSheet (0.62.32): - - React-Core/RCTActionSheetHeaders (= 0.62.32) - - React-RCTAnimation (0.62.32): - - FBReactNativeSpec (= 0.62.32) - - RCT-Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.32) - - React-Core/RCTAnimationHeaders (= 0.62.32) - - ReactCommon/turbomodule/core (= 0.62.32) - - React-RCTBlob (0.62.32): - - FBReactNativeSpec (= 0.62.32) - - RCT-Folly (= 2018.10.22.00) - - React-Core/RCTBlobHeaders (= 0.62.32) - - React-Core/RCTWebSocket (= 0.62.32) - - React-jsi (= 0.62.32) - - React-RCTNetwork (= 0.62.32) - - ReactCommon/turbomodule/core (= 0.62.32) - - React-RCTImage (0.62.32): - - FBReactNativeSpec (= 0.62.32) - - RCT-Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.32) - - React-Core/RCTImageHeaders (= 0.62.32) - - React-RCTNetwork (= 0.62.32) - - ReactCommon/turbomodule/core (= 0.62.32) - - React-RCTLinking (0.62.32): - - FBReactNativeSpec (= 0.62.32) - - React-Core/RCTLinkingHeaders (= 0.62.32) - - ReactCommon/turbomodule/core (= 0.62.32) - - React-RCTNetwork (0.62.32): - - FBReactNativeSpec (= 0.62.32) - - RCT-Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.32) - - React-Core/RCTNetworkHeaders (= 0.62.32) - - ReactCommon/turbomodule/core (= 0.62.32) - - React-RCTPushNotification (0.62.32): - - FBReactNativeSpec (= 0.62.32) - - RCTTypeSafety (= 0.62.32) - - React-Core/RCTPushNotificationHeaders (= 0.62.32) - - ReactCommon/turbomodule/core (= 0.62.32) - - React-RCTSettings (0.62.32): - - FBReactNativeSpec (= 0.62.32) - - RCT-Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.32) - - React-Core/RCTSettingsHeaders (= 0.62.32) - - ReactCommon/turbomodule/core (= 0.62.32) - - React-RCTTest (0.62.32): - - React-Core (= 0.62.32) - - React-CoreModules (= 0.62.32) - - React-RCTText (0.62.32): - - React-Core/RCTTextHeaders (= 0.62.32) - - React-RCTVibration (0.62.32): - - FBReactNativeSpec (= 0.62.32) - - RCT-Folly (= 2018.10.22.00) - - React-Core/RCTVibrationHeaders (= 0.62.32) - - ReactCommon/turbomodule/core (= 0.62.32) - - ReactCommon/callinvoker (0.62.32): + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - React-jsinspector (0.62.34) + - React-RCTActionSheet (0.62.34): + - React-Core/RCTActionSheetHeaders (= 0.62.34) + - React-RCTAnimation (0.62.34): + - FBReactNativeSpec (= 0.62.34) + - RCT-Folly (= 2018.10.22.00) + - RCTTypeSafety (= 0.62.34) + - React-Core/RCTAnimationHeaders (= 0.62.34) + - ReactCommon/turbomodule/core (= 0.62.34) + - React-RCTBlob (0.62.34): + - FBReactNativeSpec (= 0.62.34) + - RCT-Folly (= 2018.10.22.00) + - React-Core/RCTBlobHeaders (= 0.62.34) + - React-Core/RCTWebSocket (= 0.62.34) + - React-jsi (= 0.62.34) + - React-RCTNetwork (= 0.62.34) + - ReactCommon/turbomodule/core (= 0.62.34) + - React-RCTImage (0.62.34): + - FBReactNativeSpec (= 0.62.34) + - RCT-Folly (= 2018.10.22.00) + - RCTTypeSafety (= 0.62.34) + - React-Core/RCTImageHeaders (= 0.62.34) + - React-RCTNetwork (= 0.62.34) + - ReactCommon/turbomodule/core (= 0.62.34) + - React-RCTLinking (0.62.34): + - FBReactNativeSpec (= 0.62.34) + - React-Core/RCTLinkingHeaders (= 0.62.34) + - ReactCommon/turbomodule/core (= 0.62.34) + - React-RCTNetwork (0.62.34): + - FBReactNativeSpec (= 0.62.34) + - RCT-Folly (= 2018.10.22.00) + - RCTTypeSafety (= 0.62.34) + - React-Core/RCTNetworkHeaders (= 0.62.34) + - ReactCommon/turbomodule/core (= 0.62.34) + - React-RCTPushNotification (0.62.34): + - FBReactNativeSpec (= 0.62.34) + - RCTTypeSafety (= 0.62.34) + - React-Core/RCTPushNotificationHeaders (= 0.62.34) + - ReactCommon/turbomodule/core (= 0.62.34) + - React-RCTSettings (0.62.34): + - FBReactNativeSpec (= 0.62.34) + - RCT-Folly (= 2018.10.22.00) + - RCTTypeSafety (= 0.62.34) + - React-Core/RCTSettingsHeaders (= 0.62.34) + - ReactCommon/turbomodule/core (= 0.62.34) + - React-RCTTest (0.62.34): + - React-Core (= 0.62.34) + - React-CoreModules (= 0.62.34) + - React-RCTText (0.62.34): + - React-Core/RCTTextHeaders (= 0.62.34) + - React-RCTVibration (0.62.34): + - FBReactNativeSpec (= 0.62.34) + - RCT-Folly (= 2018.10.22.00) + - React-Core/RCTVibrationHeaders (= 0.62.34) + - ReactCommon/turbomodule/core (= 0.62.34) + - ReactCommon/callinvoker (0.62.34): - DoubleConversion - glog - RCT-Folly (= 2018.10.22.00) - - React-cxxreact (= 0.62.32) - - ReactCommon/turbomodule/core (0.62.32): + - React-cxxreact (= 0.62.34) + - ReactCommon/turbomodule/core (0.62.34): - DoubleConversion - glog - RCT-Folly (= 2018.10.22.00) - - React-Core (= 0.62.32) - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - ReactCommon/callinvoker (= 0.62.32) - - ReactCommon/turbomodule/samples (0.62.32): + - React-Core (= 0.62.34) + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - ReactCommon/callinvoker (= 0.62.34) + - ReactCommon/turbomodule/samples (0.62.34): - DoubleConversion - glog - RCT-Folly (= 2018.10.22.00) - - React-Core (= 0.62.32) - - React-cxxreact (= 0.62.32) - - React-jsi (= 0.62.32) - - ReactCommon/callinvoker (= 0.62.32) - - ReactCommon/turbomodule/core (= 0.62.32) + - React-Core (= 0.62.34) + - React-cxxreact (= 0.62.34) + - React-jsi (= 0.62.34) + - ReactCommon/callinvoker (= 0.62.34) + - ReactCommon/turbomodule/core (= 0.62.34) - Yoga (1.14.0) - YogaKit (1.18.1): - Yoga (~> 1.14) @@ -359,8 +342,6 @@ DEPENDENCIES: - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.30.1) - FlipperKit/SKIOSNetworkPlugin (~> 0.30.1) - glog (from `../third-party-podspecs/glog.podspec`) - - hermes (from `../node_modules/hermes-engine-darwin`) - - libevent (from `../third-party-podspecs/libevent.podspec`) - RCT-Folly (from `../third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../Libraries/RCTRequired`) - RCTTypeSafety (from `../Libraries/TypeSafety`) @@ -368,7 +349,6 @@ DEPENDENCIES: - React-ART (from `../Libraries/ART`) - React-Core (from `../`) - React-Core/DevSupport (from `../`) - - React-Core/Hermes (from `../`) - React-Core/RCTWebSocket (from `../`) - React-CoreModules (from `../React/CoreModules`) - React-cxxreact (from `../ReactCommon/cxxreact`) @@ -416,10 +396,6 @@ EXTERNAL SOURCES: :path: "../Libraries/FBReactNativeSpec" glog: :podspec: "../third-party-podspecs/glog.podspec" - hermes: - :path: "../node_modules/hermes-engine-darwin" - libevent: - :podspec: "../third-party-podspecs/libevent.podspec" RCT-Folly: :podspec: "../third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -471,49 +447,46 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: dabda8622e76020607c2ae1e65cc0cda8b61479d - CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 + CocoaAsyncSocket: eafaa68a7e0ec99ead0a7b35015e0bf25d2c8987 CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f DoubleConversion: 56a44bcfd14ab2ff66f5a146b2e875eb4b69b19b - FBLazyVector: bc5ce150e5f4749f5f01d37799f15c27e1e6954a - FBReactNativeSpec: a0c81b3a79e747f9adfd098603d1a4b29ce9ce06 - Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365 + FBLazyVector: fb6f41f5af569ff04aafa533912d8ab085432d98 + FBReactNativeSpec: a1157d5d41bd90db725b85a000e0c92ea3c51662 + Flipper: 10b225e352595f521be0e5badddd90e241336e89 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3 Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7 - FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d + FlipperKit: 88b7f0d0cf907ddc2137b85eeb7f3d4d8d9395c8 glog: 1cb7c408c781ae8f35bbababe459b45e3dee4ec1 OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 - RCT-Folly: 1347093ffe75e152d846f7e45a3ef901b60021aa - RCTRequired: d384d06f7e53728a53805be0caaf22a93fcde73a - RCTTypeSafety: 5e8c2f0a47235842a6f337f8e3fb185180d84ac2 - React: 18243df9102151ea132f439ea47ddfb9788e63c7 - React-ART: 154dc27c84916c491f0eb89aa1a79305fa2e99e6 - React-callinvoker: a3dfac3d6e6a8b83a93493dd279d3c6fb2edb419 - React-Core: c2e49caa4fcf01f490b3e1b276a6c026b515dcee - React-CoreModules: b460bbc3f043214690d9a17f5dd5e03eff31126b - React-cxxreact: 41106ebea02f25ce640f420a971b7728d79e5d26 - React-jsi: 4ebe6a54d45ba9a5338095def75ac3beaf3ed7d3 - React-jsiexecutor: 4a44e1a5e1738fd0439726640d0cabaabcb3d128 - React-jsinspector: 907d9d65b09befdba89a6591adef95b3a4410cb3 - React-RCTActionSheet: 9b222cc72c0bdbbd44bd0c398232d3ca20ccd420 - React-RCTAnimation: 8d4428f176f38b2971e5398ce107c2f7efa98432 - React-RCTBlob: 318d4effcfcdd3fd32b04c8fa5ec6b0da775feae - React-RCTImage: f77fafd8cbbd30a4cf4d4456dc8bcc2f90eec0cc - React-RCTLinking: 87f6cd391ea3ecfe2da3b6f04e4854adc0ea49c9 - React-RCTNetwork: 102d90bddc6e2ab4219fb0a3f89caef41bc1ec8e - React-RCTPushNotification: 33e82afd091b57346fae543f58b6e50888f9b5fb - React-RCTSettings: 044f86e429aa090c93889ddeef91a13e71b9e640 - React-RCTTest: e2b466e0b7cbf86f7e2b31e0022794cea35dd7e5 - React-RCTText: 39df635fcdb466b241d0a10628c4eb6fb4f67105 - React-RCTVibration: f71776f50d657b3ab995760294c2a583704f488f - React-TurboModuleCxx-RNW: 18bb71af41fe34c8b12a56bef60aae7ee32b0817 - React-TurboModuleCxx-WinRTPort: 2240282b245810a346372e696882500001be27dd - ReactCommon: ae64bcd07d789b2712c5cc99cefb2a5cdcc393e7 - Yoga: fd91a8b9c1ea7169c8987bc11af13e376112097a + RCT-Folly: 71ece0166f9c96c1ec9279eeb0317baf533c020f + RCTRequired: 5643c8be1e6fb71068692517c2b7a8673e60b996 + RCTTypeSafety: 226e1273b70a82e19bbb634a5c3c1249b2f1bb5c + React: 13301ab3da745e27e21e601c1a666510886a48c5 + React-ART: a2783c12cd1c765b5ca9ae643caad382c2bb2c97 + React-Core: a88349efe0210c55236a7332ba437053f831d5bd + React-CoreModules: 5d9c8b9eb1059255347017138053c8bb7986cc8c + React-cxxreact: 506e29c5d3c2a266f0d50d0990d047c62855cc7f + React-jsi: 344604d31fb70e448e30d1f679f28c3f0d0432ba + React-jsiexecutor: 27755636cc436a0240140a87e46af020609a9be0 + React-jsinspector: fa0ba419443eed113a3927c27a9c4f9f38e24b46 + React-RCTActionSheet: 157f3514a6fb8e7af49ba224013f7dce8899793e + React-RCTAnimation: 7296f228b9002e2171a15697cce5cc2a66ed94ba + React-RCTBlob: 876178ad56e7b89f9a0cb72654341b1230d8e5ba + React-RCTImage: 6d6b55d548eeff4bf69399a295de990a1cb3418e + React-RCTLinking: 29a2ef90177259359219cb9f16d5aa3fb2f088a8 + React-RCTNetwork: 53d49aed99e86d3d4917dd4827a56d12560cb3c2 + React-RCTPushNotification: f0c52a1d0fb687ae91eacdbf2cc5d148bca0e59c + React-RCTSettings: 6fb591652439d5e62ea677070d7875275e8522b2 + React-RCTTest: 6ec9bb5b4d7fa79e21385bf4ae570aa655d3cac8 + React-RCTText: 889aa7a221e1d3a51f13954d2aa8c8acddd84118 + React-RCTVibration: e41668de5ea2d71ef5853ecf34bcbdee4fe8fe87 + ReactCommon: 4d1efe8c92d2f8b3da98f58aec2b9c0432560a9f + Yoga: fc618e9527042e0b78d16c2b810c29cf06480586 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 8a50297c26ad9d948d1614b33e20d755094cb377 +PODFILE CHECKSUM: c32527774390d90f2e860bf78c7ccea086cebe93 COCOAPODS: 1.10.1 diff --git a/RNTester/RNTesterPods.xcodeproj/project.pbxproj b/RNTester/RNTesterPods.xcodeproj/project.pbxproj index 238ae2e6469a05..ddc5e666e43f07 100644 --- a/RNTester/RNTesterPods.xcodeproj/project.pbxproj +++ b/RNTester/RNTesterPods.xcodeproj/project.pbxproj @@ -736,7 +736,6 @@ 9F153459233AB2C4006DFE44 /* Resources */, 38C8132424577FB500BFFA62 /* Build JS Bundle */, 51B9D81723C4D5A4002B30E1 /* Start Metro */, - 4733C3A4FBA299F6E1E956BA /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -1029,23 +1028,6 @@ shellPath = /bin/sh; shellScript = "export NODE_BINARY=node\nexport PROJECT_ROOT=$SRCROOT/..\nexport SOURCEMAP_FILE=sourcemap.macOS.map\n# export FORCE_BUNDLING=true\n$SRCROOT/../scripts/react-native-xcode.sh RNTester/js/RNTesterApp.macos.js\n"; }; - 4733C3A4FBA299F6E1E956BA /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-RNTester-macOS/Pods-RNTester-macOS-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-RNTester-macOS/Pods-RNTester-macOS-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOS/Pods-RNTester-macOS-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 51B9D81723C4D5A4002B30E1 /* Start Metro */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647;