From 8d48f5a3eb26c6e982abefa30f5a8e0c19b5b4a6 Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Fri, 1 Jun 2018 18:01:28 +0100 Subject: [PATCH] Disable peertalk --- iOS/Sample/Podfile | 2 +- iOS/SonarKit.podspec | 13 ++++--------- iOS/SonarKit/SonarClient.mm | 14 +++++++------- iOS/third-party-podspecs/DoubleConversion.podspec | 2 +- iOS/third-party-podspecs/EasyWSClient.podspec | 2 +- iOS/third-party-podspecs/Folly.podspec | 2 +- iOS/third-party-podspecs/RSocket.podspec | 2 +- iOS/third-party-podspecs/glog.podspec | 2 +- xplat/Sonar/SonarKitCPP.podspec | 2 +- 9 files changed, 18 insertions(+), 23 deletions(-) diff --git a/iOS/Sample/Podfile b/iOS/Sample/Podfile index f4e5846aa..86f9d3e33 100644 --- a/iOS/Sample/Podfile +++ b/iOS/Sample/Podfile @@ -11,7 +11,7 @@ target 'Sample' do pod 'DoubleConversion', :podspec => '../third-party-podspecs/DoubleConversion.podspec' pod 'glog', :podspec => '../third-party-podspecs/glog.podspec' pod 'Folly', :podspec => '../third-party-podspecs/Folly.podspec' - pod 'PeerTalk', :git => 'https://github.com/rsms/peertalk' + # pod 'PeerTalk', :git => 'https://github.com/rsms/peertalk' pod 'ComponentKit', :podspec => '../third-party-podspecs/ComponentKit.podspec' pod 'Yoga','~>1.8.1', :modular_headers => true pod 'Sonar', :podspec => '../../xplat/Sonar/SonarKitCPP.podspec' diff --git a/iOS/SonarKit.podspec b/iOS/SonarKit.podspec index 349683072..d4f9c9858 100644 --- a/iOS/SonarKit.podspec +++ b/iOS/SonarKit.podspec @@ -1,5 +1,5 @@ folly_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' -yoga_version = '1.8.1' +yoga_version = '~> 1.8' yogakit_version = '1.8.1' Pod::Spec.new do |spec| @@ -9,6 +9,7 @@ Pod::Spec.new do |spec| spec.homepage = 'https://github.com/facebook/Sonar' spec.summary = 'Sonar iOS podspec' spec.authors = 'Facebook' + spec.static_framework = true # spec.prepare_command = 'mv src double-conversion' spec.source = { :git => 'https://github.com/facebook/Sonar.git', :branch=> "master" } @@ -16,7 +17,7 @@ Pod::Spec.new do |spec| spec.dependency 'Folly' spec.dependency 'Sonar' spec.dependency 'CocoaAsyncSocket', '~> 7.6' - spec.dependency 'PeerTalk' + # spec.dependency 'PeerTalk', '~> 0.0' spec.dependency 'OpenSSL-Universal', '~> 1.0' spec.source_files = 'iOS/FBDefines/*.{h,cpp,m,mm}', 'iOS/SonarKit/**/*.{h,cpp,m,mm}', 'iOS/SonarKit/FBCxxUtils/*.{h, mm}', spec.public_header_files = 'iOS/SonarKit/CppBridge/*.{h}', @@ -28,12 +29,10 @@ Pod::Spec.new do |spec| 'iOS/SonarKit/SonarConnection.h', 'iOS/SonarKit/SKMacros.h' - spec.private_header_files = 'iOS/Sample/' spec.compiler_flags = '-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' spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/** \"$(PODS_ROOT)/boost-for-react-native\" \"/usr/local/include\" \"/usr/local/Cellar/openssl/1.0.2o_1/include\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/ComponentKit\"/**" } - spec.platforms = { :ios => "8.0", :tvos => "9.2" } + spec.platforms = { :ios => "8.0" } spec.subspec "SonarKitLayoutPlugin" do |ss| ss.dependency "Yoga", yoga_version @@ -64,7 +63,6 @@ Pod::Spec.new do |spec| ss.source_files = "iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}" ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"" } end @@ -75,7 +73,6 @@ Pod::Spec.new do |spec| 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKNetworkReporter.h' ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/*.{h,cpp,m,mm}" ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"" } end @@ -86,7 +83,6 @@ Pod::Spec.new do |spec| 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKNetworkReporter.h' ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/*.{h,cpp,m,mm}" ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"" } end @@ -95,7 +91,6 @@ Pod::Spec.new do |spec| ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"" } end end diff --git a/iOS/SonarKit/SonarClient.mm b/iOS/SonarKit/SonarClient.mm index 14a62745d..46766bcb2 100644 --- a/iOS/SonarKit/SonarClient.mm +++ b/iOS/SonarKit/SonarClient.mm @@ -15,7 +15,7 @@ #import #if !TARGET_OS_SIMULATOR -#import "SKPortForwardingServer.h" +// #import "SKPortForwardingServer.h" #endif using WrapperPlugin = facebook::sonar::SonarCppWrapperPlugin; @@ -24,7 +24,7 @@ using WrapperPlugin = facebook::sonar::SonarCppWrapperPlugin; facebook::sonar::SonarClient *_cppClient; folly::ScopedEventBaseThread eventBaseThread; #if !TARGET_OS_SIMULATOR - SKPortForwardingServer *_server; + // SKPortForwardingServer *_server; #endif } @@ -103,9 +103,9 @@ using WrapperPlugin = facebook::sonar::SonarCppWrapperPlugin; - (void)start; { #if !TARGET_OS_SIMULATOR - _server = [SKPortForwardingServer new]; - [_server forwardConnectionsFromPort:8088]; - [_server listenForMultiplexingChannelOnPort:8078]; + // _server = [SKPortForwardingServer new]; + // [_server forwardConnectionsFromPort:8088]; + // [_server listenForMultiplexingChannelOnPort:8078]; #endif _cppClient->start(); } @@ -114,8 +114,8 @@ using WrapperPlugin = facebook::sonar::SonarCppWrapperPlugin; { _cppClient->stop(); #if !TARGET_OS_SIMULATOR - [_server close]; - _server = nil; + // [_server close]; + // _server = nil; #endif } diff --git a/iOS/third-party-podspecs/DoubleConversion.podspec b/iOS/third-party-podspecs/DoubleConversion.podspec index 91f4f819b..95ba81257 100755 --- a/iOS/third-party-podspecs/DoubleConversion.podspec +++ b/iOS/third-party-podspecs/DoubleConversion.podspec @@ -13,6 +13,6 @@ Pod::Spec.new do |spec| spec.libraries = "stdc++" spec.compiler_flags = '-std=c++1y' # Pinning to the same version as React.podspec. - spec.platforms = { :ios => "8.0", :tvos => "9.2" } + spec.platforms = { :ios => "8.0" } end diff --git a/iOS/third-party-podspecs/EasyWSClient.podspec b/iOS/third-party-podspecs/EasyWSClient.podspec index 0b3edeba9..90cfe2fc8 100644 --- a/iOS/third-party-podspecs/EasyWSClient.podspec +++ b/iOS/third-party-podspecs/EasyWSClient.podspec @@ -12,6 +12,6 @@ Pod::Spec.new do |spec| spec.libraries = "stdc++" spec.compiler_flags = '-std=c++1y' # Pinning to the same version as React.podspec. - spec.platforms = { :ios => "8.0", :tvos => "9.2" } + spec.platforms = { :ios => "8.0"} end diff --git a/iOS/third-party-podspecs/Folly.podspec b/iOS/third-party-podspecs/Folly.podspec index af8bc68b1..caa8578ea 100755 --- a/iOS/third-party-podspecs/Folly.podspec +++ b/iOS/third-party-podspecs/Folly.podspec @@ -112,5 +112,5 @@ Pod::Spec.new do |spec| "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"/usr/local/include\" \"/usr/local/Cellar/openssl/1.0.2o_1/include\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\"" } # Pinning to the same version as React.podspec. - spec.platforms = { :ios => "8.0", :tvos => "10.0" } + spec.platforms = { :ios => "8.0"} end diff --git a/iOS/third-party-podspecs/RSocket.podspec b/iOS/third-party-podspecs/RSocket.podspec index 84a44e585..8cb8502fa 100644 --- a/iOS/third-party-podspecs/RSocket.podspec +++ b/iOS/third-party-podspecs/RSocket.podspec @@ -48,6 +48,6 @@ Pod::Spec.new do |spec| spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/** \"/usr/local/include\" \"/usr/local/Cellar/openssl/1.0.2o_1/include\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/DoubleConversion\"/**" } - spec.platforms = { :ios => "8.0", :tvos => "9.2" } + spec.platforms = { :ios => "8.0" } end diff --git a/iOS/third-party-podspecs/glog.podspec b/iOS/third-party-podspecs/glog.podspec index a68659fa0..e0dbd2f2d 100755 --- a/iOS/third-party-podspecs/glog.podspec +++ b/iOS/third-party-podspecs/glog.podspec @@ -36,6 +36,6 @@ Pod::Spec.new do |spec| } spec.compiler_flags = '-std=c++1y' spec.libraries = "stdc++" - spec.platforms = { :ios => "8.0", :tvos => "9.2" } + spec.platforms = { :ios => "8.0"} end diff --git a/xplat/Sonar/SonarKitCPP.podspec b/xplat/Sonar/SonarKitCPP.podspec index d1a5db78a..9c9fc67d3 100644 --- a/xplat/Sonar/SonarKitCPP.podspec +++ b/xplat/Sonar/SonarKitCPP.podspec @@ -17,7 +17,7 @@ Pod::Spec.new do |spec| spec.compiler_flags = '-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' - spec.platforms = { :ios => "8.0", :tvos => "9.2" } + spec.platforms = { :ios => "8.0" } spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"/usr/local/include\" \"/usr/local/Cellar/openssl/1.0.2o_1/include\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" }