From 64efeef70b58565751d5ef8177820d626300be94 Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Mon, 21 Jan 2019 05:48:37 -0800 Subject: [PATCH] Update Flipper to use latest Folly (#356) Summary: Updates Flipper to use latest Folly version Pull Request resolved: https://github.com/facebook/flipper/pull/356 Reviewed By: passy Differential Revision: D13718181 Pulled By: priteshrnandgaonkar fbshipit-source-id: 13a7c2ef37e24295d442fb787f0d5bec0d5e75c6 --- iOS/FlipperKit.podspec | 2 +- xplat/Flipper/Flipper.podspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/iOS/FlipperKit.podspec b/iOS/FlipperKit.podspec index e3b8c2616..1d9c9d45d 100644 --- a/iOS/FlipperKit.podspec +++ b/iOS/FlipperKit.podspec @@ -61,7 +61,7 @@ Pod::Spec.new do |spec| ss.dependency 'FlipperKit/FBCxxUtils' ss.dependency 'FlipperKit/CppBridge' ss.dependency 'FlipperKit/FKPortForwarding' - ss.dependency 'Folly', '~>1.1' + ss.dependency 'Folly', '~>1.2' ss.dependency 'Flipper', '~>'+flipperkit_version ss.dependency 'OpenSSL-Static', '1.0.2.c1' ss.compiler_flags = folly_compiler_flags diff --git a/xplat/Flipper/Flipper.podspec b/xplat/Flipper/Flipper.podspec index 0bc67490b..4b549c47b 100644 --- a/xplat/Flipper/Flipper.podspec +++ b/xplat/Flipper/Flipper.podspec @@ -12,7 +12,7 @@ Pod::Spec.new do |spec| spec.public_header_files = 'xplat/Flipper/*.h','xplat/utils/*.h' spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}','xplat/Flipper/utils/*.{h,cpp,m,mm}' spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.1' + spec.dependency 'Folly', '~>1.2' spec.dependency 'RSocket', '~>0.10' spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_LIBGFLAGS=0 -DFOLLY_HAVE_LIBJEMALLOC=0 -DFOLLY_HAVE_PREADV=0 -DFOLLY_HAVE_PWRITEV=0 -DFOLLY_HAVE_TFO=0 -DFOLLY_USE_SYMBOLIZER=0 -Wall -std=c++14