Skip to content

Commit 287934d

Browse files
radko93facebook-github-bot
authored andcommittedNov 26, 2018
Fix Xcode 10 builds (broken by folly upgrade) (#22394)
Summary: [Folly upgrade](a70625a) 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: #22394 Differential Revision: D13192463 Pulled By: hramos fbshipit-source-id: ea0eeb6e1e7f6d7dfcdb6d1dee28b1a640ee7097
1 parent a686048 commit 287934d

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed
 

‎RNTester/Podfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ EXTERNAL SOURCES:
104104
SPEC CHECKSUMS:
105105
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
106106
DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
107-
Folly: cd7933b82a5f7673ed71bafe631f44a575ae77ab
107+
Folly: de497beb10f102453a1afa9edbf8cf8a251890de
108108
glog: aefd1eb5dda2ab95ba0938556f34b98e2da3a60d
109109
React: 9b873b38b92ed8012d7cdf3b965477095ed364c4
110-
yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85
110+
yoga: 0885622311729a02c2bc02dca97167787a51488b
111111

112112
PODFILE CHECKSUM: 7af77fbc34af9646e8c6389e7e2c0b4663bb16d9
113113

‎React/React.xcodeproj/project.pbxproj

+10-5
Original file line numberDiff line numberDiff line change
@@ -4023,14 +4023,10 @@
40234023
"../third-party/glog-0.3.5/src/glog/raw_logging.h",
40244024
"../third-party/glog-0.3.5/src/glog/stl_logging.h",
40254025
"../third-party/glog-0.3.5/src/glog/vlog_is_on.h",
4026-
"../third-party/folly-2018.10.22.00/folly/detail/MallocImpl.cpp",
4027-
"../third-party/folly-2018.10.22.00/folly/portability/BitsFunctexcept.cpp",
4026+
"../third-party/folly-2018.10.22.00/folly/memory/detail/MallocImpl.cpp",
40284027
"../third-party/folly-2018.10.22.00/folly/Demangle.cpp",
4029-
"../third-party/folly-2018.10.22.00/folly/StringBase.cpp",
40304028
"../third-party/folly-2018.10.22.00/folly/Unicode.cpp",
40314029
"../third-party/folly-2018.10.22.00/folly/AtomicIntrusiveLinkedList.h",
4032-
"../third-party/folly-2018.10.22.00/folly/Bits.cpp",
4033-
"../third-party/folly-2018.10.22.00/folly/Bits.h",
40344030
"../third-party/folly-2018.10.22.00/folly/Conv.cpp",
40354031
"../third-party/folly-2018.10.22.00/folly/Conv.h",
40364032
"../third-party/folly-2018.10.22.00/folly/dynamic-inl.h",
@@ -4043,6 +4039,15 @@
40434039
"../third-party/folly-2018.10.22.00/folly/MoveWrapper.h",
40444040
"../third-party/folly-2018.10.22.00/folly/Optional.h",
40454041
"../third-party/folly-2018.10.22.00/folly/ScopeGuard.h",
4042+
"../third-party/folly-2018.10.22.00/folly/json_pointer.cpp",
4043+
"../third-party/folly-2018.10.22.00/folly/String.cpp",
4044+
"../third-party/folly-2018.10.22.00/folly/detail/Demangle.cpp",
4045+
"../third-party/folly-2018.10.22.00/folly/hash/SpookyHashV2.cpp",
4046+
"../third-party/folly-2018.10.22.00/folly/lang/ColdClass.cpp",
4047+
"../third-party/folly-2018.10.22.00/folly/container/detail/F14Table.cpp",
4048+
"../third-party/folly-2018.10.22.00/folly/ScopeGuard.cpp",
4049+
"../third-party/folly-2018.10.22.00/folly/lang/Assume.cpp",
4050+
"../third-party/folly-2018.10.22.00/folly/Format.cpp",
40464051
"../third-party/double-conversion-1.1.6/src/bignum-dtoa.cc",
40474052
"../third-party/double-conversion-1.1.6/src/bignum-dtoa.h",
40484053
"../third-party/double-conversion-1.1.6/src/bignum.cc",

‎third-party-podspecs/Folly.podspec

-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Pod::Spec.new do |spec|
2222
'folly/Demangle.cpp',
2323
'folly/Format.cpp',
2424
'folly/ScopeGuard.cpp',
25-
'folly/StringBase.cpp',
2625
'folly/Unicode.cpp',
2726
'folly/dynamic.cpp',
2827
'folly/json.cpp',
@@ -32,7 +31,6 @@ Pod::Spec.new do |spec|
3231
'folly/hash/SpookyHashV2.cpp',
3332
'folly/lang/Assume.cpp',
3433
'folly/lang/ColdClass.cpp',
35-
'folly/portability/BitsFunctexcept.cpp',
3634
'folly/memory/detail/MallocImpl.cpp'
3735
# workaround for https://github.com/facebook/react-native/issues/14326
3836
spec.preserve_paths = 'folly/*.h',

0 commit comments

Comments
 (0)