Rename SonarKitLayoutPlugin to FlipperKitLayoutPlugin

Summary: Renames SonarKitLayoutPlugin to FlipperKitLayoutPlugin

Reviewed By: passy

Differential Revision: D9949785

fbshipit-source-id: 8cfde4dfad3e34038d2f66f0ce4393db9d83ef60

iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h

@@ -15,7 +15,7 @@
 #import "SKInvalidation.h"
 #import "SKDescriptorMapper.h"
 
-@interface SonarKitLayoutPlugin : NSObject<FlipperPlugin, SKInvalidationDelegate>
+@interface FlipperKitLayoutPlugin : NSObject<FlipperPlugin, SKInvalidationDelegate>
 
 - (instancetype)initWithRootNode:(id<NSObject>)rootNode
             withDescriptorMapper:(SKDescriptorMapper *)mapper;

iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.mm

@@ -7,7 +7,7 @@
  */
 #if FB_SONARKIT_ENABLED
 
-#import "SonarKitLayoutPlugin.h"
+#import "FlipperKitLayoutPlugin.h"
 
 #import <FlipperKit/FlipperClient.h>
 #import <FlipperKit/FlipperConnection.h>
@@ -20,7 +20,7 @@
 #import "SKSearchResultNode.h"
 #import <mutex>
 
-@implementation SonarKitLayoutPlugin
+@implementation FlipperKitLayoutPlugin
 {
 
   NSMapTable<NSString *, id> *_trackedObjects;
@@ -80,8 +80,8 @@
     [descriptor setUp];
   }
 
-  // In order to avoid a retain cycle (Connection -> Block -> SonarKitLayoutPlugin -> Connection ...)
-  __weak SonarKitLayoutPlugin *weakSelf = self;
+  // In order to avoid a retain cycle (Connection -> Block -> FlipperKitLayoutPlugin -> Connection ...)
+  __weak FlipperKitLayoutPlugin *weakSelf = self;
 
   [connection receive:@"getRoot" withBlock:^(NSDictionary *params, id<FlipperResponder> responder) {
     FlipperPerformBlockOnMainThread(^{ [weakSelf onCallGetRoot: responder]; });

iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.h

@@ -7,8 +7,8 @@
  */
 #import <ComponentKit/CKComponent.h>
 #import <FlipperKit/SKMacros.h>
-#import <SonarKitLayoutPlugin/SKNamed.h>
-#import <SonarKitLayoutPlugin/SKNodeDescriptor.h>
+#import <FlipperKitLayoutPlugin/SKNamed.h>
+#import <FlipperKitLayoutPlugin/SKNodeDescriptor.h>
 
 FB_LINK_REQUIRE(CKComponent_Sonar)
 @interface CKComponent (Sonar)

iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.mm

@@ -14,8 +14,8 @@
 #import <ComponentKit/CKComponentInternal.h>
 #import <ComponentKit/CKComponentSubclass.h>
 #import <ComponentKit/CKComponentViewConfiguration.h>
-#import <SonarKitLayoutPlugin/SKNamed.h>
-#import <SonarKitLayoutPlugin/SKObject.h>
+#import <FlipperKitLayoutPlugin/SKNamed.h>
+#import <FlipperKitLayoutPlugin/SKObject.h>
 
 /** This protocol isn't actually adopted anywhere, it just lets us use the SEL below */
 @protocol SonarKitLayoutComponentKitOverrideInformalProtocol

iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm

@@ -9,8 +9,8 @@
 
 #import "CKFlexboxComponent+Sonar.h"
 
-#import <SonarKitLayoutPlugin/SKNamed.h>
-#import <SonarKitLayoutPlugin/SKObject.h>
+#import <FlipperKitLayoutPlugin/SKNamed.h>
+#import <FlipperKitLayoutPlugin/SKObject.h>
 
 #import "CKComponent+Sonar.h"
 #import "Utils.h"

iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKInsetComponent+Sonar.mm

@@ -9,8 +9,8 @@
 
 #import "CKInsetComponent+Sonar.h"
 
-#import <SonarKitLayoutPlugin/SKNamed.h>
-#import <SonarKitLayoutPlugin/SKObject.h>
+#import <FlipperKitLayoutPlugin/SKNamed.h>
+#import <FlipperKitLayoutPlugin/SKObject.h>
 
 #import "CKComponent+Sonar.h"
 

iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.h

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-#import <SonarKitLayoutPlugin/SKNodeDescriptor.h>
+#import <FlipperKitLayoutPlugin/SKNodeDescriptor.h>
 
 @class CKComponentHostingView;
 

iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.mm

@@ -16,7 +16,7 @@
 #import <ComponentKit/CKComponentLayout.h>
 #import <ComponentKit/CKComponentHostingViewInternal.h>
 
-#import <SonarKitLayoutPlugin/SKDescriptorMapper.h>
+#import <FlipperKitLayoutPlugin/SKDescriptorMapper.h>
 
 #import "SKComponentLayoutWrapper.h"
 

iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.h

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-#import <SonarKitLayoutPlugin/SKNodeDescriptor.h>
+#import <FlipperKitLayoutPlugin/SKNodeDescriptor.h>
 
 @class SKComponentLayoutWrapper;
 

iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm

@@ -20,8 +20,8 @@
 #import <ComponentKit/CKInsetComponent.h>
 #import <ComponentKit/CKFlexboxComponent.h>
 
-#import <SonarKitLayoutPlugin/SKHighlightOverlay.h>
-#import <SonarKitLayoutPlugin/SKObject.h>
+#import <FlipperKitLayoutPlugin/SKHighlightOverlay.h>
+#import <FlipperKitLayoutPlugin/SKObject.h>
 
 #import "SKComponentLayoutWrapper.h"
 #import "CKComponent+Sonar.h"

iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.h

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-#import <SonarKitLayoutPlugin/SKNodeDescriptor.h>
+#import <FlipperKitLayoutPlugin/SKNodeDescriptor.h>
 
 @class CKComponentRootView;
 

iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm

@@ -16,7 +16,7 @@
 #import <ComponentKit/CKComponentLayout.h>
 #import <ComponentKit/CKComponentRootViewInternal.h>
 
-#import <SonarKitLayoutPlugin/SKDescriptorMapper.h>
+#import <FlipperKitLayoutPlugin/SKDescriptorMapper.h>
 
 #import "SKComponentLayoutWrapper.h"
 

iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h

@@ -7,7 +7,7 @@
  */
 #import <Foundation/Foundation.h>
 
-#import <SonarKitLayoutPlugin/SKDescriptorMapper.h>
+#import <FlipperKitLayoutPlugin/SKDescriptorMapper.h>
 
 @interface SonarKitLayoutComponentKitSupport : NSObject
 

iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.mm

@@ -12,7 +12,7 @@
 #import <ComponentKit/CKComponentRootView.h>
 #import <ComponentKit/CKComponentHostingView.h>
 
-#import <SonarKitLayoutPlugin/SKDescriptorMapper.h>
+#import <FlipperKitLayoutPlugin/SKDescriptorMapper.h>
 
 #import "SKComponentHostingViewDescriptor.h"
 #import "SKComponentRootViewDescriptor.h"

iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SKTapListenerMock.h

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-#import <SonarKitLayoutPlugin/SKTapListener.h>
+#import <FlipperKitLayoutPlugin/SKTapListener.h>
 
 @interface SKTapListenerMock : NSObject<SKTapListener>
 

iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SonarKitLayoutPluginTests.m

@@ -9,9 +9,9 @@
 
 #if FB_SONARKIT_ENABLED
 
-#import <SonarKitLayoutPlugin/SKDescriptorMapper.h>
-#import <SonarKitLayoutPlugin/SKNodeDescriptor.h>
-#import <SonarKitLayoutPlugin/SonarKitLayoutPlugin.h>
+#import <FlipperKitLayoutPlugin/SKDescriptorMapper.h>
+#import <FlipperKitLayoutPlugin/SKNodeDescriptor.h>
+#import <FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h>
 #import <SonarKitTestUtils/SonarConnectionMock.h>
 #import <SonarKitTestUtils/SonarResponderMock.h>
 
@@ -37,7 +37,7 @@
 }
 
 - (void)testGetRoot {
-  SonarKitLayoutPlugin *plugin = [[SonarKitLayoutPlugin alloc]
+  FlipperKitLayoutPlugin *plugin = [[FlipperKitLayoutPlugin alloc]
                                   initWithRootNode: [[TestNode alloc] initWithName: @"rootNode"]
                                   withTapListener: nil
                                   withDescriptorMapper: _descriptorMapper];
@@ -60,7 +60,7 @@
 }
 
 - (void)testGetEmptyNodes {
-  SonarKitLayoutPlugin *plugin = [SonarKitLayoutPlugin new];
+  FlipperKitLayoutPlugin *plugin = [FlipperKitLayoutPlugin new];
   SonarConnectionMock *connection = [SonarConnectionMock new];
   SonarResponderMock *responder = [SonarResponderMock new];
   [plugin didConnect:connection];
@@ -81,7 +81,7 @@
 
   rootNode.children = childNodes;
 
-  SonarKitLayoutPlugin *plugin = [[SonarKitLayoutPlugin alloc] initWithRootNode: rootNode
+  FlipperKitLayoutPlugin *plugin = [[FlipperKitLayoutPlugin alloc] initWithRootNode: rootNode
                                                                 withTapListener: nil
                                                            withDescriptorMapper: _descriptorMapper];
 
@@ -132,7 +132,7 @@
 
   rootNode.children = childNodes;
 
-  SonarKitLayoutPlugin *plugin = [[SonarKitLayoutPlugin alloc] initWithRootNode: rootNode
+  FlipperKitLayoutPlugin *plugin = [[FlipperKitLayoutPlugin alloc] initWithRootNode: rootNode
                                                                 withTapListener: nil
                                                            withDescriptorMapper: _descriptorMapper];
 
@@ -171,7 +171,7 @@
   testNode2.children = @[ testNode3 ];
 
   SKTapListenerMock *tapListener = [SKTapListenerMock new];
-  SonarKitLayoutPlugin *plugin = [[SonarKitLayoutPlugin alloc] initWithRootNode: rootNode
+  FlipperKitLayoutPlugin *plugin = [[FlipperKitLayoutPlugin alloc] initWithRootNode: rootNode
                                                                 withTapListener: tapListener
                                                            withDescriptorMapper: _descriptorMapper];
 
@@ -191,7 +191,7 @@
   TestNode *rootNode = [[TestNode alloc] initWithName: @"rootNode"];
 
   SKTapListenerMock *tapListener = [SKTapListenerMock new];
-  SonarKitLayoutPlugin *plugin = [[SonarKitLayoutPlugin alloc] initWithRootNode: rootNode
+  FlipperKitLayoutPlugin *plugin = [[FlipperKitLayoutPlugin alloc] initWithRootNode: rootNode
                                                                 withTapListener: tapListener
                                                            withDescriptorMapper: _descriptorMapper];
 
@@ -223,7 +223,7 @@
   testNode2.children = @[ testNode3 ];
 
   SKTapListenerMock *tapListener = [SKTapListenerMock new];
-  SonarKitLayoutPlugin *plugin = [[SonarKitLayoutPlugin alloc] initWithRootNode: rootNode
+  FlipperKitLayoutPlugin *plugin = [[FlipperKitLayoutPlugin alloc] initWithRootNode: rootNode
                                                                 withTapListener: tapListener
                                                            withDescriptorMapper: _descriptorMapper];
 

iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/TestNodeDescriptor.h

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-#import <SonarKitLayoutPlugin/SKNodeDescriptor.h>
+#import <FlipperKitLayoutPlugin/SKNodeDescriptor.h>
 
 #import "TestNode.h"
 

iOS/Sample/AppDelegate.mm

@@ -8,7 +8,7 @@
 #import "AppDelegate.h"
 
 #import <FlipperKit/FlipperClient.h>
-#import <SonarKitLayoutPlugin/SonarKitLayoutPlugin.h>
+#import <FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h>
 #import <SonarKitNetworkPlugin/SonarKitNetworkPlugin.h>
 #import <SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h>
 #import <SKIOSNetworkPlugin/SKIOSNetworkAdapter.h>
@@ -32,7 +32,7 @@
 
   SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults];
   [SonarKitLayoutComponentKitSupport setUpWithDescriptorMapper: layoutDescriptorMapper];
-  [client addPlugin: [[SonarKitLayoutPlugin alloc] initWithRootNode: application
+  [client addPlugin: [[FlipperKitLayoutPlugin alloc] initWithRootNode: application
                                                withDescriptorMapper: layoutDescriptorMapper]];
 
   [[FlipperClient sharedClient] addPlugin: [[SonarKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]];

iOS/Sample/Podfile.lock

@@ -19,18 +19,18 @@ PODS:
   - FlipperKit/CppBridge (0.7.2)
   - FlipperKit/FBCxxUtils (0.7.2)
   - FlipperKit/FBDefines (0.7.2)
+  - FlipperKit/FlipperKitLayoutPlugin (0.7.2):
+    - FlipperKit/Core
+    - Yoga (~> 1.9)
+    - YogaKit (~> 1.8)
   - FlipperKit/SKIOSNetworkPlugin (0.7.2):
     - FlipperKit/Core
     - FlipperKit/SonarKitNetworkPlugin
   - FlipperKit/SonarKitLayoutComponentKitSupport (0.7.2):
     - ComponentKit
     - FlipperKit/Core
-    - FlipperKit/SonarKitLayoutPlugin
+    - FlipperKit/FlipperKitLayoutPlugin
     - Yoga (~> 1.9)
-  - FlipperKit/SonarKitLayoutPlugin (0.7.2):
-    - FlipperKit/Core
-    - Yoga (~> 1.9)
-    - YogaKit (~> 1.8)
   - FlipperKit/SonarKitNetworkPlugin (0.7.2):
     - FlipperKit/Core
   - Folly (1.1.0):
@@ -85,7 +85,7 @@ SPEC CHECKSUMS:
   CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
   ComponentKit: bf8b4c4e7448bd15b3a8e5a71174ea7aa6cea98d
   DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c
-  FlipperKit: d8fb90df50d14c0022f5a931b93c437dfced0530
+  FlipperKit: e70400bbc914a7a3d67464a06d98bd5d6261cf4a
   Folly: dd92f69322d8535b9df98d7c91e442b0fce2fff2
   glog: 1de0bb937dccdc981596d3b5825ebfb765017ded
   OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e

iOS/SampleSwift/SampleSwift/AppDelegate.swift

@@ -16,7 +16,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     // Layout and network plugins are currently not supported for Swift apps.
 //    let layoutDescriptorMapper = SKDescriptorMapper(defaults: ())
 //    SonarKitLayoutComponentKitSupport.setUp(descriptorMapper: layoutDescriptorMapper)
-//    client.addPlugin(SonarKitLayoutPlugin(rootNode: application, descriptorMapper: layoutDescriptorMapper))
+//    client.addPlugin(FlipperKitLayoutPlugin(rootNode: application, descriptorMapper: layoutDescriptorMapper))
 
     client?.add(SonarKitNetworkPlugin(networkAdapter: SKIOSNetworkAdapter()))
     client?.start()

iOS/SonarKit.podspec

@@ -71,26 +71,26 @@ Pod::Spec.new do |spec|
                              "HEADER_SEARCH_PATHS" => header_search_paths }
   end
 
-  spec.subspec "SonarKitLayoutPlugin" do |ss|
-    ss.header_dir = "SonarKitLayoutPlugin"
+  spec.subspec "FlipperKitLayoutPlugin" do |ss|
+    ss.header_dir = "FlipperKitLayoutPlugin"
     ss.dependency             'FlipperKit/Core'
     ss.dependency             'Yoga', yoga_version
     ss.dependency             'YogaKit', yogakit_version
     ss.compiler_flags       = folly_compiler_flags
-    ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h',
-                              'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTouch.h',
-                              'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKDescriptorMapper.h',
-                              'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNodeDescriptor.h',
-                              'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKInvalidation.h',
-                              'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNamed.h',
-                              'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTapListener.h',
-                              'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKObject.h',
-                              'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKHighlightOverlay.h',
-                              'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIColor+SKSonarValueCoder.h',
-                              'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKObjectHash.h',
-                              'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKSwizzle.h',
-                              'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKYogaKitHelper.h'
-    ss.source_files         = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/**/*.{h,cpp,m,mm}'
+    ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h',
+                              'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h',
+                              'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h',
+                              'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h',
+                              'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h',
+                              'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h',
+                              'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h',
+                              'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h',
+                              'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h',
+                              'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h',
+                              'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h',
+                              'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKSwizzle.h',
+                              'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKYogaKitHelper.h'
+    ss.source_files         = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/**/*.{h,cpp,m,mm}'
   end
 
   spec.subspec "SonarKitLayoutComponentKitSupport" do |ss|
@@ -98,13 +98,13 @@ Pod::Spec.new do |spec|
     ss.dependency             'FlipperKit/Core'
     ss.dependency             'Yoga', yoga_version
     ss.dependency             'ComponentKit'
-    ss.dependency             'FlipperKit/SonarKitLayoutPlugin'
+    ss.dependency             'FlipperKit/FlipperKitLayoutPlugin'
     ss.compiler_flags       = folly_compiler_flags
-    ss.dependency             'FlipperKit/SonarKitLayoutPlugin'
-    ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h',
-                             'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h'
+    ss.dependency             'FlipperKit/FlipperKitLayoutPlugin'
+    ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h',
+                             'iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h'
 
-    ss.source_files         = "iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}"
+    ss.source_files         = "iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}"
     ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
                                 "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" }
   end