From df8763e6972cb4cdd7d566042463dc91123a687a Mon Sep 17 00:00:00 2001 From: John Knox Date: Thu, 20 Sep 2018 15:35:42 -0700 Subject: [PATCH] Move xplat/sonar/xplat/Sonar* to Flipper* Summary: Part of the Sonar -> Flipper rename Intentionally left externally visible buck target as Sonar for now to minimize diff size. Reviewed By: passy Differential Revision: D9871684 fbshipit-source-id: 6926eb62c578a05cd895745c75ed7da3cfe965b5 --- Flipper.podspec | 1 + android/src/main/cpp/sonar.cpp | 12 +++++------ docs/testing.md | 6 +++--- .../CppBridge/FlipperCppBridgingConnection.h | 2 +- .../CppBridge/SonarCppBridgingResponder.h | 2 +- .../CppBridge/SonarCppWrapperPlugin.h | 2 +- iOS/FlipperKit/FlipperClient.mm | 2 +- iOS/FlipperKit/SKStateUpdateCPPWrapper.h | 2 +- iOS/Podfile | 1 + iOS/Sample/Podfile | 2 +- iOS/Sample/Sample.xcodeproj/project.pbxproj | 8 ++++---- iOS/SampleSwift/Podfile | 2 +- iOS/SampleSwift/Podfile.lock | 20 +++++++++---------- .../SampleSwift.xcodeproj/project.pbxproj | 8 ++++---- iOS/SonarKit.podspec | 2 +- iOS/SonarKitTestUtils/FlipperClient+Testing.h | 2 +- xplat/CMakeLists.txt | 2 +- xplat/{Sonar => Flipper}/CertificateUtils.cpp | 0 xplat/{Sonar => Flipper}/CertificateUtils.h | 0 .../ConnectionContextStore.cpp | 0 .../ConnectionContextStore.h | 0 .../Sonar.podspec => Flipper/Flipper.podspec} | 8 ++++---- xplat/{Sonar => Flipper}/FlipperResponder.h | 0 xplat/{Sonar => Flipper}/Log.cpp | 0 xplat/{Sonar => Flipper}/Log.h | 0 xplat/{Sonar => Flipper}/SonarClient.cpp | 0 xplat/{Sonar => Flipper}/SonarClient.h | 10 +++++----- xplat/{Sonar => Flipper}/SonarConnection.h | 2 +- .../{Sonar => Flipper}/SonarConnectionImpl.h | 4 ++-- xplat/{Sonar => Flipper}/SonarInitConfig.h | 0 xplat/{Sonar => Flipper}/SonarPlugin.h | 2 +- xplat/{Sonar => Flipper}/SonarResponderImpl.h | 4 ++-- xplat/{Sonar => Flipper}/SonarState.cpp | 0 xplat/{Sonar => Flipper}/SonarState.h | 0 .../SonarStateUpdateListener.h | 0 xplat/{Sonar => Flipper}/SonarStep.cpp | 0 xplat/{Sonar => Flipper}/SonarStep.h | 0 xplat/{Sonar => Flipper}/SonarWebSocket.h | 0 .../{Sonar => Flipper}/SonarWebSocketImpl.cpp | 0 xplat/{Sonar => Flipper}/SonarWebSocketImpl.h | 6 +++--- .../ConnectionContextStoreMock.h | 2 +- .../SonarConnectionMock.h | 2 +- .../SonarPluginMock.h | 2 +- .../SonarResponderMock.h | 2 +- .../SonarWebSocketMock.h | 2 +- .../SonarClientTests.cpp | 6 +++--- .../SonarWebSocketImplTerminationTests.cpp | 4 ++-- 47 files changed, 67 insertions(+), 65 deletions(-) create mode 120000 Flipper.podspec rename xplat/{Sonar => Flipper}/CertificateUtils.cpp (100%) rename xplat/{Sonar => Flipper}/CertificateUtils.h (100%) rename xplat/{Sonar => Flipper}/ConnectionContextStore.cpp (100%) rename xplat/{Sonar => Flipper}/ConnectionContextStore.h (100%) rename xplat/{Sonar/Sonar.podspec => Flipper/Flipper.podspec} (87%) rename xplat/{Sonar => Flipper}/FlipperResponder.h (100%) rename xplat/{Sonar => Flipper}/Log.cpp (100%) rename xplat/{Sonar => Flipper}/Log.h (100%) rename xplat/{Sonar => Flipper}/SonarClient.cpp (100%) rename xplat/{Sonar => Flipper}/SonarClient.h (93%) rename xplat/{Sonar => Flipper}/SonarConnection.h (97%) rename xplat/{Sonar => Flipper}/SonarConnectionImpl.h (95%) rename xplat/{Sonar => Flipper}/SonarInitConfig.h (100%) rename xplat/{Sonar => Flipper}/SonarPlugin.h (96%) rename xplat/{Sonar => Flipper}/SonarResponderImpl.h (93%) rename xplat/{Sonar => Flipper}/SonarState.cpp (100%) rename xplat/{Sonar => Flipper}/SonarState.h (100%) rename xplat/{Sonar => Flipper}/SonarStateUpdateListener.h (100%) rename xplat/{Sonar => Flipper}/SonarStep.cpp (100%) rename xplat/{Sonar => Flipper}/SonarStep.h (100%) rename xplat/{Sonar => Flipper}/SonarWebSocket.h (100%) rename xplat/{Sonar => Flipper}/SonarWebSocketImpl.cpp (100%) rename xplat/{Sonar => Flipper}/SonarWebSocketImpl.h (94%) rename xplat/{SonarTestLib => FlipperTestLib}/ConnectionContextStoreMock.h (93%) rename xplat/{SonarTestLib => FlipperTestLib}/SonarConnectionMock.h (95%) rename xplat/{SonarTestLib => FlipperTestLib}/SonarPluginMock.h (97%) rename xplat/{SonarTestLib => FlipperTestLib}/SonarResponderMock.h (96%) rename xplat/{SonarTestLib => FlipperTestLib}/SonarWebSocketMock.h (96%) rename xplat/{SonarTests => FlipperTests}/SonarClientTests.cpp (98%) rename xplat/{SonarTests => FlipperTests}/SonarWebSocketImplTerminationTests.cpp (96%) diff --git a/Flipper.podspec b/Flipper.podspec new file mode 120000 index 000000000..d0f50a15f --- /dev/null +++ b/Flipper.podspec @@ -0,0 +1 @@ +xplat/Flipper/Flipper.podspec \ No newline at end of file diff --git a/android/src/main/cpp/sonar.cpp b/android/src/main/cpp/sonar.cpp index b2249dfe9..aad9daf41 100644 --- a/android/src/main/cpp/sonar.cpp +++ b/android/src/main/cpp/sonar.cpp @@ -18,12 +18,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include using namespace facebook; using namespace facebook::flipper; diff --git a/docs/testing.md b/docs/testing.md index 5d519273f..5a628b774 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -50,12 +50,12 @@ public void myTest() { ## C++ -Start by creating your first test file in this directory `MySonarPluginTests.cpp` and import the testing utilities from `//xplat/sonar-client:SonarTestLib`. These utilities mock out core pieces of the communication channel so that you can test your plugin in isolation. +Start by creating your first test file in this directory `MySonarPluginTests.cpp` and import the testing utilities from `//xplat/sonar-client:FlipperTestLib`. These utilities mock out core pieces of the communication channel so that you can test your plugin in isolation. ``` #include -#include -#include +#include +#include #include #include diff --git a/iOS/FlipperKit/CppBridge/FlipperCppBridgingConnection.h b/iOS/FlipperKit/CppBridge/FlipperCppBridgingConnection.h index e7301f55a..15b017f38 100644 --- a/iOS/FlipperKit/CppBridge/FlipperCppBridgingConnection.h +++ b/iOS/FlipperKit/CppBridge/FlipperCppBridgingConnection.h @@ -5,7 +5,7 @@ * file in the root directory of this source tree. * */ -#import +#import #import /** diff --git a/iOS/FlipperKit/CppBridge/SonarCppBridgingResponder.h b/iOS/FlipperKit/CppBridge/SonarCppBridgingResponder.h index 81463fe01..3e65385f8 100644 --- a/iOS/FlipperKit/CppBridge/SonarCppBridgingResponder.h +++ b/iOS/FlipperKit/CppBridge/SonarCppBridgingResponder.h @@ -5,7 +5,7 @@ * file in the root directory of this source tree. * */ -#import +#import #import /** diff --git a/iOS/FlipperKit/CppBridge/SonarCppWrapperPlugin.h b/iOS/FlipperKit/CppBridge/SonarCppWrapperPlugin.h index 42aab925a..24b01dbc5 100644 --- a/iOS/FlipperKit/CppBridge/SonarCppWrapperPlugin.h +++ b/iOS/FlipperKit/CppBridge/SonarCppWrapperPlugin.h @@ -9,7 +9,7 @@ #error This header can only be included in .mm (ObjC++) files #endif -#import +#import #import #import diff --git a/iOS/FlipperKit/FlipperClient.mm b/iOS/FlipperKit/FlipperClient.mm index e072f954f..509b79721 100644 --- a/iOS/FlipperKit/FlipperClient.mm +++ b/iOS/FlipperKit/FlipperClient.mm @@ -9,7 +9,7 @@ #import "FlipperClient.h" #import "SonarCppWrapperPlugin.h" -#import +#import #include #include #import diff --git a/iOS/FlipperKit/SKStateUpdateCPPWrapper.h b/iOS/FlipperKit/SKStateUpdateCPPWrapper.h index 6f25f2073..cd1c3b179 100644 --- a/iOS/FlipperKit/SKStateUpdateCPPWrapper.h +++ b/iOS/FlipperKit/SKStateUpdateCPPWrapper.h @@ -1,6 +1,6 @@ #ifdef FB_SONARKIT_ENABLED -#include +#include #import "FlipperStateUpdateListener.h" /* diff --git a/iOS/Podfile b/iOS/Podfile index 2b2e2c640..e0596200b 100644 --- a/iOS/Podfile +++ b/iOS/Podfile @@ -16,5 +16,6 @@ target 'FlipperKit' do pod 'glog', '~>0.3' pod 'Folly', '~>1.0' pod 'CocoaAsyncSocket', '~>7.6' + pod 'Flipper', '~>0.0.1' end diff --git a/iOS/Sample/Podfile b/iOS/Sample/Podfile index ecdd87aee..5bce8716a 100644 --- a/iOS/Sample/Podfile +++ b/iOS/Sample/Podfile @@ -7,7 +7,7 @@ target 'Sample' do pod 'FlipperKit', :path => '../../SonarKit.podspec' pod 'FlipperKit/SonarKitLayoutComponentKitSupport', :path => '../../SonarKit.podspec' pod 'FlipperKit/SKIOSNetworkPlugin', :path => '../../SonarKit.podspec' - pod 'Sonar', :path => '../../Sonar.podspec' + pod 'Flipper', :path => '../../Flipper.podspec' post_install do |installer| installer.pods_project.targets.each do |target| diff --git a/iOS/Sample/Sample.xcodeproj/project.pbxproj b/iOS/Sample/Sample.xcodeproj/project.pbxproj index a906efcdb..a6e895626 100644 --- a/iOS/Sample/Sample.xcodeproj/project.pbxproj +++ b/iOS/Sample/Sample.xcodeproj/project.pbxproj @@ -335,7 +335,7 @@ "\"${PODS_ROOT}/Headers/Public/DoubleConversion\"", "\"${PODS_ROOT}/Headers/Public/Folly\"", "\"${PODS_ROOT}/Headers/Public/PeerTalk\"", - "\"${PODS_ROOT}/Headers/Public/Sonar\"", + "\"${PODS_ROOT}/Headers/Public/Flipper\"", "\"${PODS_ROOT}/Headers/Public/SonarKit\"", "\"${PODS_ROOT}/Headers/Public/Yoga\"", "\"${PODS_ROOT}/Headers/Public/boost-for-react-native\"", @@ -361,7 +361,7 @@ "-l\"DoubleConversion\"", "-l\"Folly\"", "-l\"PeerTalk\"", - "-l\"Sonar\"", + "-l\"Flipper\"", "-l\"FlipperKit\"", "-l\"Yoga\"", "-l\"c++\"", @@ -399,7 +399,7 @@ "\"${PODS_ROOT}/Headers/Public/DoubleConversion\"", "\"${PODS_ROOT}/Headers/Public/Folly\"", "\"${PODS_ROOT}/Headers/Public/PeerTalk\"", - "\"${PODS_ROOT}/Headers/Public/Sonar\"", + "\"${PODS_ROOT}/Headers/Public/Flipper\"", "\"${PODS_ROOT}/Headers/Public/SonarKit\"", "\"${PODS_ROOT}/Headers/Public/Yoga\"", "\"${PODS_ROOT}/Headers/Public/boost-for-react-native\"", @@ -425,7 +425,7 @@ "-l\"DoubleConversion\"", "-l\"Folly\"", "-l\"PeerTalk\"", - "-l\"Sonar\"", + "-l\"Flipper\"", "-l\"FlipperKit\"", "-l\"Yoga\"", "-l\"c++\"", diff --git a/iOS/SampleSwift/Podfile b/iOS/SampleSwift/Podfile index 780e05437..45f6bdeec 100644 --- a/iOS/SampleSwift/Podfile +++ b/iOS/SampleSwift/Podfile @@ -4,9 +4,9 @@ source 'https://github.com/CocoaPods/Specs' swift_version = "4.1" target 'SampleSwift' do + pod 'Flipper', :path => '../../Flipper.podspec' pod 'FlipperKit', :path => '../../SonarKit.podspec' pod 'FlipperKit/SKIOSNetworkPlugin', :path => '../../SonarKit.podspec' - pod 'Sonar', :path => '../../Sonar.podspec' # Layout and network plugins are not yet supported for swift projects #pod 'SonarKit/SonarKitLayoutComponentKitSupport', :path => '../../SonarKit.podspec' diff --git a/iOS/SampleSwift/Podfile.lock b/iOS/SampleSwift/Podfile.lock index 9fdd172bc..1673f4e20 100644 --- a/iOS/SampleSwift/Podfile.lock +++ b/iOS/SampleSwift/Podfile.lock @@ -3,17 +3,20 @@ PODS: - CocoaAsyncSocket (7.6.3) - CocoaLibEvent (1.0.0) - DoubleConversion (1.1.5) + - Flipper (0.7.2): + - Folly (~> 1.1) + - RSocket (~> 0.10) - FlipperKit (0.7.2): - FlipperKit/Core (= 0.7.2) - FlipperKit/Core (0.7.2): - CocoaAsyncSocket (~> 7.6) + - Flipper (~> 0.7.2) - FlipperKit/CppBridge - FlipperKit/FBCxxUtils - FlipperKit/FBDefines - Folly (~> 1.1) - OpenSSL-Static (= 1.0.2.c1) - PeerTalk (~> 0.0.2) - - Sonar (~> 0.7.2) - FlipperKit/CppBridge (0.7.2) - FlipperKit/FBCxxUtils (0.7.2) - FlipperKit/FBDefines (0.7.2) @@ -33,14 +36,11 @@ PODS: - PeerTalk (0.0.2) - RSocket (0.10.0): - Folly - - Sonar (0.7.2): - - Folly (~> 1.1) - - RSocket (~> 0.10) DEPENDENCIES: + - Flipper (from `../../Flipper.podspec`) - FlipperKit (from `../../SonarKit.podspec`) - FlipperKit/SKIOSNetworkPlugin (from `../../SonarKit.podspec`) - - Sonar (from `../../Sonar.podspec`) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -56,24 +56,24 @@ SPEC REPOS: - RSocket EXTERNAL SOURCES: + Flipper: + :path: "../../Flipper.podspec" FlipperKit: :path: "../../SonarKit.podspec" - Sonar: - :path: "../../Sonar.podspec" SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c CocoaAsyncSocket: eafaa68a7e0ec99ead0a7b35015e0bf25d2c8987 CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c - FlipperKit: d8fb90df50d14c0022f5a931b93c437dfced0530 + Flipper: 495fbd327298fbc55b3ff7cb399eae52c1580494 + FlipperKit: a0460df8e8aa048a29da9e9e54e0a7c9dd08b799 Folly: dd92f69322d8535b9df98d7c91e442b0fce2fff2 glog: 1de0bb937dccdc981596d3b5825ebfb765017ded OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e PeerTalk: 77481b0a8136f226b90ccf828d6061f70139ffde RSocket: 4fdb7e562db30a2d4fceddefdc601749ffc9ebe2 - Sonar: cfbef2d6119e92563d51bf3cdd9ae34f4eda068b -PODFILE CHECKSUM: fc6b08aff1cbf448771fa3d9690714cef822d096 +PODFILE CHECKSUM: 7d3e554e10a8fbfaf5466a3d4083099a6e8a2f10 COCOAPODS: 1.5.3 diff --git a/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj b/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj index 403a7c512..93ead3def 100644 --- a/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj +++ b/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj @@ -335,7 +335,7 @@ "\"${PODS_ROOT}/Headers/Public/OpenSSL-Static\"", "\"${PODS_ROOT}/Headers/Public/PeerTalk\"", "\"${PODS_ROOT}/Headers/Public/RSocket\"", - "\"${PODS_ROOT}/Headers/Public/Sonar\"", + "\"${PODS_ROOT}/Headers/Public/Flipper\"", "\"${PODS_ROOT}/Headers/Public/SonarKit\"", "\"${PODS_ROOT}/Headers/Public/Yoga\"", "\"${PODS_ROOT}/Headers/Public/glog\"", @@ -357,7 +357,7 @@ "-l\"Folly\"", "-l\"PeerTalk\"", "-l\"RSocket\"", - "-l\"Sonar\"", + "-l\"Flipper\"", "-l\"FlipperKit\"", "-l\"crypto\"", "-l\"event\"", @@ -399,7 +399,7 @@ "\"${PODS_ROOT}/Headers/Public/OpenSSL-Static\"", "\"${PODS_ROOT}/Headers/Public/PeerTalk\"", "\"${PODS_ROOT}/Headers/Public/RSocket\"", - "\"${PODS_ROOT}/Headers/Public/Sonar\"", + "\"${PODS_ROOT}/Headers/Public/Flipper\"", "\"${PODS_ROOT}/Headers/Public/SonarKit\"", "\"${PODS_ROOT}/Headers/Public/Yoga\"", "\"${PODS_ROOT}/Headers/Public/glog\"", @@ -421,7 +421,7 @@ "-l\"Folly\"", "-l\"PeerTalk\"", "-l\"RSocket\"", - "-l\"Sonar\"", + "-l\"Flipper\"", "-l\"FlipperKit\"", "-l\"crypto\"", "-l\"event\"", diff --git a/iOS/SonarKit.podspec b/iOS/SonarKit.podspec index 07e826a91..994e75964 100644 --- a/iOS/SonarKit.podspec +++ b/iOS/SonarKit.podspec @@ -51,7 +51,7 @@ Pod::Spec.new do |spec| ss.dependency 'FlipperKit/FBCxxUtils' ss.dependency 'FlipperKit/CppBridge' ss.dependency 'Folly', '~>1.1' - ss.dependency 'Sonar', '~>'+sonarkit_version + ss.dependency 'Flipper', '~>'+sonarkit_version ss.dependency 'CocoaAsyncSocket', '~> 7.6' ss.dependency 'PeerTalk', '~>0.0.2' ss.dependency 'OpenSSL-Static', '1.0.2.c1' diff --git a/iOS/SonarKitTestUtils/FlipperClient+Testing.h b/iOS/SonarKitTestUtils/FlipperClient+Testing.h index f4f99853b..20b4b2331 100644 --- a/iOS/SonarKitTestUtils/FlipperClient+Testing.h +++ b/iOS/SonarKitTestUtils/FlipperClient+Testing.h @@ -11,7 +11,7 @@ #import -#import +#import #import @interface FlipperClient (Testing) diff --git a/xplat/CMakeLists.txt b/xplat/CMakeLists.txt index e122085b1..f8aeb500c 100644 --- a/xplat/CMakeLists.txt +++ b/xplat/CMakeLists.txt @@ -39,7 +39,7 @@ add_compile_options(-DFOLLY_NO_CONFIG ) -file(GLOB SOURCES Sonar/*.cpp) +file(GLOB SOURCES Flipper/*.cpp) add_library(${PACKAGE_NAME} STATIC ${SOURCES}) set(build_DIR ${CMAKE_SOURCE_DIR}/build) diff --git a/xplat/Sonar/CertificateUtils.cpp b/xplat/Flipper/CertificateUtils.cpp similarity index 100% rename from xplat/Sonar/CertificateUtils.cpp rename to xplat/Flipper/CertificateUtils.cpp diff --git a/xplat/Sonar/CertificateUtils.h b/xplat/Flipper/CertificateUtils.h similarity index 100% rename from xplat/Sonar/CertificateUtils.h rename to xplat/Flipper/CertificateUtils.h diff --git a/xplat/Sonar/ConnectionContextStore.cpp b/xplat/Flipper/ConnectionContextStore.cpp similarity index 100% rename from xplat/Sonar/ConnectionContextStore.cpp rename to xplat/Flipper/ConnectionContextStore.cpp diff --git a/xplat/Sonar/ConnectionContextStore.h b/xplat/Flipper/ConnectionContextStore.h similarity index 100% rename from xplat/Sonar/ConnectionContextStore.h rename to xplat/Flipper/ConnectionContextStore.h diff --git a/xplat/Sonar/Sonar.podspec b/xplat/Flipper/Flipper.podspec similarity index 87% rename from xplat/Sonar/Sonar.podspec rename to xplat/Flipper/Flipper.podspec index 0e9d91214..bad369aae 100644 --- a/xplat/Sonar/Sonar.podspec +++ b/xplat/Flipper/Flipper.podspec @@ -1,6 +1,6 @@ sonarkit_version = '0.7.2' Pod::Spec.new do |spec| - spec.name = 'Sonar' + spec.name = 'Flipper' spec.version = sonarkit_version spec.license = { :type => 'MIT' } spec.homepage = 'https://github.com/facebook/sonar' @@ -8,9 +8,9 @@ Pod::Spec.new do |spec| spec.authors = 'Facebook' spec.source = { :git => 'https://github.com/facebook/Sonar.git', :tag => 'v'+sonarkit_version } - spec.module_name = 'Sonar' - spec.public_header_files = 'xplat/Sonar/*.h' - spec.source_files = 'xplat/Sonar/*.{h,cpp,m,mm}' + spec.module_name = 'Flipper' + spec.public_header_files = 'xplat/Flipper/*.h' + spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}' spec.libraries = "stdc++" spec.dependency 'Folly', '~>1.1' spec.dependency 'RSocket', '~>0.10' diff --git a/xplat/Sonar/FlipperResponder.h b/xplat/Flipper/FlipperResponder.h similarity index 100% rename from xplat/Sonar/FlipperResponder.h rename to xplat/Flipper/FlipperResponder.h diff --git a/xplat/Sonar/Log.cpp b/xplat/Flipper/Log.cpp similarity index 100% rename from xplat/Sonar/Log.cpp rename to xplat/Flipper/Log.cpp diff --git a/xplat/Sonar/Log.h b/xplat/Flipper/Log.h similarity index 100% rename from xplat/Sonar/Log.h rename to xplat/Flipper/Log.h diff --git a/xplat/Sonar/SonarClient.cpp b/xplat/Flipper/SonarClient.cpp similarity index 100% rename from xplat/Sonar/SonarClient.cpp rename to xplat/Flipper/SonarClient.cpp diff --git a/xplat/Sonar/SonarClient.h b/xplat/Flipper/SonarClient.h similarity index 93% rename from xplat/Sonar/SonarClient.h rename to xplat/Flipper/SonarClient.h index 0af14c28f..225a9e87f 100644 --- a/xplat/Sonar/SonarClient.h +++ b/xplat/Flipper/SonarClient.h @@ -8,11 +8,11 @@ #pragma once -#include -#include -#include -#include -#include +#include "SonarConnectionImpl.h" +#include "SonarInitConfig.h" +#include "SonarPlugin.h" +#include "SonarState.h" +#include "SonarWebSocket.h" #include #include #include "SonarStep.h" diff --git a/xplat/Sonar/SonarConnection.h b/xplat/Flipper/SonarConnection.h similarity index 97% rename from xplat/Sonar/SonarConnection.h rename to xplat/Flipper/SonarConnection.h index f8352e3b1..cb5da39e8 100644 --- a/xplat/Sonar/SonarConnection.h +++ b/xplat/Flipper/SonarConnection.h @@ -8,7 +8,7 @@ #pragma once -#include +#include "FlipperResponder.h" #include #include #include diff --git a/xplat/Sonar/SonarConnectionImpl.h b/xplat/Flipper/SonarConnectionImpl.h similarity index 95% rename from xplat/Sonar/SonarConnectionImpl.h rename to xplat/Flipper/SonarConnectionImpl.h index b463254b3..b3abc5561 100644 --- a/xplat/Sonar/SonarConnectionImpl.h +++ b/xplat/Flipper/SonarConnectionImpl.h @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include "SonarConnection.h" +#include "SonarWebSocket.h" #include #include diff --git a/xplat/Sonar/SonarInitConfig.h b/xplat/Flipper/SonarInitConfig.h similarity index 100% rename from xplat/Sonar/SonarInitConfig.h rename to xplat/Flipper/SonarInitConfig.h diff --git a/xplat/Sonar/SonarPlugin.h b/xplat/Flipper/SonarPlugin.h similarity index 96% rename from xplat/Sonar/SonarPlugin.h rename to xplat/Flipper/SonarPlugin.h index ef2e23a0e..22c0ea5aa 100644 --- a/xplat/Sonar/SonarPlugin.h +++ b/xplat/Flipper/SonarPlugin.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include "SonarConnection.h" #include namespace facebook { diff --git a/xplat/Sonar/SonarResponderImpl.h b/xplat/Flipper/SonarResponderImpl.h similarity index 93% rename from xplat/Sonar/SonarResponderImpl.h rename to xplat/Flipper/SonarResponderImpl.h index 629e84cf3..5f50fd4b2 100644 --- a/xplat/Sonar/SonarResponderImpl.h +++ b/xplat/Flipper/SonarResponderImpl.h @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include "FlipperResponder.h" +#include "SonarWebSocket.h" #include namespace facebook { diff --git a/xplat/Sonar/SonarState.cpp b/xplat/Flipper/SonarState.cpp similarity index 100% rename from xplat/Sonar/SonarState.cpp rename to xplat/Flipper/SonarState.cpp diff --git a/xplat/Sonar/SonarState.h b/xplat/Flipper/SonarState.h similarity index 100% rename from xplat/Sonar/SonarState.h rename to xplat/Flipper/SonarState.h diff --git a/xplat/Sonar/SonarStateUpdateListener.h b/xplat/Flipper/SonarStateUpdateListener.h similarity index 100% rename from xplat/Sonar/SonarStateUpdateListener.h rename to xplat/Flipper/SonarStateUpdateListener.h diff --git a/xplat/Sonar/SonarStep.cpp b/xplat/Flipper/SonarStep.cpp similarity index 100% rename from xplat/Sonar/SonarStep.cpp rename to xplat/Flipper/SonarStep.cpp diff --git a/xplat/Sonar/SonarStep.h b/xplat/Flipper/SonarStep.h similarity index 100% rename from xplat/Sonar/SonarStep.h rename to xplat/Flipper/SonarStep.h diff --git a/xplat/Sonar/SonarWebSocket.h b/xplat/Flipper/SonarWebSocket.h similarity index 100% rename from xplat/Sonar/SonarWebSocket.h rename to xplat/Flipper/SonarWebSocket.h diff --git a/xplat/Sonar/SonarWebSocketImpl.cpp b/xplat/Flipper/SonarWebSocketImpl.cpp similarity index 100% rename from xplat/Sonar/SonarWebSocketImpl.cpp rename to xplat/Flipper/SonarWebSocketImpl.cpp diff --git a/xplat/Sonar/SonarWebSocketImpl.h b/xplat/Flipper/SonarWebSocketImpl.h similarity index 94% rename from xplat/Sonar/SonarWebSocketImpl.h rename to xplat/Flipper/SonarWebSocketImpl.h index a070fa609..ae3fc6e74 100644 --- a/xplat/Sonar/SonarWebSocketImpl.h +++ b/xplat/Flipper/SonarWebSocketImpl.h @@ -8,9 +8,9 @@ #pragma once -#include -#include -#include +#include "SonarInitConfig.h" +#include "SonarWebSocket.h" +#include "SonarState.h" #include #include #include diff --git a/xplat/SonarTestLib/ConnectionContextStoreMock.h b/xplat/FlipperTestLib/ConnectionContextStoreMock.h similarity index 93% rename from xplat/SonarTestLib/ConnectionContextStoreMock.h rename to xplat/FlipperTestLib/ConnectionContextStoreMock.h index 721f4d2f5..76938616b 100644 --- a/xplat/SonarTestLib/ConnectionContextStoreMock.h +++ b/xplat/FlipperTestLib/ConnectionContextStoreMock.h @@ -1,4 +1,4 @@ -#include +#include namespace facebook { namespace flipper { diff --git a/xplat/SonarTestLib/SonarConnectionMock.h b/xplat/FlipperTestLib/SonarConnectionMock.h similarity index 95% rename from xplat/SonarTestLib/SonarConnectionMock.h rename to xplat/FlipperTestLib/SonarConnectionMock.h index a08b05584..97f6a7754 100644 --- a/xplat/SonarTestLib/SonarConnectionMock.h +++ b/xplat/FlipperTestLib/SonarConnectionMock.h @@ -8,7 +8,7 @@ #pragma once -#include +#include #include #include diff --git a/xplat/SonarTestLib/SonarPluginMock.h b/xplat/FlipperTestLib/SonarPluginMock.h similarity index 97% rename from xplat/SonarTestLib/SonarPluginMock.h rename to xplat/FlipperTestLib/SonarPluginMock.h index bd9edbb86..310f96055 100644 --- a/xplat/SonarTestLib/SonarPluginMock.h +++ b/xplat/FlipperTestLib/SonarPluginMock.h @@ -8,7 +8,7 @@ #pragma once -#include +#include namespace facebook { namespace flipper { diff --git a/xplat/SonarTestLib/SonarResponderMock.h b/xplat/FlipperTestLib/SonarResponderMock.h similarity index 96% rename from xplat/SonarTestLib/SonarResponderMock.h rename to xplat/FlipperTestLib/SonarResponderMock.h index be390efb9..617ef5025 100644 --- a/xplat/SonarTestLib/SonarResponderMock.h +++ b/xplat/FlipperTestLib/SonarResponderMock.h @@ -8,7 +8,7 @@ #pragma once -#include +#include #include #include diff --git a/xplat/SonarTestLib/SonarWebSocketMock.h b/xplat/FlipperTestLib/SonarWebSocketMock.h similarity index 96% rename from xplat/SonarTestLib/SonarWebSocketMock.h rename to xplat/FlipperTestLib/SonarWebSocketMock.h index 19a0774b7..b6e31f2ad 100644 --- a/xplat/SonarTestLib/SonarWebSocketMock.h +++ b/xplat/FlipperTestLib/SonarWebSocketMock.h @@ -8,7 +8,7 @@ #pragma once -#include +#include namespace facebook { namespace flipper { diff --git a/xplat/SonarTests/SonarClientTests.cpp b/xplat/FlipperTests/SonarClientTests.cpp similarity index 98% rename from xplat/SonarTests/SonarClientTests.cpp rename to xplat/FlipperTests/SonarClientTests.cpp index cacc16ad6..ef3e5fef7 100644 --- a/xplat/SonarTests/SonarClientTests.cpp +++ b/xplat/FlipperTests/SonarClientTests.cpp @@ -6,9 +6,9 @@ * */ -#include -#include -#include +#include +#include +#include #include #include diff --git a/xplat/SonarTests/SonarWebSocketImplTerminationTests.cpp b/xplat/FlipperTests/SonarWebSocketImplTerminationTests.cpp similarity index 96% rename from xplat/SonarTests/SonarWebSocketImplTerminationTests.cpp rename to xplat/FlipperTests/SonarWebSocketImplTerminationTests.cpp index 868e69ab7..33baac0a5 100644 --- a/xplat/SonarTests/SonarWebSocketImplTerminationTests.cpp +++ b/xplat/FlipperTests/SonarWebSocketImplTerminationTests.cpp @@ -6,8 +6,8 @@ * */ -#include -#include +#include +#include #include