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

@@ -0,0 +1 @@
+xplat/Flipper/Flipper.podspec

android/src/main/cpp/sonar.cpp

@@ -18,12 +18,12 @@
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/EventBaseManager.h>
 
-#include <Sonar/SonarClient.h>
-#include <Sonar/SonarWebSocket.h>
-#include <Sonar/SonarConnection.h>
-#include <Sonar/FlipperResponder.h>
-#include <Sonar/SonarStateUpdateListener.h>
-#include <Sonar/SonarState.h>
+#include <Flipper/SonarClient.h>
+#include <Flipper/SonarWebSocket.h>
+#include <Flipper/SonarConnection.h>
+#include <Flipper/FlipperResponder.h>
+#include <Flipper/SonarStateUpdateListener.h>
+#include <Flipper/SonarState.h>
 
 using namespace facebook;
 using namespace facebook::flipper;

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 <MySonarPlugin/MySonarPlugin.h>
-#include <SonarTestLib/SonarConnectionMock.h>
-#include <SonarTestLib/SonarResponderMock.h>
+#include <FlipperTestLib/SonarConnectionMock.h>
+#include <FlipperTestLib/SonarResponderMock.h>
 
 #include <folly/json.h>
 #include <gtest/gtest.h>

iOS/FlipperKit/CppBridge/FlipperCppBridgingConnection.h

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-#import <Sonar/SonarConnection.h>
+#import <Flipper/SonarConnection.h>
 #import <FlipperKit/FlipperConnection.h>
 
 /**

iOS/FlipperKit/CppBridge/SonarCppBridgingResponder.h

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-#import <Sonar/FlipperResponder.h>
+#import <Flipper/FlipperResponder.h>
 #import <FlipperKit/FlipperResponder.h>
 
 /**

iOS/FlipperKit/CppBridge/SonarCppWrapperPlugin.h

@@ -9,7 +9,7 @@
 #error This header can only be included in .mm (ObjC++) files
 #endif
 
-#import <Sonar/SonarPlugin.h>
+#import <Flipper/SonarPlugin.h>
 #import <FlipperKit/CppBridge/FlipperCppBridgingConnection.h>
 #import <FlipperKit/FlipperPlugin.h>
 

iOS/FlipperKit/FlipperClient.mm

@@ -9,7 +9,7 @@
 
 #import "FlipperClient.h"
 #import "SonarCppWrapperPlugin.h"
-#import <Sonar/SonarClient.h>
+#import <Flipper/SonarClient.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/ScopedEventBaseThread.h>
 #import <UIKit/UIKit.h>

iOS/FlipperKit/SKStateUpdateCPPWrapper.h

@@ -1,6 +1,6 @@
 #ifdef FB_SONARKIT_ENABLED
 
-#include <Sonar/SonarStateUpdateListener.h>
+#include <Flipper/SonarStateUpdateListener.h>
 #import "FlipperStateUpdateListener.h"
 
 /*

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

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|

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++\"",

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'
 

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

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\"",

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'

iOS/SonarKitTestUtils/FlipperClient+Testing.h

@@ -11,7 +11,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <Sonar/SonarClient.h>
+#import <Flipper/SonarClient.h>
 #import <FlipperKit/FlipperClient.h>
 
 @interface FlipperClient (Testing)

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)

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'

xplat/Flipper/SonarClient.h

@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include <Sonar/SonarConnectionImpl.h>
-#include <Sonar/SonarInitConfig.h>
-#include <Sonar/SonarPlugin.h>
-#include <Sonar/SonarState.h>
-#include <Sonar/SonarWebSocket.h>
+#include "SonarConnectionImpl.h"
+#include "SonarInitConfig.h"
+#include "SonarPlugin.h"
+#include "SonarState.h"
+#include "SonarWebSocket.h"
 #include <map>
 #include <mutex>
 #include "SonarStep.h"

xplat/Flipper/SonarConnection.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <Sonar/FlipperResponder.h>
+#include "FlipperResponder.h"
 #include <folly/json.h>
 #include <functional>
 #include <string>

xplat/Flipper/SonarConnectionImpl.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <Sonar/SonarConnection.h>
-#include <Sonar/SonarWebSocket.h>
+#include "SonarConnection.h"
+#include "SonarWebSocket.h"
 #include <map>
 #include <string>
 

xplat/Flipper/SonarPlugin.h

@@ -7,7 +7,7 @@
  */
 #pragma once
 
-#include <Sonar/SonarConnection.h>
+#include "SonarConnection.h"
 #include <string>
 
 namespace facebook {

xplat/Flipper/SonarResponderImpl.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <Sonar/FlipperResponder.h>
-#include <Sonar/SonarWebSocket.h>
+#include "FlipperResponder.h"
+#include "SonarWebSocket.h"
 #include <folly/json.h>
 
 namespace facebook {

xplat/Flipper/SonarWebSocketImpl.h

@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include <Sonar/SonarInitConfig.h>
-#include <Sonar/SonarWebSocket.h>
-#include <Sonar/SonarState.h>
+#include "SonarInitConfig.h"
+#include "SonarWebSocket.h"
+#include "SonarState.h"
 #include <folly/Executor.h>
 #include <folly/io/async/EventBase.h>
 #include <rsocket/RSocket.h>

xplat/FlipperTestLib/ConnectionContextStoreMock.h

@@ -1,4 +1,4 @@
-#include <Sonar/ConnectionContextStore.h>
+#include <Flipper/ConnectionContextStore.h>
 
 namespace facebook {
 namespace flipper {

xplat/FlipperTestLib/SonarConnectionMock.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <Sonar/SonarConnection.h>
+#include <Flipper/SonarConnection.h>
 #include <map>
 #include <string>
 

xplat/FlipperTestLib/SonarPluginMock.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <Sonar/SonarPlugin.h>
+#include <Flipper/SonarPlugin.h>
 
 namespace facebook {
 namespace flipper {

xplat/FlipperTestLib/SonarResponderMock.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <Sonar/FlipperResponder.h>
+#include <Flipper/FlipperResponder.h>
 #include <folly/json.h>
 #include <vector>
 

xplat/FlipperTestLib/SonarWebSocketMock.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <Sonar/SonarWebSocket.h>
+#include <Flipper/SonarWebSocket.h>
 
 namespace facebook {
 namespace flipper {

xplat/FlipperTests/SonarClientTests.cpp

@@ -6,9 +6,9 @@
  *
  */
 
-#include <Sonar/SonarClient.h>
-#include <SonarTestLib/SonarPluginMock.h>
-#include <SonarTestLib/SonarWebSocketMock.h>
+#include <Flipper/SonarClient.h>
+#include <FlipperTestLib/SonarPluginMock.h>
+#include <FlipperTestLib/SonarWebSocketMock.h>
 
 #include <folly/json.h>
 #include <gtest/gtest.h>

xplat/FlipperTests/SonarWebSocketImplTerminationTests.cpp

@@ -6,8 +6,8 @@
  *
  */
 
-#include <Sonar/SonarWebSocketImpl.h>
-#include <SonarTestLib/ConnectionContextStoreMock.h>
+#include <Flipper/SonarWebSocketImpl.h>
+#include <FlipperTestLib/ConnectionContextStoreMock.h>
 
 #include <gtest/gtest.h>