From 287934dba943cd954164bde8b06f9ba85940b45f Mon Sep 17 00:00:00 2001 From: Radek Czemerys Date: Mon, 26 Nov 2018 01:38:45 -0800 Subject: [PATCH] Fix Xcode 10 builds (broken by folly upgrade) (#22394) Summary: [Folly upgrade](https://github.com/facebook/react-native/commit/a70625abd7bf4fba3dafb8a969a73854b7ddcd42) introduced changes that have to be applied to `Install Third Party` script in order to use `New build system` from Xcode 10. Unfortunately, this might happen again if someone changes folly. Also removes non-existent files from folly podspec. Pull Request resolved: https://github.com/facebook/react-native/pull/22394 Differential Revision: D13192463 Pulled By: hramos fbshipit-source-id: ea0eeb6e1e7f6d7dfcdb6d1dee28b1a640ee7097 --- RNTester/Podfile.lock | 4 ++-- React/React.xcodeproj/project.pbxproj | 15 ++++++++++----- third-party-podspecs/Folly.podspec | 2 -- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index 5ccefa28b2ab9f..d63996f1f4fadf 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -104,10 +104,10 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd - Folly: cd7933b82a5f7673ed71bafe631f44a575ae77ab + Folly: de497beb10f102453a1afa9edbf8cf8a251890de glog: aefd1eb5dda2ab95ba0938556f34b98e2da3a60d React: 9b873b38b92ed8012d7cdf3b965477095ed364c4 - yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85 + yoga: 0885622311729a02c2bc02dca97167787a51488b PODFILE CHECKSUM: 7af77fbc34af9646e8c6389e7e2c0b4663bb16d9 diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj index 4b543e2c9e5931..77bd914b26650d 100644 --- a/React/React.xcodeproj/project.pbxproj +++ b/React/React.xcodeproj/project.pbxproj @@ -4023,14 +4023,10 @@ "../third-party/glog-0.3.5/src/glog/raw_logging.h", "../third-party/glog-0.3.5/src/glog/stl_logging.h", "../third-party/glog-0.3.5/src/glog/vlog_is_on.h", - "../third-party/folly-2018.10.22.00/folly/detail/MallocImpl.cpp", - "../third-party/folly-2018.10.22.00/folly/portability/BitsFunctexcept.cpp", + "../third-party/folly-2018.10.22.00/folly/memory/detail/MallocImpl.cpp", "../third-party/folly-2018.10.22.00/folly/Demangle.cpp", - "../third-party/folly-2018.10.22.00/folly/StringBase.cpp", "../third-party/folly-2018.10.22.00/folly/Unicode.cpp", "../third-party/folly-2018.10.22.00/folly/AtomicIntrusiveLinkedList.h", - "../third-party/folly-2018.10.22.00/folly/Bits.cpp", - "../third-party/folly-2018.10.22.00/folly/Bits.h", "../third-party/folly-2018.10.22.00/folly/Conv.cpp", "../third-party/folly-2018.10.22.00/folly/Conv.h", "../third-party/folly-2018.10.22.00/folly/dynamic-inl.h", @@ -4043,6 +4039,15 @@ "../third-party/folly-2018.10.22.00/folly/MoveWrapper.h", "../third-party/folly-2018.10.22.00/folly/Optional.h", "../third-party/folly-2018.10.22.00/folly/ScopeGuard.h", + "../third-party/folly-2018.10.22.00/folly/json_pointer.cpp", + "../third-party/folly-2018.10.22.00/folly/String.cpp", + "../third-party/folly-2018.10.22.00/folly/detail/Demangle.cpp", + "../third-party/folly-2018.10.22.00/folly/hash/SpookyHashV2.cpp", + "../third-party/folly-2018.10.22.00/folly/lang/ColdClass.cpp", + "../third-party/folly-2018.10.22.00/folly/container/detail/F14Table.cpp", + "../third-party/folly-2018.10.22.00/folly/ScopeGuard.cpp", + "../third-party/folly-2018.10.22.00/folly/lang/Assume.cpp", + "../third-party/folly-2018.10.22.00/folly/Format.cpp", "../third-party/double-conversion-1.1.6/src/bignum-dtoa.cc", "../third-party/double-conversion-1.1.6/src/bignum-dtoa.h", "../third-party/double-conversion-1.1.6/src/bignum.cc", diff --git a/third-party-podspecs/Folly.podspec b/third-party-podspecs/Folly.podspec index c12c8e16b178d6..4fb9d5123decc9 100644 --- a/third-party-podspecs/Folly.podspec +++ b/third-party-podspecs/Folly.podspec @@ -22,7 +22,6 @@ Pod::Spec.new do |spec| 'folly/Demangle.cpp', 'folly/Format.cpp', 'folly/ScopeGuard.cpp', - 'folly/StringBase.cpp', 'folly/Unicode.cpp', 'folly/dynamic.cpp', 'folly/json.cpp', @@ -32,7 +31,6 @@ Pod::Spec.new do |spec| 'folly/hash/SpookyHashV2.cpp', 'folly/lang/Assume.cpp', 'folly/lang/ColdClass.cpp', - 'folly/portability/BitsFunctexcept.cpp', 'folly/memory/detail/MallocImpl.cpp' # workaround for https://github.com/facebook/react-native/issues/14326 spec.preserve_paths = 'folly/*.h',