From abc0ae2b17aed037051008027e8be0b0d689f30c Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Tue, 20 Oct 2020 04:44:15 -0700 Subject: [PATCH] Update OpenSSL dependency Summary: Updates the OpenSSL dependency. Enabling bitcode as the latest version of OpenSSL has bitcode support. Reviewed By: mweststrate Differential Revision: D24276537 fbshipit-source-id: 6f135659d64e8849dcf68266458a8f24ef795be7 --- Flipper.podspec | 2 +- FlipperKit.podspec | 2 +- iOS/Podspecs/Flipper-Folly.podspec | 4 ++-- iOS/Sample/Podfile.lock | 20 +++++++++---------- iOS/Sample/Sample.xcodeproj/project.pbxproj | 4 ++-- iOS/SampleSwift/Podfile.lock | 20 +++++++++---------- .../SampleSwift.xcodeproj/project.pbxproj | 4 ++-- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Flipper.podspec b/Flipper.podspec index 6b99f1571..5b5f5f488 100644 --- a/Flipper.podspec +++ b/Flipper.podspec @@ -17,7 +17,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 'Flipper-Folly', '~> 2.2' + spec.dependency 'Flipper-Folly', '~> 2.3' spec.dependency 'Flipper-RSocket', '~> 1.1' 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 diff --git a/FlipperKit.podspec b/FlipperKit.podspec index 238dff357..5a2ccecd0 100644 --- a/FlipperKit.podspec +++ b/FlipperKit.podspec @@ -50,7 +50,7 @@ Pod::Spec.new do |spec| spec.subspec 'FBCxxFollyDynamicConvert' do |ss| ss.header_dir = 'FBCxxFollyDynamicConvert' ss.compiler_flags = folly_compiler_flags - ss.dependency 'Flipper-Folly', '~> 2.2' + ss.dependency 'Flipper-Folly', '~> 2.3' ss.source_files = 'iOS/FlipperKit/FBCxxFollyDynamicConvert/**/*.{h,mm}' # We set these files as private headers since they only need to be accessed # by other FlipperKit source files diff --git a/iOS/Podspecs/Flipper-Folly.podspec b/iOS/Podspecs/Flipper-Folly.podspec index 0504f654f..8ff3da2d6 100644 --- a/iOS/Podspecs/Flipper-Folly.podspec +++ b/iOS/Podspecs/Flipper-Folly.podspec @@ -5,7 +5,7 @@ Pod::Spec.new do |spec| spec.name = 'Flipper-Folly' - spec.version = '2.2.0' + spec.version = '2.3.0' 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.' @@ -16,7 +16,7 @@ Pod::Spec.new do |spec| spec.dependency 'boost-for-react-native' spec.dependency 'Flipper-Glog' spec.dependency 'Flipper-DoubleConversion' - spec.dependency 'OpenSSL-Universal', '1.0.2.19' + spec.dependency 'OpenSSL-Universal', '1.0.2.20' 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 diff --git a/iOS/Sample/Podfile.lock b/iOS/Sample/Podfile.lock index 84e7a1402..fb98144df 100644 --- a/iOS/Sample/Podfile.lock +++ b/iOS/Sample/Podfile.lock @@ -6,15 +6,15 @@ PODS: - RenderCore (= 0.30) - Yoga (~> 1.14) - Flipper (0.62.0): - - Flipper-Folly (~> 2.2) + - Flipper-Folly (~> 2.3) - Flipper-RSocket (~> 1.1) - Flipper-DoubleConversion (1.1.7) - - Flipper-Folly (2.2.0): + - Flipper-Folly (2.3.0): - boost-for-react-native - CocoaLibEvent (~> 1.0) - Flipper-DoubleConversion - Flipper-Glog - - OpenSSL-Universal (= 1.0.2.19) + - OpenSSL-Universal (= 1.0.2.20) - Flipper-Glog (0.3.6) - Flipper-PeerTalk (0.0.4) - Flipper-RSocket (1.1.0): @@ -30,7 +30,7 @@ PODS: - FlipperKit/CppBridge (0.62.0): - Flipper (~> 0.62.0) - FlipperKit/FBCxxFollyDynamicConvert (0.62.0): - - Flipper-Folly (~> 2.2) + - Flipper-Folly (~> 2.3) - FlipperKit/FBDefines (0.62.0) - FlipperKit/FKPortForwarding (0.62.0): - CocoaAsyncSocket (~> 7.6) @@ -60,9 +60,9 @@ PODS: - FlipperKit/SKIOSNetworkPlugin (0.62.0): - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - - OpenSSL-Universal (1.0.2.19): - - OpenSSL-Universal/Static (= 1.0.2.19) - - OpenSSL-Universal/Static (1.0.2.19) + - OpenSSL-Universal (1.0.2.20): + - OpenSSL-Universal/Static (= 1.0.2.20) + - OpenSSL-Universal/Static (1.0.2.20) - RenderCore (0.30) - Yoga (1.14.0) - YogaKit (1.18.1): @@ -87,7 +87,7 @@ DEPENDENCIES: - OpenSSL-Universal SPEC REPOS: - https://github.com/CocoaPods/Specs: + https://github.com/CocoaPods/Specs.git: - boost-for-react-native - CocoaAsyncSocket - CocoaLibEvent @@ -115,12 +115,12 @@ SPEC CHECKSUMS: ComponentKit: c34da1ab3515cf18db68a4ba22c6599568d1de74 Flipper: 8c34da52a467af6171044444c314dbeb8d5a6d35 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 - Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3 + Flipper-Folly: e4493b013c02d9347d5e0cb4d128680239f6c78a Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7 FlipperKit: 59d616c8b88912d02114f0320fb4824fed54ab35 - OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 + OpenSSL-Universal: ff34003318d5e1163e9529b08470708e389ffcdd RenderCore: d779c47622b313ce2d51bb36d084517af38b0dc1 Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c YogaKit: f782866e155069a2cca2517aafea43200b01fd5a diff --git a/iOS/Sample/Sample.xcodeproj/project.pbxproj b/iOS/Sample/Sample.xcodeproj/project.pbxproj index c7ac3704e..4dcfd560f 100644 --- a/iOS/Sample/Sample.xcodeproj/project.pbxproj +++ b/iOS/Sample/Sample.xcodeproj/project.pbxproj @@ -335,7 +335,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; GCC_NO_COMMON_BLOCKS = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -399,7 +399,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; GCC_NO_COMMON_BLOCKS = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", diff --git a/iOS/SampleSwift/Podfile.lock b/iOS/SampleSwift/Podfile.lock index 15822e9d0..a27d18d3b 100644 --- a/iOS/SampleSwift/Podfile.lock +++ b/iOS/SampleSwift/Podfile.lock @@ -6,15 +6,15 @@ PODS: - RenderCore (= 0.30) - Yoga (~> 1.14) - Flipper (0.62.0): - - Flipper-Folly (~> 2.2) + - Flipper-Folly (~> 2.3) - Flipper-RSocket (~> 1.1) - Flipper-DoubleConversion (1.1.7) - - Flipper-Folly (2.2.0): + - Flipper-Folly (2.3.0): - boost-for-react-native - CocoaLibEvent (~> 1.0) - Flipper-DoubleConversion - Flipper-Glog - - OpenSSL-Universal (= 1.0.2.19) + - OpenSSL-Universal (= 1.0.2.20) - Flipper-Glog (0.3.6) - Flipper-PeerTalk (0.0.4) - Flipper-RSocket (1.1.0): @@ -30,7 +30,7 @@ PODS: - FlipperKit/CppBridge (0.62.0): - Flipper (~> 0.62.0) - FlipperKit/FBCxxFollyDynamicConvert (0.62.0): - - Flipper-Folly (~> 2.2) + - Flipper-Folly (~> 2.3) - FlipperKit/FBDefines (0.62.0) - FlipperKit/FKPortForwarding (0.62.0): - CocoaAsyncSocket (~> 7.6) @@ -58,9 +58,9 @@ PODS: - FlipperKit/SKIOSNetworkPlugin (0.62.0): - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - - OpenSSL-Universal (1.0.2.19): - - OpenSSL-Universal/Static (= 1.0.2.19) - - OpenSSL-Universal/Static (1.0.2.19) + - OpenSSL-Universal (1.0.2.20): + - OpenSSL-Universal/Static (= 1.0.2.20) + - OpenSSL-Universal/Static (1.0.2.20) - RenderCore (0.30) - Yoga (1.14.0) - YogaKit (1.18.1): @@ -84,7 +84,7 @@ DEPENDENCIES: - OpenSSL-Universal SPEC REPOS: - https://github.com/CocoaPods/Specs: + https://github.com/CocoaPods/Specs.git: - boost-for-react-native - CocoaAsyncSocket - CocoaLibEvent @@ -112,12 +112,12 @@ SPEC CHECKSUMS: ComponentKit: c34da1ab3515cf18db68a4ba22c6599568d1de74 Flipper: 8c34da52a467af6171044444c314dbeb8d5a6d35 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 - Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3 + Flipper-Folly: e4493b013c02d9347d5e0cb4d128680239f6c78a Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7 FlipperKit: 59d616c8b88912d02114f0320fb4824fed54ab35 - OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 + OpenSSL-Universal: ff34003318d5e1163e9529b08470708e389ffcdd RenderCore: d779c47622b313ce2d51bb36d084517af38b0dc1 Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c YogaKit: f782866e155069a2cca2517aafea43200b01fd5a diff --git a/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj b/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj index 53f0f00fe..b3f915fea 100644 --- a/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj +++ b/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj @@ -333,7 +333,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; INFOPLIST_FILE = SampleSwift/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -370,7 +370,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; INFOPLIST_FILE = SampleSwift/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)",