From 2bbd781cae52e716e4547722621149e3c074c07c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Py=C4=87?= Date: Thu, 1 Jul 2021 07:03:47 -0700 Subject: [PATCH] Update Flipper-Folly.podspec (#2515) Summary: OpenSSL-Univeral cause app to crash with `rpath/OpenSSL.framework/OpenSSL' not found` when [debugger is not attached] (https://github.com/krzyzanowskim/OpenSSL/issues/115). Looks like this was caused by arm64e slice and it's now resolved in version 1.1.1000 It also updates the folly version to the latest checkout and solves this task T94605859. According to this task it has been asked by folly team to update its dependency to the latest version. ## Changelog Bump OpenSSL-Universal to version 1.1.1000 Use latest folly checkout v2021.06.14.00 Pull Request resolved: https://github.com/facebook/flipper/pull/2515 Test Plan: There are no code changes, this only removes problematic arm64 slice from OpenSSL-Universal xcframework. Reviewed By: nikoant Differential Revision: D29489739 Pulled By: priteshrnandgaonkar fbshipit-source-id: cd54eccddb9fb87c9e0e25c3b2cedbdb74408f92 --- iOS/Podspecs/Flipper-Folly.podspec | 6 +++--- iOS/Sample/Podfile.lock | 6 +++--- iOS/SampleSwift/Podfile.lock | 6 +++--- iOS/Tutorial/Podfile.lock | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/iOS/Podspecs/Flipper-Folly.podspec b/iOS/Podspecs/Flipper-Folly.podspec index e43997c13..d31f8ce54 100644 --- a/iOS/Podspecs/Flipper-Folly.podspec +++ b/iOS/Podspecs/Flipper-Folly.podspec @@ -5,18 +5,18 @@ Pod::Spec.new do |spec| spec.name = 'Flipper-Folly' - spec.version = '2.6.7' + spec.version = '2.6.9' 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.' spec.authors = 'Facebook' spec.source = { :git => 'https://github.com/facebook/folly.git', - :tag => "v2021.04.26.00"} + :tag => "v2021.06.14.00"} spec.module_name = 'folly' spec.dependency 'Flipper-Boost-iOSX' spec.dependency 'Flipper-Glog' spec.dependency 'Flipper-DoubleConversion' - spec.dependency 'OpenSSL-Universal', '1.1.180' + spec.dependency 'OpenSSL-Universal', '1.1.1100' spec.dependency 'libevent', '~> 2.1.12' spec.dependency 'Flipper-Fmt', '7.1.7' spec.compiler_flags = '-DFOLLY_HAVE_BACKTRACE=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_PTHREAD=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 diff --git a/iOS/Sample/Podfile.lock b/iOS/Sample/Podfile.lock index 907b226dd..9f61ed0d7 100644 --- a/iOS/Sample/Podfile.lock +++ b/iOS/Sample/Podfile.lock @@ -9,7 +9,7 @@ PODS: - Flipper-Boost-iOSX (1.76.0.1.11) - Flipper-DoubleConversion (3.1.7) - Flipper-Fmt (7.1.7) - - Flipper-Folly (2.6.8): + - Flipper-Folly (2.6.9): - Flipper-Boost-iOSX - Flipper-DoubleConversion - Flipper-Fmt (= 7.1.7) @@ -99,7 +99,7 @@ DEPENDENCIES: - OpenSSL-Universal SPEC REPOS: - https://github.com/CocoaPods/Specs: + https://github.com/CocoaPods/Specs.git: - CocoaAsyncSocket - ComponentKit - Flipper-Boost-iOSX @@ -128,7 +128,7 @@ SPEC CHECKSUMS: Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b - Flipper-Folly: a9e04759dd1da8ffaa7ccca7679688cabbb626cf + Flipper-Folly: 4c7cf530a9038ae25b0fa37e00b00491c467aaea Flipper-Glog: 05579840e2750ec907ee2f81544f41ad76a7cae4 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 diff --git a/iOS/SampleSwift/Podfile.lock b/iOS/SampleSwift/Podfile.lock index 25281cb04..c7447323c 100644 --- a/iOS/SampleSwift/Podfile.lock +++ b/iOS/SampleSwift/Podfile.lock @@ -10,7 +10,7 @@ PODS: - Flipper-Boost-iOSX (1.76.0.1.11) - Flipper-DoubleConversion (3.1.7) - Flipper-Fmt (7.1.7) - - Flipper-Folly (2.6.8): + - Flipper-Folly (2.6.9): - Flipper-Boost-iOSX - Flipper-DoubleConversion - Flipper-Fmt (= 7.1.7) @@ -96,7 +96,7 @@ DEPENDENCIES: - OpenSSL-Universal SPEC REPOS: - https://github.com/CocoaPods/Specs: + https://github.com/CocoaPods/Specs.git: - boost-for-react-native - CocoaAsyncSocket - ComponentKit @@ -127,7 +127,7 @@ SPEC CHECKSUMS: Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b - Flipper-Folly: a9e04759dd1da8ffaa7ccca7679688cabbb626cf + Flipper-Folly: 4c7cf530a9038ae25b0fa37e00b00491c467aaea Flipper-Glog: 05579840e2750ec907ee2f81544f41ad76a7cae4 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 diff --git a/iOS/Tutorial/Podfile.lock b/iOS/Tutorial/Podfile.lock index 4203c8fa5..d4b2ec37e 100644 --- a/iOS/Tutorial/Podfile.lock +++ b/iOS/Tutorial/Podfile.lock @@ -9,7 +9,7 @@ PODS: - Flipper-Boost-iOSX (1.76.0.1.11) - Flipper-DoubleConversion (3.1.7) - Flipper-Fmt (7.1.7) - - Flipper-Folly (2.6.8): + - Flipper-Folly (2.6.9): - Flipper-Boost-iOSX - Flipper-DoubleConversion - Flipper-Fmt (= 7.1.7) @@ -108,8 +108,8 @@ SPEC CHECKSUMS: Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b - Flipper-Folly: a9e04759dd1da8ffaa7ccca7679688cabbb626cf - Flipper-Glog: 05579840e2750ec907ee2f81544f41ad76a7cae4 + Flipper-Folly: 4c7cf530a9038ae25b0fa37e00b00491c467aaea + Flipper-Glog: 1d83ad3697bf5baf44c9f18202cd2578797066f6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 FlipperKit: eba86e7b40917336b4af05561c2cb46e39a63802