Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Xcode 10 builds (broken by folly upgrade) #22394

Closed
wants to merge 4 commits into from
Closed

Fix Xcode 10 builds (broken by folly upgrade) #22394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da2e58f
Fix folly upgrade broke Xcode 10 builds
radko93 Nov 23, 2018
ad069e7
Add missing folly files to Third Party Install script
radko93 Nov 23, 2018
97b7d2c
Remove non-existent files from folly podspec
radko93 Nov 23, 2018
c8452fe
Update cocoapods checksums
radko93 Nov 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions RNTester/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
15 changes: 10 additions & 5 deletions React/React.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 0 additions & 2 deletions third-party-podspecs/Folly.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down