jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert D30371791

Browse Source 
Summary: Revert D30371791 (cac09d14aa) to address undefined symbols for a few sandcastle jobs

Reviewed By: fabiomassimo

Differential Revision: D30606610

fbshipit-source-id: 24a5c08bcf5456a96469650a4207b05970399181
This commit is contained in:
Lorenzo Blasa
2021-08-27 11:03:26 -07:00
committed by Facebook GitHub Bot
parent 6383c0c15f
commit fe23ea038c
10 changed files with 33 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
FlipperKit.podspec
View File

@@ -77,11 +77,10 @@ Pod::Spec.new do |spec|
ss.dependency 'FlipperKit/CppBridge' ss.dependency 'FlipperKit/CppBridge'
ss.dependency 'FlipperKit/FKPortForwarding' ss.dependency 'FlipperKit/FKPortForwarding'
ss.dependency 'Flipper', '~>'+flipperkit_version ss.dependency 'Flipper', '~>'+flipperkit_version
ss.dependency 'SocketRocket', '~> 0.6.0'
ss.compiler_flags = folly_compiler_flags ss.compiler_flags = folly_compiler_flags
ss.source_files = 'iOS/FlipperKit/*.{h,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}' ss.source_files = 'iOS/FlipperKit/*.{h,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}'
ss.public_header_files = 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros,FlipperKitCertificateProvider}.h' ss.public_header_files = 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros,FlipperKitCertificateProvider}.h'
header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit/\" \"$(PODS_ROOT)/Headers/Private/FlipperKit/\" \"$(PODS_ROOT)/Flipper-Boost-iOSX\" \"$(PODS_ROOT)/SocketRocket\" \"$(PODS_ROOT)/libevent/include\"" header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit/\" \"$(PODS_ROOT)/Headers/Private/FlipperKit/\" \"$(PODS_ROOT)/Flipper-Boost-iOSX\" \"$(PODS_ROOT)/libevent/include\""
ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
"ONLY_ACTIVE_ARCH": "YES", "ONLY_ACTIVE_ARCH": "YES",
"DEFINES_MODULE" => "YES", "DEFINES_MODULE" => "YES",

7
iOS/FlipperKit/FlipperClient.mm
View File

@@ -10,14 +10,12 @@
#import "FlipperClient.h" #import "FlipperClient.h"
#import <Flipper/FlipperCertificateProvider.h> #import <Flipper/FlipperCertificateProvider.h>
#import <Flipper/FlipperClient.h> #import <Flipper/FlipperClient.h>
#import <Flipper/FlipperSocketProvider.h>
#include <folly/io/async/EventBase.h> #include <folly/io/async/EventBase.h>
#include <folly/io/async/ScopedEventBaseThread.h> #include <folly/io/async/ScopedEventBaseThread.h>
#include <memory> #include <memory>
#import "FlipperClient+Testing.h" #import "FlipperClient+Testing.h"
#import "FlipperCppWrapperPlugin.h" #import "FlipperCppWrapperPlugin.h"
#import "FlipperKitCertificateProvider.h" #import "FlipperKitCertificateProvider.h"
#import "FlipperWebSocket.h"
#import "SKEnvironmentVariables.h" #import "SKEnvironmentVariables.h"
#include "SKStateUpdateCPPWrapper.h" #include "SKStateUpdateCPPWrapper.h"
@@ -103,11 +101,6 @@ using WrapperPlugin = facebook::flipper::FlipperCppWrapperPlugin;
[SKEnvironmentVariables getInsecurePort], [SKEnvironmentVariables getInsecurePort],
[SKEnvironmentVariables getSecurePort]}); [SKEnvironmentVariables getSecurePort]});
_cppClient = facebook::flipper::FlipperClient::instance(); _cppClient = facebook::flipper::FlipperClient::instance();
// To switch to a websocket provider, uncomment the line below.
// facebook::flipper::FlipperSocketProvider::setDefaultProvider(
// std::make_unique<facebook::flipper::FlipperWebSocketProvider>());
} catch (const std::system_error& e) { } catch (const std::system_error& e) {
// Probably ran out of disk space. // Probably ran out of disk space.
return nil; return nil;

53
iOS/FlipperKit/FlipperPlatformWebSocket.h
View File

@@ -1,53 +0,0 @@
/*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
#ifdef FB_SONARKIT_ENABLED
#import <Flipper/FlipperTransportTypes.h>
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
/// Defines a WebSocket transport to be used by Flipper. It just acts as a
/// wrapper on top of a WebSocket connection mainly used to abstract the actual
/// used implementation.
@interface FlipperPlatformWebSocket : NSObject
/// An event handler used to dispatch socket events to the caller.
@property(nonatomic) facebook::flipper::SocketEventHandler eventHandler;
/// A message handler used to dispatch messages received from the server.
@property(nonatomic) facebook::flipper::SocketMessageHandler messageHandler;
/// A certificate provider used to obtain the client certificate used for
/// authentication.
@property(nonatomic)
facebook::flipper::SocketCertificateProvider certificateProvider;
/// Initializes an instance of FliperWebSocketTransport with an endpoint URL.
/// @param url Endpoint URL used to establish the connection.
- (instancetype)initWithURL:(NSURL* _Nonnull)url;
/// Connect to the endpoint.
- (void)connect;
/// Disconnects from the endpoint.
- (void)disconnect;
/// Send a message to the endpoint.
/// @param message The message as text to be sent to the endpoint.
/// @param error A pointer to variable for an `NSError` object.
/// If an error occurs, the pointer is set to an `NSError` object containing
/// information about the error. You may specify `nil` to ignore the error
/// information.
- (void)send:(NSString*)message error:(NSError**)error;
@end
NS_ASSUME_NONNULL_END
#endif

219
iOS/FlipperKit/FlipperPlatformWebSocket.mm
View File

@@ -1,219 +0,0 @@
/*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
#ifdef FB_SONARKIT_ENABLED
#import "FlipperPlatformWebSocket.h"
#import <Flipper/Log.h>
#import <SocketRocket/SocketRocket.h>
static constexpr int connectionKeepaliveSeconds = 10;
#pragma mark - FlipperClientCertificateSecurityPolicy
@interface FlipperClientCertificateSecurityPolicy : SRSecurityPolicy
@property(nonatomic)
facebook::flipper::SocketCertificateProvider certificateProvider;
- (id)initWithCertificateProvider:
(facebook::flipper::SocketCertificateProvider)certificateProvider;
@end
@implementation FlipperClientCertificateSecurityPolicy
- (id)initWithCertificateProvider:
(facebook::flipper::SocketCertificateProvider)certificateProvider {
self = [super init];
if (self) {
_certificateProvider = certificateProvider;
}
return self;
}
/**
Updates all the security options for output streams, used for client
certificate authentication.
@param stream Stream to update the options in.
*/
- (void)updateSecurityOptionsInStream:(NSStream*)stream {
if (!_certificateProvider || ![stream isKindOfClass:[NSOutputStream class]]) {
return;
}
NSMutableDictionary* SSLOptions = [[NSMutableDictionary alloc] init];
[stream setProperty:(__bridge id)kCFStreamSocketSecurityLevelNegotiatedSSL
forKey:(__bridge id)kCFStreamPropertySocketSecurityLevel];
char PASSWORD[512] = {};
auto certificatePath = _certificateProvider(&PASSWORD[0], 512);
NSString* certificatePathObjC =
[NSString stringWithUTF8String:certificatePath.c_str()];
NSData* certificateData = [NSData dataWithContentsOfFile:certificatePathObjC];
NSString* password = [NSString stringWithUTF8String:PASSWORD];
NSDictionary* optionsDictionary = [NSDictionary
dictionaryWithObject:password
forKey:(__bridge id)kSecImportExportPassphrase];
CFArrayRef items = NULL;
OSStatus status = SecPKCS12Import(
(__bridge CFDataRef)certificateData,
(__bridge CFDictionaryRef)optionsDictionary,
&items);
if (status != noErr) {
return;
}
CFDictionaryRef identityDictionary =
(CFDictionaryRef)CFArrayGetValueAtIndex(items, 0);
SecIdentityRef identity = (SecIdentityRef)CFDictionaryGetValue(
identityDictionary, kSecImportItemIdentity);
SecCertificateRef certificate = NULL;
status = SecIdentityCopyCertificate(identity, &certificate);
if (status != noErr) {
return;
}
NSArray* certificates = [[NSArray alloc]
initWithObjects:(__bridge id)identity, (__bridge id)certificate, nil];
[SSLOptions setObject:[NSNumber numberWithBool:NO]
forKey:(NSString*)kCFStreamSSLValidatesCertificateChain];
[SSLOptions setObject:(NSString*)kCFStreamSocketSecurityLevelNegotiatedSSL
forKey:(NSString*)kCFStreamSSLLevel];
[SSLOptions setObject:(NSString*)kCFStreamSocketSecurityLevelNegotiatedSSL
forKey:(NSString*)kCFStreamPropertySocketSecurityLevel];
[SSLOptions setObject:certificates
forKey:(NSString*)kCFStreamSSLCertificates];
[SSLOptions setObject:[NSNumber numberWithBool:NO]
forKey:(NSString*)kCFStreamSSLIsServer];
[stream setProperty:SSLOptions
forKey:(__bridge id)kCFStreamPropertySSLSettings];
}
@end
#pragma mark - FlipperPlatformWebSocket
@interface FlipperPlatformWebSocket ()<SRWebSocketDelegate> {
NSURL* _url;
NSTimer* _keepAlive;
FlipperClientCertificateSecurityPolicy* _policy;
}
@property(nonatomic, strong) SRWebSocket* socket;
@end
@implementation FlipperPlatformWebSocket
- (instancetype)initWithURL:(NSURL* _Nonnull)url {
self = [super init];
if (self) {
_url = url;
_policy = [FlipperClientCertificateSecurityPolicy new];
}
return self;
}
- (void)dealloc {
[self disconnect];
}
- (void)connect {
if (_socket) {
return;
}
self.socket = [[SRWebSocket alloc] initWithURL:_url securityPolicy:_policy];
[_socket setDelegate:self];
[_socket open];
}
- (void)disconnect {
if ([_keepAlive isValid]) {
[_keepAlive invalidate];
}
_keepAlive = nil;
if (_socket) {
// Manually trigger a 'close' event as SocketRocket close method will
// not notify the delegate. SocketRocket only triggers the close event
// when the connection is closed from the server.
_eventHandler(facebook::flipper::SocketEvent::CLOSE);
[_socket close];
_socket = nil;
}
}
- (void)send:(NSString*)message error:(NSError**)error {
[_socket sendString:message error:error];
if (error != nil && *error) {
facebook::flipper::log("Unable to send message.");
}
}
- (void)setCertificateProvider:
(facebook::flipper::SocketCertificateProvider)certificateProvider {
_certificateProvider = certificateProvider;
_policy.certificateProvider = certificateProvider;
}
- (void)sendScheduledKeepAlive:(NSTimer*)timer {
[_socket sendPing:nil error:nil];
}
- (void)webSocketDidOpen:(SRWebSocket*)webSocket {
_eventHandler(facebook::flipper::SocketEvent::OPEN);
if (!_keepAlive) {
__weak auto weakSocket = _socket;
_keepAlive =
[NSTimer scheduledTimerWithTimeInterval:connectionKeepaliveSeconds
repeats:YES
block:^(NSTimer* timer) {
auto _Nullable socket = weakSocket;
[socket sendPing:nil error:nil];
}];
}
}
- (void)webSocket:(SRWebSocket*)webSocket didFailWithError:(NSError*)error {
_eventHandler(facebook::flipper::SocketEvent::ERROR);
_socket = nil;
}
- (void)webSocket:(SRWebSocket*)webSocket
didCloseWithCode:(NSInteger)code
reason:(NSString*)reason
wasClean:(BOOL)wasClean {
_eventHandler(facebook::flipper::SocketEvent::CLOSE);
_socket = nil;
}
- (void)webSocket:(SRWebSocket*)webSocket didReceiveMessage:(id)message {
if (message && _messageHandler) {
NSString* response = message;
_messageHandler([response UTF8String]);
}
}
@end
#endif

93
iOS/FlipperKit/FlipperWebSocket.h
View File

@@ -1,93 +0,0 @@
/*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
#ifdef FB_SONARKIT_ENABLED
#pragma once
#import <Flipper/FlipperSocket.h>
#import <Flipper/FlipperSocketProvider.h>
#import <Flipper/FlipperTransportTypes.h>
#import <folly/dynamic.h>
#import <folly/io/async/EventBase.h>
#import <future>
#import <memory>
@class FlipperPlatformWebSocket;
namespace facebook {
namespace flipper {
class FlipperConnectionManager;
class ConnectionContextStore;
class FlipperWebSocket : public FlipperSocket {
public:
FlipperWebSocket(
FlipperConnectionEndpoint endpoint,
std::unique_ptr<FlipperSocketBasePayload> payload,
folly::EventBase* eventBase);
FlipperWebSocket(
FlipperConnectionEndpoint endpoint,
std::unique_ptr<FlipperSocketBasePayload> payload,
folly::EventBase* eventBase,
ConnectionContextStore* connectionContextStore);
virtual ~FlipperWebSocket() {}
virtual void setEventHandler(SocketEventHandler eventHandler) override;
virtual void setMessageHandler(SocketMessageHandler messageHandler) override;
virtual bool connect(FlipperConnectionManager* manager) override;
virtual void disconnect() override;
virtual void send(const folly::dynamic& message, SocketSendHandler completion)
override;
virtual void send(const std::string& message, SocketSendHandler completion)
override;
virtual void sendExpectResponse(
const std::string& message,
SocketSendExpectResponseHandler completion) override;
private:
FlipperConnectionEndpoint endpoint_;
std::unique_ptr<FlipperSocketBasePayload> payload_;
folly::EventBase* eventBase_;
ConnectionContextStore* connectionContextStore_;
FlipperPlatformWebSocket* socket_;
SocketEventHandler eventHandler_;
SocketMessageHandler messageHandler_;
};
class FlipperWebSocketProvider : public FlipperSocketProvider {
public:
FlipperWebSocketProvider() {}
virtual std::unique_ptr<FlipperSocket> create(
FlipperConnectionEndpoint endpoint,
std::unique_ptr<FlipperSocketBasePayload> payload,
folly::EventBase* eventBase) override {
return std::make_unique<FlipperWebSocket>(
std::move(endpoint), std::move(payload), eventBase);
}
virtual std::unique_ptr<FlipperSocket> create(
FlipperConnectionEndpoint endpoint,
std::unique_ptr<FlipperSocketBasePayload> payload,
folly::EventBase* eventBase,
ConnectionContextStore* connectionContextStore) override {
return std::make_unique<FlipperWebSocket>(
std::move(endpoint),
std::move(payload),
eventBase,
connectionContextStore);
}
};
} // namespace flipper
} // namespace facebook
#endif

246
iOS/FlipperKit/FlipperWebSocket.mm
View File

@@ -1,246 +0,0 @@
/*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
#ifdef FB_SONARKIT_ENABLED
#import "FlipperWebSocket.h"
#import <Flipper/ConnectionContextStore.h>
#import <Flipper/FlipperTransportTypes.h>
#import <Flipper/Log.h>
#import <folly/String.h>
#import <folly/futures/Future.h>
#import <folly/io/async/AsyncSocketException.h>
#import <folly/io/async/SSLContext.h>
#import <folly/json.h>
#import <cctype>
#import <iomanip>
#import <sstream>
#import <stdexcept>
#import <string>
#import <thread>
#import "FlipperPlatformWebSocket.h"
namespace facebook {
namespace flipper {
class WebSocketSerializer : public FlipperPayloadSerializer {
public:
void put(std::string key, std::string value) override {
object_[key] = value;
}
void put(std::string key, int value) override {
object_[key] = value;
}
std::string url_encode(const std::string& value) {
std::ostringstream escaped;
escaped.fill('0');
escaped << std::hex;
for (std::string::const_iterator i = value.begin(), n = value.end(); i != n;
++i) {
std::string::value_type c = (*i);
// Keep alphanumeric and other accepted characters intact
if (std::isalnum(c) || c == '-' || c == '_' || c == '.' || c == '~') {
escaped << c;
continue;
}
// Any other characters are percent-encoded
escaped << std::uppercase;
escaped << '%' << std::setw(2) << int((unsigned char)c);
escaped << std::nouppercase;
}
return escaped.str();
}
std::string serialize() override {
std::string query = "";
bool append = false;
for (auto& pair : object_.items()) {
auto key = pair.first.asString();
auto value = pair.second.asString();
if (append) {
query += "&";
}
query += key;
query += "=";
if (key == "csr") {
NSString* csr = [NSString stringWithUTF8String:value.c_str()];
NSData* data = [csr dataUsingEncoding:NSUTF8StringEncoding];
NSString* base64 = [data base64EncodedStringWithOptions:0];
query += base64.UTF8String;
} else {
query += url_encode(value);
}
append = true;
}
return query;
}
~WebSocketSerializer() {}
private:
folly::dynamic object_ = folly::dynamic::object();
};
FlipperWebSocket::FlipperWebSocket(
FlipperConnectionEndpoint endpoint,
std::unique_ptr<FlipperSocketBasePayload> payload,
folly::EventBase* eventBase)
: endpoint_(std::move(endpoint)),
payload_(std::move(payload)),
eventBase_(eventBase) {}
FlipperWebSocket::FlipperWebSocket(
FlipperConnectionEndpoint endpoint,
std::unique_ptr<FlipperSocketBasePayload> payload,
folly::EventBase* eventBase,
ConnectionContextStore* connectionContextStore)
: endpoint_(std::move(endpoint)),
payload_(std::move(payload)),
eventBase_(eventBase),
connectionContextStore_(connectionContextStore) {}
void FlipperWebSocket::setEventHandler(SocketEventHandler eventHandler) {
eventHandler_ = std::move(eventHandler);
}
void FlipperWebSocket::setMessageHandler(SocketMessageHandler messageHandler) {
messageHandler_ = std::move(messageHandler);
}
bool FlipperWebSocket::connect(FlipperConnectionManager* manager) {
if (socket_ != NULL) {
return true;
}
std::string connectionURL = endpoint_.secure ? "wss://" : "ws://";
connectionURL += endpoint_.host;
connectionURL += ":";
connectionURL += std::to_string(endpoint_.port);
auto serializer = WebSocketSerializer{};
payload_->serialize(serializer);
auto payload = serializer.serialize();
if (payload.size()) {
connectionURL += "?";
connectionURL += payload;
}
__block bool fullfilled = false;
__block std::promise<bool> promise;
auto connected = promise.get_future();
NSURL* urlObjc = [NSURL
URLWithString:[NSString stringWithUTF8String:connectionURL.c_str()]];
auto eventHandler = eventHandler_;
socket_ = [[FlipperPlatformWebSocket alloc] initWithURL:urlObjc];
socket_.eventHandler = ^(SocketEvent event) {
/**
Only fulfill the promise the first time the event handler is used. If the
open event is received, then set the promise value to true. For any other
event, consider a failure and set to false.
*/
if (!fullfilled) {
fullfilled = true;
if (event == SocketEvent::OPEN) {
promise.set_value(true);
} else {
promise.set_value(false);
}
}
eventHandler(event);
};
socket_.messageHandler = ^(const std::string& message) {
this->messageHandler_(message);
};
if (endpoint_.secure) {
socket_.certificateProvider = [this](
char* _Nonnull password, size_t length) {
auto pkcs12 = connectionContextStore_->getCertificate();
if (pkcs12.first.length() == 0) {
return std::string("");
}
strncpy(password, pkcs12.second.c_str(), length);
return pkcs12.first;
};
}
eventBase_->runInEventBaseThread([this]() { [socket_ connect]; });
auto state = connected.wait_for(std::chrono::seconds(10));
if (state == std::future_status::ready) {
return connected.get();
}
disconnect();
return false;
}
void FlipperWebSocket::disconnect() {
eventBase_->runInEventBaseThread([this]() {
[socket_ disconnect];
socket_ = NULL;
});
}
void FlipperWebSocket::send(
const folly::dynamic& message,
SocketSendHandler completion) {
if (socket_ == NULL) {
return;
}
std::string json = folly::toJson(message);
send(json, std::move(completion));
}
void FlipperWebSocket::send(
const std::string& message,
SocketSendHandler completion) {
if (socket_ == NULL) {
return;
}
NSString* messageObjc = [NSString stringWithUTF8String:message.c_str()];
[socket_ send:messageObjc error:NULL];
completion();
}
/**
Only ever used for insecure connections to receive the device_id from a
signCertificate request. If the intended usage ever changes, then a better
approach needs to be put in place.
*/
void FlipperWebSocket::sendExpectResponse(
const std::string& message,
SocketSendExpectResponseHandler completion) {
if (socket_ == NULL) {
return;
}
NSString* messageObjc = [NSString stringWithUTF8String:message.c_str()];
[socket_ setMessageHandler:^(const std::string& msg) {
completion(msg, false);
[socket_ setMessageHandler:NULL];
}];
NSError* error = NULL;
[socket_ send:messageObjc error:&error];
if (error != NULL) {
completion(error.description.UTF8String, true);
}
}
} // namespace flipper
} // namespace facebook
#endif

1
iOS/Podfile
View File

@@ -16,6 +16,5 @@ target 'FlipperKit' do
pod 'glog', '~>0.3' pod 'glog', '~>0.3'
pod 'Flipper-Folly', '~>2.2' pod 'Flipper-Folly', '~>2.2'
pod 'CocoaAsyncSocket', '~>7.6' pod 'CocoaAsyncSocket', '~>7.6'
pod 'SocketRocket', '~> 0.6.0'
end end

66
iOS/Podfile.lock
View File

@@ -1,27 +1,26 @@
PODS: PODS:
- CocoaAsyncSocket (7.6.5) - boost-for-react-native (1.63.0)
- CocoaAsyncSocket (7.6.4)
- CocoaLibEvent (1.0.0)
- DoubleConversion (1.1.5) - DoubleConversion (1.1.5)
- Flipper (0.104.0): - Flipper (0.45.0):
- Flipper-Folly (~> 2.6) - Flipper-Folly (~> 2.2)
- Flipper-RSocket (~> 1.4) - Flipper-RSocket (~> 1.1)
- Flipper-Boost-iOSX (1.76.0.1.11) - Flipper-DoubleConversion (1.1.7)
- Flipper-DoubleConversion (3.1.7) - Flipper-Folly (2.2.0):
- Flipper-Fmt (7.1.7) - boost-for-react-native
- Flipper-Folly (2.6.9): - CocoaLibEvent (~> 1.0)
- Flipper-Boost-iOSX
- Flipper-DoubleConversion - Flipper-DoubleConversion
- Flipper-Fmt (= 7.1.7)
- Flipper-Glog - Flipper-Glog
- libevent (~> 2.1.12) - OpenSSL-Universal (= 1.0.2.19)
- OpenSSL-Universal (= 1.1.1100) - Flipper-Glog (0.3.6)
- Flipper-Glog (0.3.9)
- Flipper-PeerTalk (0.0.4) - Flipper-PeerTalk (0.0.4)
- Flipper-RSocket (1.4.3): - Flipper-RSocket (1.1.0):
- Flipper-Folly (~> 2.6) - Flipper-Folly (~> 2.2)
- glog (0.3.4) - glog (0.3.4)
- libevent (2.1.12) - OpenSSL-Universal (1.0.2.19):
- OpenSSL-Universal (1.1.1100) - OpenSSL-Universal/Static (= 1.0.2.19)
- SocketRocket (0.6.0) - OpenSSL-Universal/Static (1.0.2.19)
DEPENDENCIES: DEPENDENCIES:
- CocoaAsyncSocket (~> 7.6) - CocoaAsyncSocket (~> 7.6)
@@ -31,44 +30,39 @@ DEPENDENCIES:
- Flipper-PeerTalk (~> 0.0) - Flipper-PeerTalk (~> 0.0)
- Flipper-RSocket (~> 1.1) - Flipper-RSocket (~> 1.1)
- glog (~> 0.3) - glog (~> 0.3)
- SocketRocket (~> 0.6.0)
SPEC REPOS: SPEC REPOS:
https://github.com/CocoaPods/Specs: https://github.com/CocoaPods/Specs:
- boost-for-react-native
- CocoaAsyncSocket - CocoaAsyncSocket
- CocoaLibEvent
- DoubleConversion - DoubleConversion
- Flipper-Boost-iOSX
- Flipper-DoubleConversion - Flipper-DoubleConversion
- Flipper-Fmt
- Flipper-Folly - Flipper-Folly
- Flipper-Glog - Flipper-Glog
- Flipper-PeerTalk - Flipper-PeerTalk
- Flipper-RSocket - Flipper-RSocket
- glog - glog
- libevent
- OpenSSL-Universal - OpenSSL-Universal
- SocketRocket
EXTERNAL SOURCES: EXTERNAL SOURCES:
Flipper: Flipper:
:path: "../Flipper.podspec" :path: "../Flipper.podspec"
SPEC CHECKSUMS: SPEC CHECKSUMS:
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c
Flipper: 3532e5cc3145575ed516093fe5227831cd62d464 Flipper: 18ad3ac4a8e41db9db2ef72239b8ff4eab5b3522
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3
Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
Flipper-Folly: 4c7cf530a9038ae25b0fa37e00b00491c467aaea
Flipper-Glog: 05579840e2750ec907ee2f81544f41ad76a7cae4
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7
glog: 1de0bb937dccdc981596d3b5825ebfb765017ded glog: 1de0bb937dccdc981596d3b5825ebfb765017ded
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
PODFILE CHECKSUM: 5b16ac1a3addfd00d5cb34dd4b15551ff07cb929 PODFILE CHECKSUM: c0e22ce9737ae531ae7290d9e16882825f8ebed9
COCOAPODS: 1.10.2 COCOAPODS: 1.9.0

2
iOS/Sample/Podfile
View File

@@ -22,6 +22,4 @@ target 'Sample' do
pod 'OpenSSL-Universal', :configuration => 'Debug' pod 'OpenSSL-Universal', :configuration => 'Debug'
pod 'CocoaAsyncSocket', :configuration => 'Debug' pod 'CocoaAsyncSocket', :configuration => 'Debug'
pod 'ComponentKit', '~> 0.31' pod 'ComponentKit', '~> 0.31'
pod 'SocketRocket', '~> 0.6.0'
end end

9
iOS/Sample/Podfile.lock
View File

@@ -28,7 +28,6 @@ PODS:
- FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBCxxFollyDynamicConvert
- FlipperKit/FBDefines - FlipperKit/FBDefines
- FlipperKit/FKPortForwarding - FlipperKit/FKPortForwarding
- SocketRocket (~> 0.6.0)
- FlipperKit/CppBridge (0.104.0): - FlipperKit/CppBridge (0.104.0):
- Flipper (~> 0.104.0) - Flipper (~> 0.104.0)
- FlipperKit/FBCxxFollyDynamicConvert (0.104.0): - FlipperKit/FBCxxFollyDynamicConvert (0.104.0):
@@ -77,7 +76,6 @@ PODS:
- libevent (2.1.12) - libevent (2.1.12)
- OpenSSL-Universal (1.1.1100) - OpenSSL-Universal (1.1.1100)
- RenderCore (0.31) - RenderCore (0.31)
- SocketRocket (0.6.0)
- Yoga (1.14.0) - Yoga (1.14.0)
- YogaKit (1.18.1): - YogaKit (1.18.1):
- Yoga (~> 1.14) - Yoga (~> 1.14)
@@ -99,7 +97,6 @@ DEPENDENCIES:
- FlipperKit/SKIOSNetworkPlugin (from `../../FlipperKit.podspec`) - FlipperKit/SKIOSNetworkPlugin (from `../../FlipperKit.podspec`)
- libevent - libevent
- OpenSSL-Universal - OpenSSL-Universal
- SocketRocket (~> 0.6.0)
SPEC REPOS: SPEC REPOS:
https://github.com/CocoaPods/Specs: https://github.com/CocoaPods/Specs:
@@ -115,7 +112,6 @@ SPEC REPOS:
- libevent - libevent
- OpenSSL-Universal - OpenSSL-Universal
- RenderCore - RenderCore
- SocketRocket
- Yoga - Yoga
- YogaKit - YogaKit
@@ -136,14 +132,13 @@ SPEC CHECKSUMS:
Flipper-Glog: 05579840e2750ec907ee2f81544f41ad76a7cae4 Flipper-Glog: 05579840e2750ec907ee2f81544f41ad76a7cae4
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
FlipperKit: fd70e8414049b3704be99710cbdb79fce8f39200 FlipperKit: 9d78475d353d45f915523494908381afef1cf0c3
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
RenderCore: 090beb17b5bff80b86929a7ceb49df789923d23a RenderCore: 090beb17b5bff80b86929a7ceb49df789923d23a
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
PODFILE CHECKSUM: 8f7b8c1a8e7cee47eaef4736990315bfc090e2af PODFILE CHECKSUM: 154af3b1cdd6d65b1141c1215a3789297116c992
COCOAPODS: 1.10.2 COCOAPODS: 1.10.2