From 98fe330956d99ccb3783e58e7a4542b9f9b359b3 Mon Sep 17 00:00:00 2001 From: Kudo Chien Date: Tue, 21 Jan 2020 12:41:45 -0800 Subject: [PATCH] Upgrade Folly to v2020.01.13.00 (#27810) Summary: Upgrade Folly to v2020.01.13.00. Fixes https://github.com/facebook/react-native/issues/27640 ## Changelog [iOS] [Changed] - Upgrade Folly to v2020.01.13.00 Pull Request resolved: https://github.com/facebook/react-native/pull/27810 Test Plan: Test by building and running RNTester Reviewed By: mdvacca Differential Revision: D19483115 Pulled By: fkgozali fbshipit-source-id: 4a85325a95b5f7857da75995d587218740d8b077 --- Libraries/Blob/React-RCTBlob.podspec | 2 +- .../FBReactNativeSpec.podspec | 2 +- Libraries/Image/React-RCTImage.podspec | 2 +- Libraries/LinkingIOS/React-RCTLinking.podspec | 2 +- .../React-RCTAnimation.podspec | 2 +- Libraries/Network/React-RCTNetwork.podspec | 2 +- .../React-RCTPushNotification.podspec | 2 +- Libraries/Settings/React-RCTSettings.podspec | 2 +- Libraries/TypeSafety/RCTTypeSafety.podspec | 2 +- .../Vibration/React-RCTVibration.podspec | 2 +- RNTester/Podfile.lock | 104 +++++++++--------- React-Core.podspec | 2 +- React/CoreModules/React-CoreModules.podspec | 2 +- React/React-RCTFabric.podspec | 2 +- React/third-party.xcconfig | 2 +- ReactCommon/React-Fabric.podspec | 2 +- ReactCommon/ReactCommon.podspec | 2 +- ReactCommon/cxxreact/React-cxxreact.podspec | 2 +- .../fabric/graphics/React-graphics.podspec | 2 +- ReactCommon/jsi/React-jsi.podspec | 2 +- .../jsiexecutor/React-jsiexecutor.podspec | 2 +- package.json | 1 - scripts/ios-install-third-party.sh | 77 ------------- third-party-podspecs/Folly.podspec | 18 +-- 24 files changed, 83 insertions(+), 157 deletions(-) delete mode 100755 scripts/ios-install-third-party.sh diff --git a/Libraries/Blob/React-RCTBlob.podspec b/Libraries/Blob/React-RCTBlob.podspec index 5d2dfb8f0a458b..f42864b8fee466 100644 --- a/Libraries/Blob/React-RCTBlob.podspec +++ b/Libraries/Blob/React-RCTBlob.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' Pod::Spec.new do |s| s.name = "React-RCTBlob" diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec b/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec index 05ba43be3fef62..5e90f021119e5a 100644 --- a/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec +++ b/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' Pod::Spec.new do |s| s.name = "FBReactNativeSpec" diff --git a/Libraries/Image/React-RCTImage.podspec b/Libraries/Image/React-RCTImage.podspec index a3203ceb923dc2..dc62f223186ea0 100644 --- a/Libraries/Image/React-RCTImage.podspec +++ b/Libraries/Image/React-RCTImage.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' Pod::Spec.new do |s| s.name = "React-RCTImage" diff --git a/Libraries/LinkingIOS/React-RCTLinking.podspec b/Libraries/LinkingIOS/React-RCTLinking.podspec index aa7a453867938a..9746e9fd50c5a8 100644 --- a/Libraries/LinkingIOS/React-RCTLinking.podspec +++ b/Libraries/LinkingIOS/React-RCTLinking.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' Pod::Spec.new do |s| s.name = "React-RCTLinking" diff --git a/Libraries/NativeAnimation/React-RCTAnimation.podspec b/Libraries/NativeAnimation/React-RCTAnimation.podspec index 0d4e31856b7286..51e671db7a2a93 100644 --- a/Libraries/NativeAnimation/React-RCTAnimation.podspec +++ b/Libraries/NativeAnimation/React-RCTAnimation.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' Pod::Spec.new do |s| s.name = "React-RCTAnimation" diff --git a/Libraries/Network/React-RCTNetwork.podspec b/Libraries/Network/React-RCTNetwork.podspec index 1ad35ca2c97962..f592b705df3231 100644 --- a/Libraries/Network/React-RCTNetwork.podspec +++ b/Libraries/Network/React-RCTNetwork.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' Pod::Spec.new do |s| s.name = "React-RCTNetwork" diff --git a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec index 9df963bac1e529..69fa86b686af48 100644 --- a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec +++ b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' Pod::Spec.new do |s| s.name = "React-RCTPushNotification" diff --git a/Libraries/Settings/React-RCTSettings.podspec b/Libraries/Settings/React-RCTSettings.podspec index 8e9114d82c3bb6..d01f67f6bbec3d 100644 --- a/Libraries/Settings/React-RCTSettings.podspec +++ b/Libraries/Settings/React-RCTSettings.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' Pod::Spec.new do |s| s.name = "React-RCTSettings" diff --git a/Libraries/TypeSafety/RCTTypeSafety.podspec b/Libraries/TypeSafety/RCTTypeSafety.podspec index 1115a5e7f259f6..86975db3cd7355 100644 --- a/Libraries/TypeSafety/RCTTypeSafety.podspec +++ b/Libraries/TypeSafety/RCTTypeSafety.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' Pod::Spec.new do |s| s.name = "RCTTypeSafety" diff --git a/Libraries/Vibration/React-RCTVibration.podspec b/Libraries/Vibration/React-RCTVibration.podspec index bc91c8131c2cc2..0f330860bfcd08 100644 --- a/Libraries/Vibration/React-RCTVibration.podspec +++ b/Libraries/Vibration/React-RCTVibration.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' Pod::Spec.new do |s| s.name = "React-RCTVibration" diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index 24edf502948a6c..d29ee5e523365e 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -3,18 +3,18 @@ PODS: - DoubleConversion (1.1.6) - FBLazyVector (1000.0.0) - FBReactNativeSpec (1000.0.0): - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core (= 1000.0.0) - React-jsi (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - - Folly (2018.10.22.00): + - Folly (2020.01.13.00): - boost-for-react-native - DoubleConversion - - Folly/Default (= 2018.10.22.00) + - Folly/Default (= 2020.01.13.00) - glog - - Folly/Default (2018.10.22.00): + - Folly/Default (2020.01.13.00): - boost-for-react-native - DoubleConversion - glog @@ -22,7 +22,7 @@ PODS: - RCTRequired (1000.0.0) - RCTTypeSafety (1000.0.0): - FBLazyVector (= 1000.0.0) - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - RCTRequired (= 1000.0.0) - React-Core (= 1000.0.0) - React (1000.0.0): @@ -41,7 +41,7 @@ PODS: - React-ART (1000.0.0): - React-Core/ARTHeaders (= 1000.0.0) - React-Core (1000.0.0): - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-Core/Default (= 1000.0.0) - React-cxxreact (= 1000.0.0) @@ -49,7 +49,7 @@ PODS: - React-jsiexecutor (= 1000.0.0) - Yoga - React-Core/ARTHeaders (1000.0.0): - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-Core/Default - React-cxxreact (= 1000.0.0) @@ -57,7 +57,7 @@ PODS: - React-jsiexecutor (= 1000.0.0) - Yoga - React-Core/CoreModulesHeaders (1000.0.0): - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-Core/Default - React-cxxreact (= 1000.0.0) @@ -65,14 +65,14 @@ PODS: - React-jsiexecutor (= 1000.0.0) - Yoga - React-Core/Default (1000.0.0): - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - Yoga - React-Core/DevSupport (1000.0.0): - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-Core/Default (= 1000.0.0) - React-Core/RCTWebSocket (= 1000.0.0) @@ -82,7 +82,7 @@ PODS: - React-jsinspector (= 1000.0.0) - Yoga - React-Core/RCTActionSheetHeaders (1000.0.0): - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-Core/Default - React-cxxreact (= 1000.0.0) @@ -90,7 +90,7 @@ PODS: - React-jsiexecutor (= 1000.0.0) - Yoga - React-Core/RCTAnimationHeaders (1000.0.0): - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-Core/Default - React-cxxreact (= 1000.0.0) @@ -98,7 +98,7 @@ PODS: - React-jsiexecutor (= 1000.0.0) - Yoga - React-Core/RCTBlobHeaders (1000.0.0): - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-Core/Default - React-cxxreact (= 1000.0.0) @@ -106,7 +106,7 @@ PODS: - React-jsiexecutor (= 1000.0.0) - Yoga - React-Core/RCTImageHeaders (1000.0.0): - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-Core/Default - React-cxxreact (= 1000.0.0) @@ -114,7 +114,7 @@ PODS: - React-jsiexecutor (= 1000.0.0) - Yoga - React-Core/RCTLinkingHeaders (1000.0.0): - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-Core/Default - React-cxxreact (= 1000.0.0) @@ -122,7 +122,7 @@ PODS: - React-jsiexecutor (= 1000.0.0) - Yoga - React-Core/RCTNetworkHeaders (1000.0.0): - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-Core/Default - React-cxxreact (= 1000.0.0) @@ -130,7 +130,7 @@ PODS: - React-jsiexecutor (= 1000.0.0) - Yoga - React-Core/RCTPushNotificationHeaders (1000.0.0): - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-Core/Default - React-cxxreact (= 1000.0.0) @@ -138,7 +138,7 @@ PODS: - React-jsiexecutor (= 1000.0.0) - Yoga - React-Core/RCTSettingsHeaders (1000.0.0): - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-Core/Default - React-cxxreact (= 1000.0.0) @@ -146,7 +146,7 @@ PODS: - React-jsiexecutor (= 1000.0.0) - Yoga - React-Core/RCTTextHeaders (1000.0.0): - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-Core/Default - React-cxxreact (= 1000.0.0) @@ -154,7 +154,7 @@ PODS: - React-jsiexecutor (= 1000.0.0) - Yoga - React-Core/RCTVibrationHeaders (1000.0.0): - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-Core/Default - React-cxxreact (= 1000.0.0) @@ -162,7 +162,7 @@ PODS: - React-jsiexecutor (= 1000.0.0) - Yoga - React-Core/RCTWebSocket (1000.0.0): - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-Core/Default (= 1000.0.0) - React-cxxreact (= 1000.0.0) @@ -171,7 +171,7 @@ PODS: - Yoga - React-CoreModules (1000.0.0): - FBReactNativeSpec (= 1000.0.0) - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - RCTTypeSafety (= 1000.0.0) - React-Core/CoreModulesHeaders (= 1000.0.0) - React-RCTImage (= 1000.0.0) @@ -179,23 +179,23 @@ PODS: - React-cxxreact (1000.0.0): - boost-for-react-native (= 1.63.0) - DoubleConversion - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-jsinspector (= 1000.0.0) - React-jsi (1000.0.0): - boost-for-react-native (= 1.63.0) - DoubleConversion - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-jsi/Default (= 1000.0.0) - React-jsi/Default (1000.0.0): - boost-for-react-native (= 1.63.0) - DoubleConversion - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-jsiexecutor (1000.0.0): - DoubleConversion - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) @@ -204,13 +204,13 @@ PODS: - React-Core/RCTActionSheetHeaders (= 1000.0.0) - React-RCTAnimation (1000.0.0): - FBReactNativeSpec (= 1000.0.0) - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - RCTTypeSafety (= 1000.0.0) - React-Core/RCTAnimationHeaders (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTBlob (1000.0.0): - FBReactNativeSpec (= 1000.0.0) - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - React-Core/RCTBlobHeaders (= 1000.0.0) - React-Core/RCTWebSocket (= 1000.0.0) - React-jsi (= 1000.0.0) @@ -218,7 +218,7 @@ PODS: - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTImage (1000.0.0): - FBReactNativeSpec (= 1000.0.0) - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - RCTTypeSafety (= 1000.0.0) - React-Core/RCTImageHeaders (= 1000.0.0) - React-RCTNetwork (= 1000.0.0) @@ -229,7 +229,7 @@ PODS: - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTNetwork (1000.0.0): - FBReactNativeSpec (= 1000.0.0) - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - RCTTypeSafety (= 1000.0.0) - React-Core/RCTNetworkHeaders (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) @@ -240,7 +240,7 @@ PODS: - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTSettings (1000.0.0): - FBReactNativeSpec (= 1000.0.0) - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - RCTTypeSafety (= 1000.0.0) - React-Core/RCTSettingsHeaders (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) @@ -251,17 +251,17 @@ PODS: - React-Core/RCTTextHeaders (= 1000.0.0) - React-RCTVibration (1000.0.0): - FBReactNativeSpec (= 1000.0.0) - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - React-Core/RCTVibrationHeaders (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - ReactCommon/callinvoker (1000.0.0): - DoubleConversion - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-cxxreact (= 1000.0.0) - ReactCommon/turbomodule/core (1000.0.0): - DoubleConversion - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-Core (= 1000.0.0) - React-cxxreact (= 1000.0.0) @@ -269,7 +269,7 @@ PODS: - ReactCommon/callinvoker (= 1000.0.0) - ReactCommon/turbomodule/samples (1000.0.0): - DoubleConversion - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - React-Core (= 1000.0.0) - React-cxxreact (= 1000.0.0) @@ -376,33 +376,33 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c - DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 + DoubleConversion: cde416483dac037923206447da6e1454df403714 FBLazyVector: 9806caa151956ce2238f70bde6649a6e3468d2c2 - FBReactNativeSpec: 4612edcbf25240e05263399a484cb14bf513872c - Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 - glog: 1f3da668190260b06b429bb211bfbee5cd790c28 + FBReactNativeSpec: 36a4e4488cc758ffceea8e1b3b5c6dab3ed99fa2 + Folly: b73c3869541e86821df3c387eb0af5f65addfab4 + glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 RCTRequired: f04f9813bccb37099f642722b46e879fc47c7e78 - RCTTypeSafety: a905fc5bfde67305e22588fb5178289bc8bc6be7 + RCTTypeSafety: 26a1a3b30655098b72d3954e3e7d0f9a7a059e95 React: 7b262249ab4afa1d300c9e90f50edcc2a5f72bcd React-ART: 25a40dbfb785ceec6ca41d5bd1ec997ca8c01f17 - React-Core: 0d8d3b586d79f3b3a7abe343859892e221e04cf0 - React-CoreModules: fe786aebce0ef3bd1f3b7344006c889c9e367ce8 - React-cxxreact: 74202227dfa3cb53b7a085508822c687808d2c3f - React-jsi: f22b7604a5e7faf347a2293ac050c4ef495cb92f - React-jsiexecutor: 705bd7d9524b27ddb02f7753f35509c812a93a02 + React-Core: 86046aecc5d3297cd37391ad7577e33784bcff74 + React-CoreModules: b6dd63292ef064320a8c1b2e40291b95690e0e5f + React-cxxreact: 9a0a25be41fd93b42d3cbef6311b309a1da53191 + React-jsi: 1143a100f9e746b6acb9c8ebff6c3fe66669e404 + React-jsiexecutor: 56259faac069d4e475001c1ddb042ef622318f10 React-jsinspector: 5a11c19a7a267ea4a54f7082ca7834470f5c3fec React-RCTActionSheet: 83587cdb4e14b9d986058a3acec8fc1cd9815b59 - React-RCTAnimation: be8e300a12f7946ca5a53f02668c98cd3a3fc973 - React-RCTBlob: 7bf1f010265a810ebe87e7a1746eac106d4de040 - React-RCTImage: 6bc83509a99a699606275338c486bf099ae4b1a0 + React-RCTAnimation: e328fb809d590c09d88aa4d42f3963de522fef90 + React-RCTBlob: de3bd0bdbc42ec4e64183aefec9d582a7463cf00 + React-RCTImage: 046397bd2ba8506628b720ba3baf2ba7e331b1bf React-RCTLinking: 7b77eca020eaf222d19151f0f52cd6065cbc90ec - React-RCTNetwork: 7e268503e0fa1caa692990f1213bfdadfb4a3755 + React-RCTNetwork: d16dd52792dc3d66c3e23b464afe0f759d3a5670 React-RCTPushNotification: 9290035bbd9ecef15f03d760cc422a219b55be07 - React-RCTSettings: ae42816d1073cb8edd70c9ab32e29810a2bbceff + React-RCTSettings: f7daf792f772c8582b31c7aeeb1f146df61a52a7 React-RCTTest: 80b44b7e8f5a30d9663c921adfb22a0b185e69f4 React-RCTText: b3eb3514addd9b105c0edb05ed32333428ba2a52 - React-RCTVibration: 7ee1cf4f386ed200c70b2be1b09a744ab79861ba - ReactCommon: ee43d06925ecaa2fc7a9d5d07adc2f77c9d65c72 + React-RCTVibration: e2856bb9408f7e8eccfe870e123e5644ab744219 + ReactCommon: c3834cbee58b60f71c8155c04a3f44e60ec017fb Yoga: f7fa200d8c49f97b54c9421079e781fb900b5cae PODFILE CHECKSUM: fa397603c9a8f7cb49d7edc7fe85536d0789f34f diff --git a/React-Core.podspec b/React-Core.podspec index 7d6cc221f9b0d0..bc4dfb468abdaf 100644 --- a/React-Core.podspec +++ b/React-Core.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' boost_compiler_flags = '-Wno-documentation' header_subspecs = { diff --git a/React/CoreModules/React-CoreModules.podspec b/React/CoreModules/React-CoreModules.podspec index 5c1df0c2b7e30f..e382f08a5a9bd3 100644 --- a/React/CoreModules/React-CoreModules.podspec +++ b/React/CoreModules/React-CoreModules.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' Pod::Spec.new do |s| s.name = "React-CoreModules" diff --git a/React/React-RCTFabric.podspec b/React/React-RCTFabric.podspec index 19e0781a0cfa34..6e1e0f535cea38 100644 --- a/React/React-RCTFabric.podspec +++ b/React/React-RCTFabric.podspec @@ -18,7 +18,7 @@ end folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1' folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' boost_compiler_flags = '-Wno-documentation' Pod::Spec.new do |s| diff --git a/React/third-party.xcconfig b/React/third-party.xcconfig index 3ce55a008225fd..ada55f5ebe8ce0 100644 --- a/React/third-party.xcconfig +++ b/React/third-party.xcconfig @@ -8,5 +8,5 @@ // LICENSE file in the root directory of this source tree. // -HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_63_0 $(SRCROOT)/../third-party/folly-2018.10.22.00 $(SRCROOT)/../third-party/glog-0.3.5/src +HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_63_0 $(SRCROOT)/../third-party/folly-2020.01.13.00 $(SRCROOT)/../third-party/glog-0.3.5/src OTHER_CFLAGS = -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 diff --git a/ReactCommon/React-Fabric.podspec b/ReactCommon/React-Fabric.podspec index 7beeb9e31a9a8d..b944246d235e2e 100644 --- a/ReactCommon/React-Fabric.podspec +++ b/ReactCommon/React-Fabric.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' folly_dep_name = 'Folly/Fabric' boost_compiler_flags = '-Wno-documentation' diff --git a/ReactCommon/ReactCommon.podspec b/ReactCommon/ReactCommon.podspec index 11d4ae5d1ba27c..4d712dd6581561 100644 --- a/ReactCommon/ReactCommon.podspec +++ b/ReactCommon/ReactCommon.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' boost_compiler_flags = '-Wno-documentation' Pod::Spec.new do |s| diff --git a/ReactCommon/cxxreact/React-cxxreact.podspec b/ReactCommon/cxxreact/React-cxxreact.podspec index 777b1a71b14225..9058b36f292ed4 100644 --- a/ReactCommon/cxxreact/React-cxxreact.podspec +++ b/ReactCommon/cxxreact/React-cxxreact.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' boost_compiler_flags = '-Wno-documentation' Pod::Spec.new do |s| diff --git a/ReactCommon/fabric/graphics/React-graphics.podspec b/ReactCommon/fabric/graphics/React-graphics.podspec index f1d9f4e1cad9b9..292633a173b948 100644 --- a/ReactCommon/fabric/graphics/React-graphics.podspec +++ b/ReactCommon/fabric/graphics/React-graphics.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' Pod::Spec.new do |s| s.name = "React-graphics" diff --git a/ReactCommon/jsi/React-jsi.podspec b/ReactCommon/jsi/React-jsi.podspec index 4b9a37eb00dd79..39e13b1a353b8c 100644 --- a/ReactCommon/jsi/React-jsi.podspec +++ b/ReactCommon/jsi/React-jsi.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' boost_compiler_flags = '-Wno-documentation' Pod::Spec.new do |s| diff --git a/ReactCommon/jsiexecutor/React-jsiexecutor.podspec b/ReactCommon/jsiexecutor/React-jsiexecutor.podspec index 22de3022495706..5422bb83f915b1 100644 --- a/ReactCommon/jsiexecutor/React-jsiexecutor.podspec +++ b/ReactCommon/jsiexecutor/React-jsiexecutor.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' +folly_version = '2020.01.13.00' boost_compiler_flags = '-Wno-documentation' Pod::Spec.new do |s| diff --git a/package.json b/package.json index c2686908f2b84a..15d881ac69be8c 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "rn-get-polyfills.js", "scripts/compose-source-maps.js", "scripts/ios-configure-glog.sh", - "scripts/ios-install-third-party.sh", "scripts/launchPackager.bat", "scripts/launchPackager.command", "scripts/node-binary.sh", diff --git a/scripts/ios-install-third-party.sh b/scripts/ios-install-third-party.sh deleted file mode 100755 index 6638acbcdb7103..00000000000000 --- a/scripts/ios-install-third-party.sh +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash -# Copyright (c) Facebook, Inc. and its affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -if [ -n "$RN_CACHE_DIR" ] && [ -d "$RN_CACHE_DIR" ]; then - cachedir="$RN_CACHE_DIR" -elif [ -d "$HOME/.rncache" ]; then - cachedir="$HOME/.rncache" # react-native 0.57.8 and older -else - cachedir="$HOME/Library/Caches/com.facebook.ReactNativeBuild" -fi -mkdir -p "$cachedir" - -function file_fail () { - cachefile=$1 - msg=$2 - - echo "$msg. Debug info:" 2>&1 - ls -l "$cachefile" 2>&1 - shasum "$cachefile" 2>&1 - exit 1 -} - -function fetch_and_unpack () { - file=$1 - url=$2 - hash=$3 - cmd=$4 - - retries=4 - fetched=no - - while true; do - if [ -f "$cachedir/$file" ]; then - if shasum "$cachedir/$file" | - awk -v hash="$hash" '{exit $1 != hash}'; then - break - else - echo "Incorrect hash:" 2>&1 - shasum "$cachedir/$file" 2>&1 - echo "Retrying..." 2>&1 - fi - fi - - (( retries = retries - 1 )) - if (( retries < 0 )); then - file_fail "$cachedir/$file" "Failed to successfully download '$file'" - fi - - rm -f "$cachedir/$file" - (cd "$cachedir"; curl -J -L -O "$url") - fetched=yes - done - - dir=$(basename "$file" .tar.gz) - if [ "$fetched" = "yes" ] || [ ! -f "third-party/$dir/.installed" ]; then - (cd third-party; - rm -rf "$dir" - echo Unpacking "$cachedir/$file"... - if ! tar zxf "$cachedir/$file"; then - file_fail "$cachedir/$file" "Unpacking '$cachedir/$file' failed" - fi - cd "$dir" - eval "${cmd:-true}" && touch .installed) - fi -} - -mkdir -p third-party - -SCRIPTDIR=$(dirname "$0") - -fetch_and_unpack glog-0.3.5.tar.gz https://github.com/google/glog/archive/v0.3.5.tar.gz 61067502c5f9769d111ea1ee3f74e6ddf0a5f9cc "\"$SCRIPTDIR/ios-configure-glog.sh\"" -fetch_and_unpack double-conversion-1.1.6.tar.gz https://github.com/google/double-conversion/archive/v1.1.6.tar.gz 1c7d88afde3aaeb97bb652776c627b49e132e8e0 -fetch_and_unpack boost_1_63_0.tar.gz https://github.com/react-native-community/boost-for-react-native/releases/download/v1.63.0-0/boost_1_63_0.tar.gz c3f57e1d22a995e608983effbb752b54b6eab741 -fetch_and_unpack folly-2018.10.22.00.tar.gz https://github.com/facebook/folly/archive/v2018.10.22.00.tar.gz f70a75bfeb394363d2049a846bba118ffb3b368a diff --git a/third-party-podspecs/Folly.podspec b/third-party-podspecs/Folly.podspec index e03ce5a0257aa4..35a0522acd8a99 100644 --- a/third-party-podspecs/Folly.podspec +++ b/third-party-podspecs/Folly.podspec @@ -5,7 +5,7 @@ Pod::Spec.new do |spec| spec.name = 'Folly' - spec.version = '2018.10.22.00' + spec.version = '2020.01.13.00' spec.license = { :type => 'Apache License, Version 2.0' } spec.homepage = 'https://github.com/facebook/folly' spec.summary = 'An open-source C++ library developed and used at Facebook.' @@ -20,7 +20,9 @@ Pod::Spec.new do |spec| spec.source_files = 'folly/String.cpp', 'folly/Conv.cpp', 'folly/Demangle.cpp', + 'folly/FileUtil.cpp', 'folly/Format.cpp', + 'folly/lang/SafeAssert.cpp', 'folly/ScopeGuard.cpp', 'folly/Unicode.cpp', 'folly/dynamic.cpp', @@ -28,10 +30,13 @@ Pod::Spec.new do |spec| 'folly/json_pointer.cpp', 'folly/container/detail/F14Table.cpp', 'folly/detail/Demangle.cpp', + 'folly/detail/UniqueInstance.cpp', 'folly/hash/SpookyHashV2.cpp', 'folly/lang/Assume.cpp', - 'folly/lang/ColdClass.cpp', - 'folly/memory/detail/MallocImpl.cpp' + 'folly/lang/CString.cpp', + 'folly/memory/detail/MallocImpl.cpp', + 'folly/net/NetOps.cpp', + 'folly/portability/SysUio.cpp' # workaround for https://github.com/facebook/react-native/issues/14326 spec.preserve_paths = 'folly/*.h', @@ -43,6 +48,8 @@ Pod::Spec.new do |spec| 'folly/lang/*.h', 'folly/memory/*.h', 'folly/memory/detail/*.h', + 'folly/net/*.h', + 'folly/net/detail/*.h', 'folly/portability/*.h' spec.libraries = "stdc++" spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", @@ -56,12 +63,9 @@ Pod::Spec.new do |spec| end spec.subspec 'Fabric' do |fabric| - fabric.source_files = 'folly/portability/SysUio.cpp', - 'folly/FileUtil.cpp', - 'folly/SharedMutex.cpp', + fabric.source_files = 'folly/SharedMutex.cpp', 'folly/concurrency/CacheLocality.cpp', 'folly/detail/Futex.cpp', - 'folly/lang/SafeAssert.cpp', 'folly/synchronization/ParkingLot.cpp', 'folly/portability/Malloc.cpp' fabric.preserve_paths = 'folly/concurrency/CacheLocality.h',