jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated the OpenSSL dependency (#577)

Browse Source 
Summary:
This PR updates the openssl dependency with OpenSSL-Universal, which ships a fat-binary of libssl and libcrypto with all the architecture.

This PR also updates the travis to cache cocoapods checkout directory.

## Changelog

Updated Flipper-Folly deps
Pull Request resolved: https://github.com/facebook/flipper/pull/577

Test Plan: CI

Reviewed By: jknoxville

Differential Revision: D17877304

Pulled By: priteshrnandgaonkar

fbshipit-source-id: 9d13308108b6665d4bf5dd6145fcaafa2a2a8a13
This commit is contained in:
Pritesh Nandgaonkar
2019-10-11 07:53:06 -07:00
committed by Facebook Github Bot
parent 0479309dd1
commit ab121f9d96
6 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
iOS/Podspecs/Flipper-Folly.podspec
View File

@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'Flipper-Folly'
spec.version = '2.0.0'
spec.version = '2.0.2'
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.'
@@ -11,7 +11,7 @@ Pod::Spec.new do |spec|
spec.dependency 'boost-for-react-native'
spec.dependency 'DoubleConversion'
spec.dependency 'glog'
spec.dependency 'openssl-ios-bitcode', '~> 1.0'
spec.dependency 'OpenSSL-Universal', '1.0.2.19'
spec.dependency 'CocoaLibEvent', '~> 1.0'
spec.compiler_flags = '-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 -DFOLLY_USE_SYMBOLIZER=0
-frtti

2
iOS/Sample/Podfile
View File

@@ -20,7 +20,7 @@ target 'Sample' do
# $static_framework = ['FlipperKit', 'Flipper', 'Flipper-Folly',
# 'CocoaAsyncSocket', 'ComponentKit', 'DoubleConversion',
# 'glog', 'Flipper-PeerTalk', 'Flipper-RSocket', 'Yoga', 'YogaKit',
# 'CocoaLibEvent', 'openssl-ios-bitcode', 'boost-for-react-native']
# 'CocoaLibEvent', 'OpenSSL-Universal', 'boost-for-react-native']
#
# pre_install do |installer|
# Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}

2
iOS/SampleSwift/Podfile
View File

@@ -19,7 +19,7 @@ target 'SampleSwift' do
# $static_framework = ['FlipperKit', 'Flipper', 'Flipper-Folly',
# 'CocoaAsyncSocket', 'ComponentKit', 'DoubleConversion',
# 'glog', 'Flipper-PeerTalk', 'Flipper-RSocket', 'Yoga', 'YogaKit',
# 'CocoaLibEvent', 'openssl-ios-bitcode', 'boost-for-react-native']
# 'CocoaLibEvent', 'OpenSSL-Universal', 'boost-for-react-native']
#
# pre_install do |installer|
# Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}

2
iOS/Tutorial/Podfile
View File

@@ -20,7 +20,7 @@ target 'Tutorial' do
$static_framework = ['FlipperKit', 'Flipper', 'Flipper-Folly',
'CocoaAsyncSocket', 'ComponentKit', 'DoubleConversion',
'glog', 'Flipper-PeerTalk', 'Flipper-RSocket', 'Yoga', 'YogaKit',
'CocoaLibEvent', 'openssl-ios-bitcode', 'boost-for-react-native']
'CocoaLibEvent', 'OpenSSL-Universal', 'boost-for-react-native']
pre_install do |installer|
Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}