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

Remove RSocket

Browse Source 
Summary:
^
Changelog: Remove rsocket dependency for iOS

Reviewed By: aigoncharov

Differential Revision: D33656299

fbshipit-source-id: aab00c425976273112a127e06aca82dfd63194eb
This commit is contained in:
Lorenzo Blasa
2022-02-25 02:02:24 -08:00
committed by Facebook GitHub Bot
parent c4f80a826e
commit 9aed8ce02d
10 changed files with 8 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
iOS/FlipperKit/FlipperClient.mm
View File

@@ -110,7 +110,6 @@ using WrapperPlugin = facebook::flipper::FlipperCppWrapperPlugin;
[SKEnvironmentVariables getAltSecurePort]});
_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>());

1
iOS/Podfile
View File

@@ -11,7 +11,6 @@ target 'FlipperKit' do
pod 'Flipper', :path => '../Flipper.podspec'
# Pods for SonarKit
pod 'Flipper-PeerTalk', '~>0.0'
pod 'Flipper-RSocket', '~>1.1'
pod 'DoubleConversion', '~>1.1'
pod 'glog', '~>0.3'
pod 'Flipper-Folly', '~>2.2'

14
iOS/Podfile.lock
View File

@@ -1,9 +1,8 @@
PODS:
- CocoaAsyncSocket (7.6.5)
- DoubleConversion (1.1.5)
- Flipper (0.108.0):
- Flipper (0.135.0):
- Flipper-Folly (~> 2.6)
- Flipper-RSocket (~> 1.4)
- Flipper-Boost-iOSX (1.76.0.1.11)
- Flipper-DoubleConversion (3.1.7)
- Flipper-Fmt (7.1.7)
@@ -16,8 +15,6 @@ PODS:
- OpenSSL-Universal (= 1.1.1100)
- Flipper-Glog (0.3.9)
- Flipper-PeerTalk (0.0.4)
- Flipper-RSocket (1.4.3):
- Flipper-Folly (~> 2.6)
- glog (0.3.4)
- libevent (2.1.12)
- OpenSSL-Universal (1.1.1100)
@@ -29,7 +26,6 @@ DEPENDENCIES:
- Flipper (from `../Flipper.podspec`)
- Flipper-Folly (~> 2.2)
- Flipper-PeerTalk (~> 0.0)
- Flipper-RSocket (~> 1.1)
- glog (~> 0.3)
- SocketRocket (~> 0.6.0)
@@ -43,7 +39,6 @@ SPEC REPOS:
- Flipper-Folly
- Flipper-Glog
- Flipper-PeerTalk
- Flipper-RSocket
- glog
- libevent
- OpenSSL-Universal
@@ -56,19 +51,18 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c
Flipper: 53fc787b357464cc0dc43fe02288fc7a652ec7de
Flipper: 8d280c95b6a6d87a456d6b030df58e8859448267
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c
Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
Flipper-Folly: 4c7cf530a9038ae25b0fa37e00b00491c467aaea
Flipper-Glog: 05579840e2750ec907ee2f81544f41ad76a7cae4
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
glog: 1de0bb937dccdc981596d3b5825ebfb765017ded
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
PODFILE CHECKSUM: 5b16ac1a3addfd00d5cb34dd4b15551ff07cb929
PODFILE CHECKSUM: 75371a02c3eedd0de3d666960d97e308c70edd88
COCOAPODS: 1.10.2
COCOAPODS: 1.11.2

62
iOS/Podspecs/Flipper-RSocket.podspec
View File

@@ -1,62 +0,0 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
Pod::Spec.new do |spec|
spec.name = 'Flipper-RSocket'
spec.version = '1.4.3'
spec.license = { :type => 'MIT' }
spec.homepage = 'https://github.com/rsocket/rsocket-cpp'
spec.summary = 'C++ implementation of RSocket'
spec.authors = 'Facebook'
spec.source = { :git => 'https://github.com/rsocket/rsocket-cpp.git', :tag => "v2021.04.26.00"}
spec.module_name = 'RSocket'
spec.static_framework = true
spec.source_files = 'rsocket/benchmarks/*.{h,cpp,m,mm}',
'rsocket/framing/*.{h,cpp,m,mm}',
'rsocket/internal/*.{h,cpp,m,mm}',
'rsocket/statemachine/*.{h,cpp,m,mm}',
'rsocket/transports/*.{h,cpp,m,mm}',
'rsocket/transports/**/*.{h,cpp,m,mm}',
'yarpl/observable/*.{h,cpp,m,mm}',
'yarpl/flowable/*.{h,cpp,m,mm}',
'rsocket/*.{h,cpp,m,mm}'
spec.libraries = "stdc++"
spec.compiler_flags = '-std=c++1y'
spec.dependency 'Flipper-Folly', '~> 2.6'
spec.compiler_flags = '-DFOLLY_HAVE_BACKTRACE=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -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
-frtti
-fexceptions
-std=c++14
-Wno-error
-Wno-unused-local-typedefs
-Wno-unused-variable
-Wno-sign-compare
-Wno-comment
-Wno-return-type
-Wno-global-constructors
-Wno-comma'
spec.preserve_paths = 'rsocket/benchmarks/*.h',
'rsocket/framing/*.h',
'rsocket/internal/*.h',
'rsocket/statemachine/*.h',
'rsocket/transports/*.h',
'rsocket/*.h',
'yarpl/flowable/*.h',
'yarpl/observable/*.h',
'yarpl/perf/*.h',
'yarpl/single/*.h',
'yarpl/utils/*.h',
'yarpl/*.h',
'**/*.h'
spec.header_mappings_dir = './'
spec.header_dir = './'
spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
"CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/** \"$(PODS_ROOT)/Flipper-Boost-iOSX\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/libevent/include\" \"$(PODS_ROOT)/DoubleConversion\"/**" }
spec.platforms = { :ios => "10.0" }
end

7
iOS/Sample/Podfile.lock
View File

@@ -5,7 +5,6 @@ PODS:
- Yoga (~> 1.14)
- Flipper (0.135.0):
- Flipper-Folly (~> 2.6)
- Flipper-RSocket (~> 1.4)
- Flipper-Boost-iOSX (1.76.0.1.11)
- Flipper-DoubleConversion (3.1.7)
- Flipper-Fmt (7.1.7)
@@ -18,8 +17,6 @@ PODS:
- OpenSSL-Universal (= 1.1.1100)
- Flipper-Glog (0.3.9)
- Flipper-PeerTalk (0.0.4)
- Flipper-RSocket (1.4.3):
- Flipper-Folly (~> 2.6)
- FlipperKit (0.135.0):
- FlipperKit/Core (= 0.135.0)
- FlipperKit/Core (0.135.0):
@@ -111,7 +108,6 @@ SPEC REPOS:
- Flipper-Folly
- Flipper-Glog
- Flipper-PeerTalk
- Flipper-RSocket
- libevent
- OpenSSL-Universal
- RenderCore
@@ -128,14 +124,13 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
ComponentKit: 7bf7048b9814afc6b6641645a14177f95fd9b9ae
Flipper: 23bca214cb1ad827e1c965cbb1d2ed23158a7bd8
Flipper: 8d280c95b6a6d87a456d6b030df58e8859448267
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c
Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3
Flipper-Glog: 05579840e2750ec907ee2f81544f41ad76a7cae4
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
FlipperKit: cee3e36ceed7a69751303c0dfdd062269889ff3e
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c

5
iOS/SampleSwift/Podfile.lock
View File

@@ -6,7 +6,6 @@ PODS:
- Yoga (~> 1.14)
- Flipper (0.135.0):
- Flipper-Folly (~> 2.6)
- Flipper-RSocket (~> 1.4)
- Flipper-Boost-iOSX (1.76.0.1.11)
- Flipper-DoubleConversion (3.1.7)
- Flipper-Fmt (7.1.7)
@@ -19,8 +18,6 @@ PODS:
- OpenSSL-Universal (= 1.1.1100)
- Flipper-Glog (0.3.9)
- Flipper-PeerTalk (0.0.4)
- Flipper-RSocket (1.4.3):
- Flipper-Folly (~> 2.6)
- FlipperKit (0.135.0):
- FlipperKit/Core (= 0.135.0)
- FlipperKit/Core (0.135.0):
@@ -108,7 +105,6 @@ SPEC REPOS:
- Flipper-Folly
- Flipper-Glog
- Flipper-PeerTalk
- Flipper-RSocket
- libevent
- OpenSSL-Universal
- RenderCore
@@ -133,7 +129,6 @@ SPEC CHECKSUMS:
Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3
Flipper-Glog: 05579840e2750ec907ee2f81544f41ad76a7cae4
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
FlipperKit: cee3e36ceed7a69751303c0dfdd062269889ff3e
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c

1
iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj
View File

@@ -366,7 +366,6 @@
"\"${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\"",

2
iOS/Tutorial/Podfile
View File

@@ -19,7 +19,7 @@ target 'Tutorial' do
# be dynamic.
$static_framework = ['FlipperKit', 'Flipper', 'Flipper-Folly',
'CocoaAsyncSocket', 'ComponentKit', 'Flipper-DoubleConversion',
'Flipper-Glog', 'Flipper-PeerTalk', 'Flipper-RSocket', 'Yoga', 'YogaKit',
'Flipper-Glog', 'Flipper-PeerTalk', 'Yoga', 'YogaKit',
'CocoaLibEvent', 'OpenSSL-Universal', 'Flipper-Boost-iOSX', 'Flipper-Fmt']
pre_install do |installer|