Skip to content
This repository was archived by the owner on Nov 22, 2024. It is now read-only.

Commit ab121f9

Browse files
priteshrnandgaonkarfacebook-github-bot
priteshrnandgaonkar
authored and
facebook-github-bot
committed
Updated the OpenSSL dependency (#577)
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
1 parent 0479309 commit ab121f9

File tree

6 files changed

+18
-11
lines changed

6 files changed

+18
-11
lines changed

‎.travis.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,15 @@ matrix:
4040
- yarn build --mac --version=$TRAVIS_BUILD_NUMBER
4141

4242
- language: objective-c
43+
cache:
44+
cocoapods: true
45+
directories:
46+
- $HOME/Library/Caches/CocoaPods/Pods/Release/
4347

44-
cache: cocoapods
4548

4649
before_install:
4750
- gem install cocoapods
4851
- pod --version
49-
- rm -rf iOS/Sample/Pods
5052
- rm -f iOS/Sample/Podfile.lock
5153
- rm -f iOS/Sample/build.log
5254
- rm -f iOS/SampleSwift/Podfile.lock
@@ -63,12 +65,16 @@ matrix:
6365
- IPHONESIMULATOR=$(xcodebuild -showsdks | grep -o "iphonesimulator[0-9]\\+\\.[0-9]\\+$")
6466
- travis_wait xcodebuild clean build -workspace Sample.xcworkspace -scheme Sample -sdk $IPHONESIMULATOR -quiet > ./build.log
6567
- tail -100 ./build.log
68+
6669
- language: objective-c
70+
cache:
71+
cocoapods: true
72+
directories:
73+
- $HOME/Library/Caches/CocoaPods/Pods/Release/
6774

6875
before_install:
6976
- gem install cocoapods
7077
- pod --version
71-
- rm -rf iOS/SampleSwift/Pods
7278
- rm -f iOS/SampleSwift/Podfile.lock
7379
- rm -f iOS/SampleSwift/build.log
7480
- pod repo update --silent
@@ -83,6 +89,7 @@ matrix:
8389
- IPHONESIMULATOR=$(xcodebuild -showsdks | grep -o "iphonesimulator[0-9]\\+\\.[0-9]\\+$")
8490
- travis_wait xcodebuild clean build -workspace SampleSwift.xcworkspace -scheme SampleSwift -sdk $IPHONESIMULATOR -quiet > ./build.log
8591
- tail -100 ./build.log
92+
8693
- language: android
8794
os: linux
8895
dist: trusty

‎docs/getting-started.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ target 'MyApp' do
130130
# $static_framework = ['FlipperKit', 'Flipper', 'Flipper-Folly',
131131
# 'CocoaAsyncSocket', 'ComponentKit', 'DoubleConversion',
132132
# 'glog', 'Flipper-PeerTalk', 'Flipper-RSocket', 'Yoga', 'YogaKit',
133-
# 'CocoaLibEvent', 'openssl-ios-bitcode', 'boost-for-react-native']
133+
# 'CocoaLibEvent', 'OpenSSL-Universal', 'boost-for-react-native']
134134
#
135135
# pre_install do |installer|
136136
# Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
@@ -193,7 +193,7 @@ target 'MyApp' do
193193
# $static_framework = ['FlipperKit', 'Flipper', 'Flipper-Folly',
194194
# 'CocoaAsyncSocket', 'ComponentKit', 'DoubleConversion',
195195
# 'glog', 'Flipper-PeerTalk', 'Flipper-RSocket', 'Yoga', 'YogaKit',
196-
# 'CocoaLibEvent', 'openssl-ios-bitcode', 'boost-for-react-native']
196+
# 'CocoaLibEvent', 'OpenSSL-Universal', 'boost-for-react-native']
197197
#
198198
# pre_install do |installer|
199199
# Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
@@ -642,4 +642,4 @@ Lastly, open the Flipper desktop app, and run `yarn ios` in your terminal.
642642
643643
## Having trouble?
644644
645-
See the [troubleshooting page](troubleshooting.html) for help with known problems.
645+
See the [troubleshooting page](troubleshooting.html) for help with known problems.

‎iOS/Podspecs/Flipper-Folly.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |spec|
22
spec.name = 'Flipper-Folly'
3-
spec.version = '2.0.0'
3+
spec.version = '2.0.2'
44
spec.license = { :type => 'Apache License, Version 2.0' }
55
spec.homepage = 'https://github.com/facebook/folly'
66
spec.summary = 'An open-source C++ library developed and used at Facebook.'
@@ -11,7 +11,7 @@ Pod::Spec.new do |spec|
1111
spec.dependency 'boost-for-react-native'
1212
spec.dependency 'DoubleConversion'
1313
spec.dependency 'glog'
14-
spec.dependency 'openssl-ios-bitcode', '~> 1.0'
14+
spec.dependency 'OpenSSL-Universal', '1.0.2.19'
1515
spec.dependency 'CocoaLibEvent', '~> 1.0'
1616
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
1717
-frtti

‎iOS/Sample/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ target 'Sample' do
2020
# $static_framework = ['FlipperKit', 'Flipper', 'Flipper-Folly',
2121
# 'CocoaAsyncSocket', 'ComponentKit', 'DoubleConversion',
2222
# 'glog', 'Flipper-PeerTalk', 'Flipper-RSocket', 'Yoga', 'YogaKit',
23-
# 'CocoaLibEvent', 'openssl-ios-bitcode', 'boost-for-react-native']
23+
# 'CocoaLibEvent', 'OpenSSL-Universal', 'boost-for-react-native']
2424
#
2525
# pre_install do |installer|
2626
# Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}

‎iOS/SampleSwift/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ target 'SampleSwift' do
1919
# $static_framework = ['FlipperKit', 'Flipper', 'Flipper-Folly',
2020
# 'CocoaAsyncSocket', 'ComponentKit', 'DoubleConversion',
2121
# 'glog', 'Flipper-PeerTalk', 'Flipper-RSocket', 'Yoga', 'YogaKit',
22-
# 'CocoaLibEvent', 'openssl-ios-bitcode', 'boost-for-react-native']
22+
# 'CocoaLibEvent', 'OpenSSL-Universal', 'boost-for-react-native']
2323
#
2424
# pre_install do |installer|
2525
# Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}

‎iOS/Tutorial/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ target 'Tutorial' do
2020
$static_framework = ['FlipperKit', 'Flipper', 'Flipper-Folly',
2121
'CocoaAsyncSocket', 'ComponentKit', 'DoubleConversion',
2222
'glog', 'Flipper-PeerTalk', 'Flipper-RSocket', 'Yoga', 'YogaKit',
23-
'CocoaLibEvent', 'openssl-ios-bitcode', 'boost-for-react-native']
23+
'CocoaLibEvent', 'OpenSSL-Universal', 'boost-for-react-native']
2424

2525
pre_install do |installer|
2626
Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}

0 commit comments

Comments
 (0)