Update OpenSSL pod and remove exclude arch setting (#1892)
Summary: This PR updates the OpenSSL pod and thus updates the corresponding Folly and RSocket pods. The new OpenSSL pod has a support of arm64 artifact for iPhomeSimulators.This PR also updates the replaces the libevent pod which didn't work with arm64 arch for iPhoneSimulator. ## Changelog - Update OpenSSL pod - Update Folly dep - Update RSocket dep - Replace Libevent pod. Pull Request resolved: https://github.com/facebook/flipper/pull/1892 Test Plan: CI Reviewed By: mweststrate Differential Revision: D26229304 Pulled By: priteshrnandgaonkar fbshipit-source-id: 46256d9cd3e0cf5aab6e477e612c3bcb77e31627
This commit is contained in:
Pritesh Nandgaonkar
committed by
Facebook GitHub Bot
Facebook GitHub Bot
parent
87caca9e77
commit
0ebe3956a4
@@ -16,7 +16,7 @@ target 'SampleSwift' do
|
||||
pod 'Flipper-Folly', :configuration => 'Debug'
|
||||
pod 'Flipper-Glog', :configuration => 'Debug'
|
||||
pod 'Flipper-PeerTalk', :configuration => 'Debug'
|
||||
pod 'CocoaLibEvent', :configuration => 'Debug'
|
||||
pod 'libevent', :configuration => 'Debug'
|
||||
pod 'boost-for-react-native', :configuration => 'Debug'
|
||||
pod 'OpenSSL-Universal', :configuration => 'Debug'
|
||||
pod 'CocoaAsyncSocket', :configuration => 'Debug'
|
||||
|
||||
@@ -1,24 +1,23 @@
|
||||
PODS:
|
||||
- boost-for-react-native (1.63.0)
|
||||
- CocoaAsyncSocket (7.6.5)
|
||||
- CocoaLibEvent (1.0.0)
|
||||
- ComponentKit (0.30):
|
||||
- RenderCore (= 0.30)
|
||||
- Yoga (~> 1.14)
|
||||
- Flipper (0.73.0):
|
||||
- Flipper-Folly (~> 2.3)
|
||||
- Flipper-RSocket (~> 1.1)
|
||||
- Flipper-Folly (~> 2.5)
|
||||
- Flipper-RSocket (~> 1.3)
|
||||
- Flipper-DoubleConversion (1.1.7)
|
||||
- Flipper-Folly (2.3.0):
|
||||
- Flipper-Folly (2.5.1):
|
||||
- boost-for-react-native
|
||||
- CocoaLibEvent (~> 1.0)
|
||||
- Flipper-DoubleConversion
|
||||
- Flipper-Glog
|
||||
- OpenSSL-Universal (= 1.0.2.20)
|
||||
- libevent (~> 2.1.12)
|
||||
- OpenSSL-Universal (= 1.1.180)
|
||||
- Flipper-Glog (0.3.6)
|
||||
- Flipper-PeerTalk (0.0.4)
|
||||
- Flipper-RSocket (1.1.0):
|
||||
- Flipper-Folly (~> 2.2)
|
||||
- Flipper-RSocket (1.3.0):
|
||||
- Flipper-Folly (~> 2.5)
|
||||
- FlipperKit (0.73.0):
|
||||
- FlipperKit/Core (= 0.73.0)
|
||||
- FlipperKit/Core (0.73.0):
|
||||
@@ -30,7 +29,7 @@ PODS:
|
||||
- FlipperKit/CppBridge (0.73.0):
|
||||
- Flipper (~> 0.73.0)
|
||||
- FlipperKit/FBCxxFollyDynamicConvert (0.73.0):
|
||||
- Flipper-Folly (~> 2.3)
|
||||
- Flipper-Folly (~> 2.5)
|
||||
- FlipperKit/FBDefines (0.73.0)
|
||||
- FlipperKit/FKPortForwarding (0.73.0):
|
||||
- CocoaAsyncSocket (~> 7.6)
|
||||
@@ -58,9 +57,8 @@ PODS:
|
||||
- FlipperKit/SKIOSNetworkPlugin (0.73.0):
|
||||
- FlipperKit/Core
|
||||
- FlipperKit/FlipperKitNetworkPlugin
|
||||
- OpenSSL-Universal (1.0.2.20):
|
||||
- OpenSSL-Universal/Static (= 1.0.2.20)
|
||||
- OpenSSL-Universal/Static (1.0.2.20)
|
||||
- libevent (2.1.12)
|
||||
- OpenSSL-Universal (1.1.180)
|
||||
- RenderCore (0.30)
|
||||
- Yoga (1.14.0)
|
||||
- YogaKit (1.18.1):
|
||||
@@ -69,7 +67,6 @@ PODS:
|
||||
DEPENDENCIES:
|
||||
- boost-for-react-native
|
||||
- CocoaAsyncSocket
|
||||
- CocoaLibEvent
|
||||
- ComponentKit (~> 0.30)
|
||||
- Flipper (from `../../Flipper.podspec`)
|
||||
- Flipper-DoubleConversion
|
||||
@@ -81,19 +78,20 @@ DEPENDENCIES:
|
||||
- FlipperKit/FlipperKitLayoutComponentKitSupport (from `../../FlipperKit.podspec`)
|
||||
- FlipperKit/FlipperKitUserDefaultsPlugin (from `../../FlipperKit.podspec`)
|
||||
- FlipperKit/SKIOSNetworkPlugin (from `../../FlipperKit.podspec`)
|
||||
- libevent
|
||||
- OpenSSL-Universal
|
||||
|
||||
SPEC REPOS:
|
||||
https://github.com/CocoaPods/Specs:
|
||||
https://github.com/CocoaPods/Specs.git:
|
||||
- boost-for-react-native
|
||||
- CocoaAsyncSocket
|
||||
- CocoaLibEvent
|
||||
- ComponentKit
|
||||
- Flipper-DoubleConversion
|
||||
- Flipper-Folly
|
||||
- Flipper-Glog
|
||||
- Flipper-PeerTalk
|
||||
- Flipper-RSocket
|
||||
- libevent
|
||||
- OpenSSL-Universal
|
||||
- RenderCore
|
||||
- Yoga
|
||||
@@ -108,20 +106,20 @@ EXTERNAL SOURCES:
|
||||
SPEC CHECKSUMS:
|
||||
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
|
||||
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
|
||||
CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
|
||||
ComponentKit: c34da1ab3515cf18db68a4ba22c6599568d1de74
|
||||
Flipper: 48e20395802172f863b54778a5743b9243acc1f4
|
||||
Flipper: 7b41f823243d0e11d02a7969b1cbd0b2891f55b2
|
||||
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
|
||||
Flipper-Folly: e4493b013c02d9347d5e0cb4d128680239f6c78a
|
||||
Flipper-Folly: f7a3caafbd74bda4827954fd7a6e000e36355489
|
||||
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
|
||||
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
|
||||
Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7
|
||||
FlipperKit: e2cb951c44da9b58eff31ad1c7463691fc75f3fc
|
||||
OpenSSL-Universal: ff34003318d5e1163e9529b08470708e389ffcdd
|
||||
Flipper-RSocket: 602921fee03edacf18f5d6f3d3594ba477f456e5
|
||||
FlipperKit: 2f5961d561206a72c4bbe926d717ae40fae4ea48
|
||||
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
|
||||
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
|
||||
RenderCore: d779c47622b313ce2d51bb36d084517af38b0dc1
|
||||
Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c
|
||||
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
|
||||
|
||||
PODFILE CHECKSUM: b94922166de2df310e9ddb9a17d6509a2f96cea9
|
||||
PODFILE CHECKSUM: 491980555e3479cbdc02de1d54ad3cb5c7388ec5
|
||||
|
||||
COCOAPODS: 1.10.1
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
archiveVersion = 1;
|
||||
classes = {
|
||||
};
|
||||
objectVersion = 50;
|
||||
objectVersion = 51;
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
@@ -108,6 +108,7 @@
|
||||
A1EC522520DED61B007C6977 /* Sources */,
|
||||
A1EC522620DED61B007C6977 /* Frameworks */,
|
||||
A1EC522720DED61B007C6977 /* Resources */,
|
||||
81A476F618E0C49909B529C9 /* [CP] Embed Pods Frameworks */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
@@ -165,6 +166,23 @@
|
||||
/* End PBXResourcesBuildPhase section */
|
||||
|
||||
/* Begin PBXShellScriptBuildPhase section */
|
||||
81A476F618E0C49909B529C9 /* [CP] Embed Pods Frameworks */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputFileListPaths = (
|
||||
"${PODS_ROOT}/Target Support Files/Pods-SampleSwift/Pods-SampleSwift-frameworks-${CONFIGURATION}-input-files.xcfilelist",
|
||||
);
|
||||
name = "[CP] Embed Pods Frameworks";
|
||||
outputFileListPaths = (
|
||||
"${PODS_ROOT}/Target Support Files/Pods-SampleSwift/Pods-SampleSwift-frameworks-${CONFIGURATION}-output-files.xcfilelist",
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SampleSwift/Pods-SampleSwift-frameworks.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
D9A91DD7C5294D8508D0A168 /* [CP] Check Pods Manifest.lock */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
@@ -339,16 +357,29 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/CocoaAsyncSocket\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/ComponentKit\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/Flipper\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/Flipper-DoubleConversion\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/Flipper-Folly\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/Flipper-Glog\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/Flipper-PeerTalk\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/Flipper-RSocket\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/FlipperKit\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/RenderCore\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/Yoga\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/YogaKit\"",
|
||||
);
|
||||
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
|
||||
OTHER_LDFLAGS = (
|
||||
"$(inherited)",
|
||||
"-ObjC",
|
||||
"-l\"crypto\"",
|
||||
"-l\"event\"",
|
||||
"-l\"event_core\"",
|
||||
"-l\"event_extra\"",
|
||||
"-l\"event_pthreads\"",
|
||||
"-l\"ssl\"",
|
||||
"-l\"stdc++\"",
|
||||
"-framework",
|
||||
"\"CFNetwork\"",
|
||||
@@ -380,12 +411,10 @@
|
||||
OTHER_LDFLAGS = (
|
||||
"$(inherited)",
|
||||
"-ObjC",
|
||||
"-l\"crypto\"",
|
||||
"-l\"event\"",
|
||||
"-l\"event_core\"",
|
||||
"-l\"event_extra\"",
|
||||
"-l\"event_pthreads\"",
|
||||
"-l\"ssl\"",
|
||||
"-l\"stdc++\"",
|
||||
"-framework",
|
||||
"\"CFNetwork\"",
|
||||
|
||||
Reference in New Issue
Block a user