Change modulename to FlipperKit

Summary: Change modulename to FlipperKit

Reviewed By: passy

Differential Revision: D9940793

fbshipit-source-id: ea3c6633c481e29fc192cea7465fe3a93cf28f87

iOS/FlipperKit/CppBridge/SonarCppBridgingConnection.h

@@ -6,7 +6,7 @@
  *
  */
 #import <Sonar/SonarConnection.h>
-#import <SonarKit/FlipperConnection.h>
+#import <FlipperKit/FlipperConnection.h>
 
 /**
 SonarCppBridgingConnection is a simple ObjC wrapper around SonarConnection

iOS/FlipperKit/CppBridge/SonarCppBridgingResponder.h

@@ -6,7 +6,7 @@
  *
  */
 #import <Sonar/FlipperResponder.h>
-#import <SonarKit/SonarResponder.h>
+#import <FlipperKit/SonarResponder.h>
 
 /**
 SonarCppBridgingResponder is a simple ObjC wrapper around SonarResponder

iOS/FlipperKit/CppBridge/SonarCppWrapperPlugin.h

@@ -10,8 +10,8 @@
 #endif
 
 #import <Sonar/SonarPlugin.h>
-#import <SonarKit/CppBridge/SonarCppBridgingConnection.h>
+#import <FlipperKit/CppBridge/SonarCppBridgingConnection.h>
-#import <SonarKit/FlipperPlugin.h>
+#import <FlipperKit/FlipperPlugin.h>
 
 namespace facebook {
 namespace flipper {

iOS/FlipperKit/FBCxxUtils/FBCxxFollyDynamicConvert.h

@@ -0,0 +1 @@
+../../../../../fbobjc/Libraries/FBCxxUtils/FBCxxUtils/FBCxxFollyDynamicConvert.h

iOS/FlipperKit/FBCxxUtils/FBCxxFollyDynamicConvert.mm

@@ -0,0 +1 @@
+../../../../../fbobjc/Libraries/FBCxxUtils/FBCxxUtils/FBCxxFollyDynamicConvert.mm

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

@@ -6,7 +6,7 @@
  *
  */
 #import <ComponentKit/CKComponent.h>
-#import <SonarKit/SKMacros.h>
+#import <FlipperKit/SKMacros.h>
 #import <SonarKitLayoutPlugin/SKNamed.h>
 #import <SonarKitLayoutPlugin/SKNodeDescriptor.h>
 

iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.h

@@ -6,7 +6,7 @@
  *
  */
 #import <ComponentKit/CKFlexboxComponent.h>
-#import <SonarKit/SKMacros.h>
+#import <FlipperKit/SKMacros.h>
 
 FB_LINK_REQUIRE(CKFlexboxComponent_Sonar)
 @interface CKFlexboxComponent (Sonar)

iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKInsetComponent+Sonar.h

@@ -6,7 +6,7 @@
  *
  */
 #import <ComponentKit/CKInsetComponent.h>
-#import <SonarKit/SKMacros.h>
+#import <FlipperKit/SKMacros.h>
 
 FB_LINK_REQUIRE(CKInsetComponent_Sonar)
 @interface CKInsetComponent (Sonar)

iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h

@@ -9,7 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <SonarKit/FlipperPlugin.h>
+#import <FlipperKit/FlipperPlugin.h>
 
 #import "SKTapListener.h"
 #import "SKInvalidation.h"

iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.mm

@@ -9,10 +9,10 @@
 
 #import "SonarKitLayoutPlugin.h"
 
-#import <SonarKit/FlipperClient.h>
+#import <FlipperKit/FlipperClient.h>
-#import <SonarKit/FlipperConnection.h>
+#import <FlipperKit/FlipperConnection.h>
-#import <SonarKit/SonarResponder.h>
+#import <FlipperKit/SonarResponder.h>
-#import <SonarKit/SKMacros.h>
+#import <FlipperKit/SKMacros.h>
 #import "SKDescriptorMapper.h"
 #import "SKNodeDescriptor.h"
 #import "SKTapListener.h"

iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UICollectionView+SKInvalidation.h

@@ -7,7 +7,7 @@
  */
 #import <UIKit/UIKit.h>
 
-#import <SonarKit/SKMacros.h>
+#import <FlipperKit/SKMacros.h>
 
 FB_LINK_REQUIRE(UICollectionView_SKInvalidation)
 @interface UICollectionView (SKInvalidation)

iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIColor+SKSonarValueCoder.h

@@ -7,7 +7,7 @@
  */
 #import <UIKit/UIKit.h>
 
-#import <SonarKit/SKMacros.h>
+#import <FlipperKit/SKMacros.h>
 
 #import "SKObject.h"
 

iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIView+SKInvalidation.h

@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-#import <SonarKit/SKMacros.h>
+#import <FlipperKit/SKMacros.h>
 
 FB_LINK_REQUIRE(UIView_SKInvalidation)
 @interface UIView (SKInvalidation)

iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h

@@ -9,7 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <SonarKit/FlipperPlugin.h>
+#import <FlipperKit/FlipperPlugin.h>
 
 @interface SKBufferingPlugin : NSObject<FlipperPlugin>
 

iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.mm

@@ -10,7 +10,7 @@
 #import <vector>
 
 #import "SKBufferingPlugin.h"
-#import <SonarKit/FlipperConnection.h>
+#import <FlipperKit/FlipperConnection.h>
 #import "SKDispatchQueue.h"
 #import "SKBufferingPlugin+CPPInitialization.h"
 

iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h

@@ -8,7 +8,7 @@
 #if FB_SONARKIT_ENABLED
 #import <Foundation/Foundation.h>
 
-#import <SonarKit/FlipperPlugin.h>
+#import <FlipperKit/FlipperPlugin.h>
 
 #import "SKBufferingPlugin.h"
 #import "SKNetworkReporter.h"

iOS/Sample/AppDelegate.mm

@@ -7,7 +7,7 @@
  */
 #import "AppDelegate.h"
 
-#import <SonarKit/FlipperClient.h>
+#import <FlipperKit/FlipperClient.h>
 #import <SonarKitLayoutPlugin/SonarKitLayoutPlugin.h>
 #import <SonarKitNetworkPlugin/SonarKitNetworkPlugin.h>
 #import <SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h>

iOS/Sample/Podfile

@@ -4,9 +4,9 @@ source 'https://github.com/CocoaPods/Specs'
 swift_version = "4.1"
 
 target 'Sample' do
-  pod 'SonarKit', :path => '../../SonarKit.podspec'
+  pod 'FlipperKit', :path => '../../SonarKit.podspec'
-  pod 'SonarKit/SonarKitLayoutComponentKitSupport', :path => '../../SonarKit.podspec'
+  pod 'FlipperKit/SonarKitLayoutComponentKitSupport', :path => '../../SonarKit.podspec'
-  pod 'SonarKit/SKIOSNetworkPlugin', :path => '../../SonarKit.podspec'
+  pod 'FlipperKit/SKIOSNetworkPlugin', :path => '../../SonarKit.podspec'
   pod 'Sonar', :path => '../../Sonar.podspec'
   post_install do |installer|
 

iOS/Sample/Podfile.lock

@@ -5,6 +5,34 @@ PODS:
   - ComponentKit (0.23):
     - Yoga (~> 1.6)
   - DoubleConversion (1.1.5)
+  - FlipperKit (0.7.2):
+    - FlipperKit/Core (= 0.7.2)
+  - FlipperKit/Core (0.7.2):
+    - CocoaAsyncSocket (~> 7.6)
+    - 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)
+  - FlipperKit/SKIOSNetworkPlugin (0.7.2):
+    - FlipperKit/Core
+    - FlipperKit/SonarKitNetworkPlugin
+  - FlipperKit/SonarKitLayoutComponentKitSupport (0.7.2):
+    - ComponentKit
+    - FlipperKit/Core
+    - FlipperKit/SonarKitLayoutPlugin
+    - 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):
     - boost-for-react-native
     - CocoaLibEvent (~> 1.0)
@@ -19,43 +47,15 @@ PODS:
   - Sonar (0.7.2):
     - Folly (~> 1.1)
     - RSocket (~> 0.10)
-  - SonarKit (0.7.2):
-    - SonarKit/Core (= 0.7.2)
-  - SonarKit/Core (0.7.2):
-    - CocoaAsyncSocket (~> 7.6)
-    - Folly (~> 1.1)
-    - OpenSSL-Static (= 1.0.2.c1)
-    - PeerTalk (~> 0.0.2)
-    - Sonar (~> 0.7.2)
-    - SonarKit/CppBridge
-    - SonarKit/FBCxxUtils
-    - SonarKit/FBDefines
-  - SonarKit/CppBridge (0.7.2)
-  - SonarKit/FBCxxUtils (0.7.2)
-  - SonarKit/FBDefines (0.7.2)
-  - SonarKit/SKIOSNetworkPlugin (0.7.2):
-    - SonarKit/Core
-    - SonarKit/SonarKitNetworkPlugin
-  - SonarKit/SonarKitLayoutComponentKitSupport (0.7.2):
-    - ComponentKit
-    - SonarKit/Core
-    - SonarKit/SonarKitLayoutPlugin
-    - Yoga (~> 1.9)
-  - SonarKit/SonarKitLayoutPlugin (0.7.2):
-    - SonarKit/Core
-    - Yoga (~> 1.9)
-    - YogaKit (~> 1.8)
-  - SonarKit/SonarKitNetworkPlugin (0.7.2):
-    - SonarKit/Core
   - Yoga (1.9.0)
   - YogaKit (1.9.0):
     - Yoga (~> 1.9)
 
 DEPENDENCIES:
+  - FlipperKit (from `../../SonarKit.podspec`)
+  - FlipperKit/SKIOSNetworkPlugin (from `../../SonarKit.podspec`)
+  - FlipperKit/SonarKitLayoutComponentKitSupport (from `../../SonarKit.podspec`)
   - Sonar (from `../../Sonar.podspec`)
-  - SonarKit (from `../../SonarKit.podspec`)
-  - SonarKit/SKIOSNetworkPlugin (from `../../SonarKit.podspec`)
-  - SonarKit/SonarKitLayoutComponentKitSupport (from `../../SonarKit.podspec`)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -74,10 +74,10 @@ SPEC REPOS:
     - RSocket
 
 EXTERNAL SOURCES:
+  FlipperKit:
+    :path: "../../SonarKit.podspec"
   Sonar:
     :path: "../../Sonar.podspec"
-  SonarKit:
-    :path: "../../SonarKit.podspec"
 
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
@@ -85,16 +85,16 @@ SPEC CHECKSUMS:
   CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
   ComponentKit: bf8b4c4e7448bd15b3a8e5a71174ea7aa6cea98d
   DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c
+  FlipperKit: d8fb90df50d14c0022f5a931b93c437dfced0530
   Folly: dd92f69322d8535b9df98d7c91e442b0fce2fff2
   glog: 1de0bb937dccdc981596d3b5825ebfb765017ded
   OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e
   PeerTalk: 77481b0a8136f226b90ccf828d6061f70139ffde
   RSocket: 4fdb7e562db30a2d4fceddefdc601749ffc9ebe2
   Sonar: cfbef2d6119e92563d51bf3cdd9ae34f4eda068b
-  SonarKit: fe6e84d73807d07900d47020170290674d931de7
   Yoga: aaae8abea68951f60bee05f6277d3eed90bb91bb
   YogaKit: d447a9bb808718e6f58e52a2255a8050081a3ead
 
-PODFILE CHECKSUM: b1786f878ef1a53893b6a0f9d79d4987b72bc916
+PODFILE CHECKSUM: 2d236f86027b17bd45e744bcf9d2dd0302d93033
 
 COCOAPODS: 1.5.3

iOS/Sample/Sample.xcodeproj/project.pbxproj

@@ -362,7 +362,7 @@
 					"-l\"Folly\"",
 					"-l\"PeerTalk\"",
 					"-l\"Sonar\"",
-					"-l\"SonarKit\"",
+					"-l\"FlipperKit\"",
 					"-l\"Yoga\"",
 					"-l\"c++\"",
 					"-l\"glog\"",
@@ -426,7 +426,7 @@
 					"-l\"Folly\"",
 					"-l\"PeerTalk\"",
 					"-l\"Sonar\"",
-					"-l\"SonarKit\"",
+					"-l\"FlipperKit\"",
 					"-l\"Yoga\"",
 					"-l\"c++\"",
 					"-l\"glog\"",

iOS/SampleSwift/Podfile

@@ -4,8 +4,8 @@ source 'https://github.com/CocoaPods/Specs'
 swift_version = "4.1"
 
 target 'SampleSwift' do
-  pod 'SonarKit', :path => '../../SonarKit.podspec'
+  pod 'FlipperKit', :path => '../../SonarKit.podspec'
-  pod 'SonarKit/SKIOSNetworkPlugin', :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,6 +3,25 @@ PODS:
   - CocoaAsyncSocket (7.6.3)
   - CocoaLibEvent (1.0.0)
   - DoubleConversion (1.1.5)
+  - FlipperKit (0.7.2):
+    - FlipperKit/Core (= 0.7.2)
+  - FlipperKit/Core (0.7.2):
+    - CocoaAsyncSocket (~> 7.6)
+    - 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)
+  - FlipperKit/SKIOSNetworkPlugin (0.7.2):
+    - FlipperKit/Core
+    - FlipperKit/SonarKitNetworkPlugin
+  - FlipperKit/SonarKitNetworkPlugin (0.7.2):
+    - FlipperKit/Core
   - Folly (1.1.0):
     - boost-for-react-native
     - CocoaLibEvent (~> 1.0)
@@ -17,30 +36,11 @@ PODS:
   - Sonar (0.7.2):
     - Folly (~> 1.1)
     - RSocket (~> 0.10)
-  - SonarKit (0.7.2):
-    - SonarKit/Core (= 0.7.2)
-  - SonarKit/Core (0.7.2):
-    - CocoaAsyncSocket (~> 7.6)
-    - Folly (~> 1.1)
-    - OpenSSL-Static (= 1.0.2.c1)
-    - PeerTalk (~> 0.0.2)
-    - Sonar (~> 0.7.2)
-    - SonarKit/CppBridge
-    - SonarKit/FBCxxUtils
-    - SonarKit/FBDefines
-  - SonarKit/CppBridge (0.7.2)
-  - SonarKit/FBCxxUtils (0.7.2)
-  - SonarKit/FBDefines (0.7.2)
-  - SonarKit/SKIOSNetworkPlugin (0.7.2):
-    - SonarKit/Core
-    - SonarKit/SonarKitNetworkPlugin
-  - SonarKit/SonarKitNetworkPlugin (0.7.2):
-    - SonarKit/Core
 
 DEPENDENCIES:
+  - FlipperKit (from `../../SonarKit.podspec`)
+  - FlipperKit/SKIOSNetworkPlugin (from `../../SonarKit.podspec`)
   - Sonar (from `../../Sonar.podspec`)
-  - SonarKit (from `../../SonarKit.podspec`)
-  - SonarKit/SKIOSNetworkPlugin (from `../../SonarKit.podspec`)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -56,24 +56,24 @@ SPEC REPOS:
     - RSocket
 
 EXTERNAL SOURCES:
+  FlipperKit:
+    :path: "../../SonarKit.podspec"
   Sonar:
     :path: "../../Sonar.podspec"
-  SonarKit:
-    :path: "../../SonarKit.podspec"
 
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   CocoaAsyncSocket: eafaa68a7e0ec99ead0a7b35015e0bf25d2c8987
   CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
   DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c
+  FlipperKit: d8fb90df50d14c0022f5a931b93c437dfced0530
   Folly: dd92f69322d8535b9df98d7c91e442b0fce2fff2
   glog: 1de0bb937dccdc981596d3b5825ebfb765017ded
   OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e
   PeerTalk: 77481b0a8136f226b90ccf828d6061f70139ffde
   RSocket: 4fdb7e562db30a2d4fceddefdc601749ffc9ebe2
   Sonar: cfbef2d6119e92563d51bf3cdd9ae34f4eda068b
-  SonarKit: 34ede518cc5ebc9678acd0b09403674cab04a991
 
-PODFILE CHECKSUM: bfd82cb10666824db61b62e1ff7196e0b2305f0c
+PODFILE CHECKSUM: fc6b08aff1cbf448771fa3d9690714cef822d096
 
 COCOAPODS: 1.5.3

iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj

@@ -358,7 +358,7 @@
 					"-l\"PeerTalk\"",
 					"-l\"RSocket\"",
 					"-l\"Sonar\"",
-					"-l\"SonarKit\"",
+					"-l\"FlipperKit\"",
 					"-l\"crypto\"",
 					"-l\"event\"",
 					"-l\"event_core\"",
@@ -373,7 +373,7 @@
 					"\"Security\"",
 					"-DFB_SONARKIT_ENABLED=1",
 				);
-				OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -fmodule-map-file=\"${PODS_ROOT}/Headers/Public/SonarKit/SonarKit.modulemap\" -Xcc -DFB_SONARKIT_ENABLED";
+				OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -fmodule-map-file=\"${PODS_ROOT}/Headers/Public/FlipperKit/FlipperKit.modulemap\" -Xcc -DFB_SONARKIT_ENABLED";
 				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.flipper.SampleSwift;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -422,7 +422,7 @@
 					"-l\"PeerTalk\"",
 					"-l\"RSocket\"",
 					"-l\"Sonar\"",
-					"-l\"SonarKit\"",
+					"-l\"FlipperKit\"",
 					"-l\"crypto\"",
 					"-l\"event\"",
 					"-l\"event_core\"",
@@ -437,7 +437,7 @@
 					"\"Security\"",
 					"-DFB_SONARKIT_ENABLED=1",
 				);
-				OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -fmodule-map-file=\"${PODS_ROOT}/Headers/Public/SonarKit/SonarKit.modulemap\" -Xcc -DFB_SONARKIT_ENABLED";
+				OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -fmodule-map-file=\"${PODS_ROOT}/Headers/Public/FlipperKit/FlipperKit.modulemap\" -Xcc -DFB_SONARKIT_ENABLED";
 				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.flipper.SampleSwift;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 4.0;

iOS/SampleSwift/SampleSwift/AppDelegate.swift

@@ -1,7 +1,7 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
 import UIKit
-import SonarKit
+import FlipperKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {

iOS/SonarKit.podspec

@@ -3,7 +3,7 @@ yoga_version = '~> 1.9'
 yogakit_version = '~>1.8'
 sonarkit_version = '0.7.2'
 Pod::Spec.new do |spec|
-  spec.name = 'SonarKit'
+  spec.name = 'FlipperKit'
   spec.version = sonarkit_version
   spec.license = { :type => 'MIT' }
   spec.homepage = 'https://github.com/facebook/Sonar'
@@ -12,14 +12,14 @@ Pod::Spec.new do |spec|
   spec.static_framework = true
   spec.source = { :git => 'https://github.com/facebook/Sonar.git',
                   :tag=> "v"+sonarkit_version }
-  spec.module_name = 'SonarKit'
+  spec.module_name = 'FlipperKit'
   spec.platforms = { :ios => "8.4" }
   spec.default_subspecs = "Core"
 
   # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h>
   # inside SKMacros.h, which is a public header file. Defining this directory as a
   # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't
-  # generally (you would need to import <SonarKit/FBDefines/FBMacros.h>)
+  # generally (you would need to import <FlipperKit/t/FBDefines/FBMacros.h>)
   spec.subspec 'FBDefines' do |ss|
     ss.header_dir = 'FBDefines'
     ss.compiler_flags = folly_compiler_flags
@@ -30,33 +30,33 @@ Pod::Spec.new do |spec|
   spec.subspec 'CppBridge' do |ss|
     ss.header_dir = 'CppBridge'
     ss.compiler_flags = folly_compiler_flags
-    ss.source_files = 'iOS/SonarKit/CppBridge/**/*.{h,mm}'
+    ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}'
     # We set these files as private headers since they only need to be accessed
     # by other SonarKit source files
-    ss.private_header_files = 'iOS/SonarKit/CppBridge/**/*.h'
+    ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h'
-    ss.preserve_path = 'SonarKit/CppBridge/**/*.h'
+    ss.preserve_path = 'FlipperKit/CppBridge/**/*.h'
   end
 
   spec.subspec 'FBCxxUtils' do |ss|
     ss.header_dir = 'FBCxxUtils'
     ss.compiler_flags = folly_compiler_flags
-    ss.source_files = 'iOS/SonarKit/FBCxxUtils/**/*.{h,mm}'
+    ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}'
     # We set these files as private headers since they only need to be accessed
     # by other SonarKit source files
-    ss.private_header_files = 'iOS/SonarKit/FBCxxUtils/**/*.h'
+    ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h'
   end
 
   spec.subspec "Core" do |ss|
-    ss.dependency 'SonarKit/FBDefines'
+    ss.dependency 'FlipperKit/FBDefines'
-    ss.dependency 'SonarKit/FBCxxUtils'
+    ss.dependency 'FlipperKit/FBCxxUtils'
-    ss.dependency 'SonarKit/CppBridge'
+    ss.dependency 'FlipperKit/CppBridge'
     ss.dependency 'Folly', '~>1.1'
     ss.dependency 'Sonar', '~>'+sonarkit_version
     ss.dependency 'CocoaAsyncSocket', '~> 7.6'
     ss.dependency 'PeerTalk', '~>0.0.2'
     ss.dependency 'OpenSSL-Static', '1.0.2.c1'
     ss.compiler_flags = folly_compiler_flags
-    ss.source_files = 'iOS/SonarKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/SonarKit/CppBridge/*.{h,mm}', 'iOS/SonarKit/FBCxxUtils/*.{h,mm}', 'iOS/SonarKit/Utilities/**/*.{h,m}', 'iOS/SonarKit/*.{h,m,mm}'
+    ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/Utilities/**/*.{h,m}', 'iOS/FlipperKit/*.{h,m,mm}'
     ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h',
                              'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h',
                              'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKNetworkReporter.h',
@@ -64,8 +64,8 @@ Pod::Spec.new do |spec|
                              'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKResponseInfo.h',
                              'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h',
                              'iOS/FBDefines/FBMacros.h',
-                             'iOS/SonarKit/**/{FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,SonarResponder,SKMacros}.h'
+                             'iOS/FlipperKit/**/{FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,SonarResponder,SKMacros}.h'
-    header_search_paths = "\"$(PODS_ROOT)/SonarKit/iOS/SonarKit\" \"$(PODS_ROOT)\"/Headers/Private/SonarKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\""
+    header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\""
     ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
                              "DEFINES_MODULE" => "YES",
                              "HEADER_SEARCH_PATHS" => header_search_paths }
@@ -73,7 +73,7 @@ Pod::Spec.new do |spec|
 
   spec.subspec "SonarKitLayoutPlugin" do |ss|
     ss.header_dir = "SonarKitLayoutPlugin"
-    ss.dependency             'SonarKit/Core'
+    ss.dependency             'FlipperKit/Core'
     ss.dependency             'Yoga', yoga_version
     ss.dependency             'YogaKit', yogakit_version
     ss.compiler_flags       = folly_compiler_flags
@@ -95,23 +95,23 @@ Pod::Spec.new do |spec|
 
   spec.subspec "SonarKitLayoutComponentKitSupport" do |ss|
     ss.header_dir = "SonarKitLayoutComponentKitSupport"
-    ss.dependency             'SonarKit/Core'
+    ss.dependency             'FlipperKit/Core'
     ss.dependency             'Yoga', yoga_version
     ss.dependency             'ComponentKit'
-    ss.dependency             'SonarKit/SonarKitLayoutPlugin'
+    ss.dependency             'FlipperKit/SonarKitLayoutPlugin'
     ss.compiler_flags       = folly_compiler_flags
-    ss.dependency             'SonarKit/SonarKitLayoutPlugin'
+    ss.dependency             'FlipperKit/SonarKitLayoutPlugin'
     ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h',
                              'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h'
 
     ss.source_files         = "iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}"
     ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
-                                "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" }
+                                "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" }
   end
 
   spec.subspec "SonarKitNetworkPlugin" do |ss|
     ss.header_dir = "SonarKitNetworkPlugin"
-    ss.dependency             'SonarKit/Core'
+    ss.dependency             'FlipperKit/Core'
     ss.compiler_flags       = folly_compiler_flags
     ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h',
                              'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKNetworkReporter.h',
@@ -119,16 +119,16 @@ Pod::Spec.new do |spec|
                              'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKResponseInfo.h',
                              'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h'
     ss.source_files         = "iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/*.{h,cpp,m,mm}"
-    ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" }
+    ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" }
   end
 
   spec.subspec "SKIOSNetworkPlugin" do |ss|
     ss.header_dir = "SKIOSNetworkPlugin"
-    ss.dependency 'SonarKit/Core'
+    ss.dependency 'FlipperKit/Core'
-    ss.dependency 'SonarKit/SonarKitNetworkPlugin'
+    ss.dependency 'FlipperKit/SonarKitNetworkPlugin'
     ss.compiler_flags       = folly_compiler_flags
     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 = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" }
+    ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" }
   end
 end

iOS/SonarKitTestUtils/BlockBasedSonarPlugin.h

@@ -7,7 +7,7 @@
  */
 #import <Foundation/Foundation.h>
 
-#import <SonarKit/FlipperPlugin.h>
+#import <FlipperKit/FlipperPlugin.h>
 
 @protocol FlipperConnection;
 

iOS/SonarKitTestUtils/FlipperClient+Testing.h

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

iOS/SonarKitTestUtils/SonarConnectionMock.h

@@ -7,7 +7,7 @@
  */
 #import <Foundation/Foundation.h>
 
-#import <SonarKit/FlipperConnection.h>
+#import <FlipperKit/FlipperConnection.h>
 
 @interface SonarConnectionMock : NSObject<FlipperConnection>
 

iOS/SonarKitTestUtils/SonarResponderMock.h

@@ -7,7 +7,7 @@
  */
 #import <Foundation/Foundation.h>
 
-#import <SonarKit/SonarResponder.h>
+#import <FlipperKit/SonarResponder.h>
 
 @interface SonarResponderMock : NSObject<SonarResponder>
 

iOS/SonarKitTests/SonarCppBridgingTests.mm

@@ -9,8 +9,8 @@
 
 #if FB_SONARKIT_ENABLED
 
-#import <SonarKit/CppBridge/SonarCppWrapperPlugin.h>
+#import <FlipperKit/CppBridge/SonarCppWrapperPlugin.h>
-#import <SonarKit/FlipperPlugin.h>
+#import <FlipperKit/FlipperPlugin.h>
 
 using facebook::flipper::SonarCppWrapperPlugin;