Skip to content

Commit

Permalink
Updated the OpenSSL dependency (#577)
Browse files Browse the repository at this point in the history
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: #577

Test Plan: CI

Reviewed By: jknoxville

Differential Revision: D17877304

Pulled By: priteshrnandgaonkar

fbshipit-source-id: 9d13308108b6665d4bf5dd6145fcaafa2a2a8a13
  • Loading branch information
priteshrnandgaonkar authored and facebook-github-bot committed Oct 11, 2019
1 parent 0479309 commit ab121f9
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 11 deletions.
13 changes: 10 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,15 @@ matrix:
- yarn build --mac --version=$TRAVIS_BUILD_NUMBER

- language: objective-c
cache:
cocoapods: true
directories:
- $HOME/Library/Caches/CocoaPods/Pods/Release/

cache: cocoapods

before_install:
- gem install cocoapods
- pod --version
- rm -rf iOS/Sample/Pods
- rm -f iOS/Sample/Podfile.lock
- rm -f iOS/Sample/build.log
- rm -f iOS/SampleSwift/Podfile.lock
Expand All @@ -63,12 +65,16 @@ matrix:
- IPHONESIMULATOR=$(xcodebuild -showsdks | grep -o "iphonesimulator[0-9]\\+\\.[0-9]\\+$")
- travis_wait xcodebuild clean build -workspace Sample.xcworkspace -scheme Sample -sdk $IPHONESIMULATOR -quiet > ./build.log
- tail -100 ./build.log

- language: objective-c
cache:
cocoapods: true
directories:
- $HOME/Library/Caches/CocoaPods/Pods/Release/

before_install:
- gem install cocoapods
- pod --version
- rm -rf iOS/SampleSwift/Pods
- rm -f iOS/SampleSwift/Podfile.lock
- rm -f iOS/SampleSwift/build.log
- pod repo update --silent
Expand All @@ -83,6 +89,7 @@ matrix:
- IPHONESIMULATOR=$(xcodebuild -showsdks | grep -o "iphonesimulator[0-9]\\+\\.[0-9]\\+$")
- travis_wait xcodebuild clean build -workspace SampleSwift.xcworkspace -scheme SampleSwift -sdk $IPHONESIMULATOR -quiet > ./build.log
- tail -100 ./build.log

- language: android
os: linux
dist: trusty
Expand Down
6 changes: 3 additions & 3 deletions docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ target 'MyApp' 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) {}
Expand Down Expand Up @@ -193,7 +193,7 @@ target 'MyApp' 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) {}
Expand Down Expand Up @@ -642,4 +642,4 @@ Lastly, open the Flipper desktop app, and run `yarn ios` in your terminal.
## Having trouble?
See the [troubleshooting page](troubleshooting.html) for help with known problems.
See the [troubleshooting page](troubleshooting.html) for help with known problems.
4 changes: 2 additions & 2 deletions iOS/Podspecs/Flipper-Folly.podspec
Original file line number Diff line number Diff line change
@@ -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.'
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion iOS/Sample/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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) {}
Expand Down
2 changes: 1 addition & 1 deletion iOS/SampleSwift/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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) {}
Expand Down
2 changes: 1 addition & 1 deletion iOS/Tutorial/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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) {}
Expand Down

0 comments on commit ab121f9

Please sign in to comment.