From aebca6bb577b5e55cdfb2c1010e10aea0d71c520 Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Fri, 12 Jul 2019 09:32:38 -0700 Subject: [PATCH] Update OpenSSL dependency Summary: Updated the OpenSSL dependency and released the new versions of Folly and RSocket. Reviewed By: jknoxville Differential Revision: D16222388 fbshipit-source-id: e894650a8c3ac764bc489e843e9a3ccf33688659 --- Flipper.podspec | 4 ++-- FlipperKit.podspec | 2 +- iOS/Podspecs/Flipper-Folly.podspec | 4 ++-- iOS/Podspecs/Flipper-RSocket.podspec | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Flipper.podspec b/Flipper.podspec index 590055e05..b9c5cff00 100644 --- a/Flipper.podspec +++ b/Flipper.podspec @@ -12,8 +12,8 @@ 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', '~> 1.3' - spec.dependency 'Flipper-RSocket', '0.10.4' + spec.dependency 'Flipper-Folly', '~> 2.0' + spec.dependency 'Flipper-RSocket', '~> 1.0' 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 -Wno-global-constructors' diff --git a/FlipperKit.podspec b/FlipperKit.podspec index 10c51cc76..63e5fcd2f 100644 --- a/FlipperKit.podspec +++ b/FlipperKit.podspec @@ -46,7 +46,7 @@ Pod::Spec.new do |spec| spec.subspec 'FBCxxUtils' do |ss| ss.header_dir = 'FBCxxUtils' ss.compiler_flags = folly_compiler_flags - ss.dependency 'Flipper-Folly', '~> 1.3' + ss.dependency 'Flipper-Folly', '~> 2.0' ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{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 afb62e0f3..d59cb599f 100644 --- a/iOS/Podspecs/Flipper-Folly.podspec +++ b/iOS/Podspecs/Flipper-Folly.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'Flipper-Folly' - spec.version = '1.3.4' + spec.version = '2.0.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.' @@ -11,7 +11,7 @@ Pod::Spec.new do |spec| spec.dependency 'boost-for-react-native' spec.dependency 'DoubleConversion' spec.dependency 'glog' - spec.dependency 'OpenSSL-Static', '1.0.2.c1' + spec.dependency 'openssl-ios-bitcode', '~> 1.0' 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/Podspecs/Flipper-RSocket.podspec b/iOS/Podspecs/Flipper-RSocket.podspec index d83903f60..41db4562a 100644 --- a/iOS/Podspecs/Flipper-RSocket.podspec +++ b/iOS/Podspecs/Flipper-RSocket.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'Flipper-RSocket' - spec.version = '0.10.4' + spec.version = '1.0.0' spec.license = { :type => 'MIT' } spec.homepage = 'https://github.com/rsocket/rsocket-cpp' spec.summary = 'C++ implementation of RSocket' @@ -20,7 +20,7 @@ Pod::Spec.new do |spec| spec.libraries = "stdc++" spec.compiler_flags = '-std=c++1y' - spec.dependency 'Flipper-Folly', '~>1.3' + spec.dependency 'Flipper-Folly', '~> 2.0' spec.compiler_flags = '-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 -fexceptions -std=c++14