From f970e60edd8a36a100090c7d6a9eb28e50fefcb8 Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Tue, 18 Sep 2018 09:43:27 -0700 Subject: [PATCH] Rename iOS SonarPlugin to FlipperPlugin Summary: Rename iOS SonarPlugin to FlipperPlugin Reviewed By: jknoxville Differential Revision: D9915094 fbshipit-source-id: ea2ca60ab578aca8c8f028e3deea4a3b9a48a63b --- .../SonarKitLayoutPlugin.h | 4 +-- .../SonarKitNetworkPlugin/SKBufferingPlugin.h | 4 +-- .../SonarKitNetworkPlugin.h | 2 +- iOS/Sample/Podfile.lock | 28 +++++++++---------- iOS/SampleSwift/Podfile.lock | 26 ++++++++--------- iOS/SonarKit.podspec | 2 +- .../CppBridge/SonarCppWrapperPlugin.h | 4 +-- iOS/SonarKit/FlipperClient.h | 8 +++--- iOS/SonarKit/FlipperClient.mm | 6 ++-- .../{SonarPlugin.h => FlipperPlugin.h} | 2 +- iOS/SonarKit/SonarUtil.m | 2 +- iOS/SonarKitTestUtils/BlockBasedSonarPlugin.h | 4 +-- iOS/SonarKitTests/SonarCppBridgingTests.mm | 6 ++-- 13 files changed, 49 insertions(+), 49 deletions(-) rename iOS/SonarKit/{SonarPlugin.h => FlipperPlugin.h} (97%) diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h b/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h index db1e31777..83592d0a2 100644 --- a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h +++ b/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h @@ -9,13 +9,13 @@ #import -#import +#import #import "SKTapListener.h" #import "SKInvalidation.h" #import "SKDescriptorMapper.h" -@interface SonarKitLayoutPlugin : NSObject +@interface SonarKitLayoutPlugin : NSObject - (instancetype)initWithRootNode:(id)rootNode withDescriptorMapper:(SKDescriptorMapper *)mapper; diff --git a/iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h b/iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h index 99dc666b1..4c9df3a8a 100644 --- a/iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h +++ b/iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h @@ -9,9 +9,9 @@ #import -#import +#import -@interface SKBufferingPlugin : NSObject +@interface SKBufferingPlugin : NSObject - (instancetype)initWithQueue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER; diff --git a/iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h b/iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h index a367b3a65..d62e998d1 100644 --- a/iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h +++ b/iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h @@ -8,7 +8,7 @@ #if FB_SONARKIT_ENABLED #import -#import +#import #import "SKBufferingPlugin.h" #import "SKNetworkReporter.h" diff --git a/iOS/Sample/Podfile.lock b/iOS/Sample/Podfile.lock index 6588edb08..f2aaf5322 100644 --- a/iOS/Sample/Podfile.lock +++ b/iOS/Sample/Podfile.lock @@ -16,36 +16,36 @@ PODS: - PeerTalk (0.0.2) - RSocket (0.10.0): - Folly - - Sonar (0.7.1): + - Sonar (0.7.2): - Folly (~> 1.1) - RSocket (~> 0.10) - - SonarKit (0.7.1): - - SonarKit/Core (= 0.7.1) - - SonarKit/Core (0.7.1): + - 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.1) + - Sonar (~> 0.7.2) - SonarKit/CppBridge - SonarKit/FBCxxUtils - SonarKit/FBDefines - - SonarKit/CppBridge (0.7.1) - - SonarKit/FBCxxUtils (0.7.1) - - SonarKit/FBDefines (0.7.1) - - SonarKit/SKIOSNetworkPlugin (0.7.1): + - 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.1): + - SonarKit/SonarKitLayoutComponentKitSupport (0.7.2): - ComponentKit - SonarKit/Core - SonarKit/SonarKitLayoutPlugin - Yoga (~> 1.9) - - SonarKit/SonarKitLayoutPlugin (0.7.1): + - SonarKit/SonarKitLayoutPlugin (0.7.2): - SonarKit/Core - Yoga (~> 1.9) - YogaKit (~> 1.8) - - SonarKit/SonarKitNetworkPlugin (0.7.1): + - SonarKit/SonarKitNetworkPlugin (0.7.2): - SonarKit/Core - Yoga (1.9.0) - YogaKit (1.9.0): @@ -90,8 +90,8 @@ SPEC CHECKSUMS: OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e PeerTalk: 77481b0a8136f226b90ccf828d6061f70139ffde RSocket: 4fdb7e562db30a2d4fceddefdc601749ffc9ebe2 - Sonar: 63e5e5d1f217b691a528b68bb88ddc545dc808d5 - SonarKit: f457030ca47e09e714a7eadd64c9d0837c6a6b52 + Sonar: cfbef2d6119e92563d51bf3cdd9ae34f4eda068b + SonarKit: 34ede518cc5ebc9678acd0b09403674cab04a991 Yoga: aaae8abea68951f60bee05f6277d3eed90bb91bb YogaKit: d447a9bb808718e6f58e52a2255a8050081a3ead diff --git a/iOS/SampleSwift/Podfile.lock b/iOS/SampleSwift/Podfile.lock index df9f10b4e..30e630572 100644 --- a/iOS/SampleSwift/Podfile.lock +++ b/iOS/SampleSwift/Podfile.lock @@ -14,27 +14,27 @@ PODS: - PeerTalk (0.0.2) - RSocket (0.10.0): - Folly - - Sonar (0.6.16): + - Sonar (0.7.2): - Folly (~> 1.1) - RSocket (~> 0.10) - - SonarKit (0.6.16): - - SonarKit/Core (= 0.6.16) - - SonarKit/Core (0.6.16): + - 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.6.16) + - Sonar (~> 0.7.2) - SonarKit/CppBridge - SonarKit/FBCxxUtils - SonarKit/FBDefines - - SonarKit/CppBridge (0.6.16) - - SonarKit/FBCxxUtils (0.6.16) - - SonarKit/FBDefines (0.6.16) - - SonarKit/SKIOSNetworkPlugin (0.6.16): + - 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.6.16): + - SonarKit/SonarKitNetworkPlugin (0.7.2): - SonarKit/Core DEPENDENCIES: @@ -71,9 +71,9 @@ SPEC CHECKSUMS: OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e PeerTalk: 77481b0a8136f226b90ccf828d6061f70139ffde RSocket: 4fdb7e562db30a2d4fceddefdc601749ffc9ebe2 - Sonar: 74d1e3a853f1453511108ac1b3e7469a2b2ade92 - SonarKit: 99c7f51f670c6203c225f509ca5b6f85c6ce734a + Sonar: cfbef2d6119e92563d51bf3cdd9ae34f4eda068b + SonarKit: 34ede518cc5ebc9678acd0b09403674cab04a991 PODFILE CHECKSUM: bfd82cb10666824db61b62e1ff7196e0b2305f0c -COCOAPODS: 1.5.2 +COCOAPODS: 1.5.3 diff --git a/iOS/SonarKit.podspec b/iOS/SonarKit.podspec index 90984291e..305fa3845 100644 --- a/iOS/SonarKit.podspec +++ b/iOS/SonarKit.podspec @@ -64,7 +64,7 @@ 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,SonarPlugin,SonarConnection,SonarResponder,SKMacros}.h' + 'iOS/SonarKit/**/{FlipperStateUpdateListener,FlipperClient,FlipperPlugin,SonarConnection,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\"" ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", "DEFINES_MODULE" => "YES", diff --git a/iOS/SonarKit/CppBridge/SonarCppWrapperPlugin.h b/iOS/SonarKit/CppBridge/SonarCppWrapperPlugin.h index e8f8cde91..12c5b7b06 100644 --- a/iOS/SonarKit/CppBridge/SonarCppWrapperPlugin.h +++ b/iOS/SonarKit/CppBridge/SonarCppWrapperPlugin.h @@ -11,12 +11,12 @@ #import #import -#import +#import namespace facebook { namespace flipper { -using ObjCPlugin = NSObject *; +using ObjCPlugin = NSObject *; /** SonarCppWrapperPlugin is a simple C++ wrapper around Objective-C Sonar plugins diff --git a/iOS/SonarKit/FlipperClient.h b/iOS/SonarKit/FlipperClient.h index 8fe030053..23b6dd858 100644 --- a/iOS/SonarKit/FlipperClient.h +++ b/iOS/SonarKit/FlipperClient.h @@ -8,7 +8,7 @@ #ifdef FB_SONARKIT_ENABLED #import -#import "SonarPlugin.h" +#import "FlipperPlugin.h" #import "FlipperStateUpdateListener.h" /** @@ -25,17 +25,17 @@ The shared singleton FlipperClient instance. It is an error to call this on non- /** Register a plugin with the client. */ -- (void)addPlugin:(NSObject *)plugin; +- (void)addPlugin:(NSObject *)plugin; /** Unregister a plugin with the client. */ -- (void)removePlugin:(NSObject *)plugin; +- (void)removePlugin:(NSObject *)plugin; /** Retrieve the plugin with a given identifier which was previously registered with this client. */ -- (NSObject *)pluginWithIdentifier:(NSString *)identifier; +- (NSObject *)pluginWithIdentifier:(NSString *)identifier; /** Establish a connection to the Sonar desktop. diff --git a/iOS/SonarKit/FlipperClient.mm b/iOS/SonarKit/FlipperClient.mm index 703ee39dd..e072f954f 100644 --- a/iOS/SonarKit/FlipperClient.mm +++ b/iOS/SonarKit/FlipperClient.mm @@ -84,17 +84,17 @@ using WrapperPlugin = facebook::flipper::SonarCppWrapperPlugin; _cppClient->refreshPlugins(); } -- (void)addPlugin:(NSObject *)plugin +- (void)addPlugin:(NSObject *)plugin { _cppClient->addPlugin(std::make_shared(plugin)); } -- (void)removePlugin:(NSObject *)plugin +- (void)removePlugin:(NSObject *)plugin { _cppClient->removePlugin(std::make_shared(plugin)); } -- (NSObject *)pluginWithIdentifier:(NSString *)identifier +- (NSObject *)pluginWithIdentifier:(NSString *)identifier { auto cppPlugin = _cppClient->getPlugin([identifier UTF8String]); if (auto wrapper = dynamic_cast(cppPlugin.get())) { diff --git a/iOS/SonarKit/SonarPlugin.h b/iOS/SonarKit/FlipperPlugin.h similarity index 97% rename from iOS/SonarKit/SonarPlugin.h rename to iOS/SonarKit/FlipperPlugin.h index b82092f41..f118a3fa3 100644 --- a/iOS/SonarKit/SonarPlugin.h +++ b/iOS/SonarKit/FlipperPlugin.h @@ -15,7 +15,7 @@ SK_EXTERN_C_END @protocol SonarConnection; -@protocol SonarPlugin +@protocol FlipperPlugin /** The plugin's identifier. This should map to a javascript plugin with the same identifier to ensure diff --git a/iOS/SonarKit/SonarUtil.m b/iOS/SonarKit/SonarUtil.m index 73234e41a..9517e7c3b 100644 --- a/iOS/SonarKit/SonarUtil.m +++ b/iOS/SonarKit/SonarUtil.m @@ -6,7 +6,7 @@ * */ #import -#import "SonarPlugin.h" +#import "FlipperPlugin.h" void SonarPerformBlockOnMainThread(void(^block)()) { diff --git a/iOS/SonarKitTestUtils/BlockBasedSonarPlugin.h b/iOS/SonarKitTestUtils/BlockBasedSonarPlugin.h index 1810560a1..f5000965c 100644 --- a/iOS/SonarKitTestUtils/BlockBasedSonarPlugin.h +++ b/iOS/SonarKitTestUtils/BlockBasedSonarPlugin.h @@ -7,14 +7,14 @@ */ #import -#import +#import @protocol SonarConnection; typedef void (^ConnectBlock)(id); typedef void (^DisconnectBlock)(); -@interface BlockBasedSonarPlugin : NSObject +@interface BlockBasedSonarPlugin : NSObject - (instancetype)initIdentifier:(NSString *)identifier connect:(ConnectBlock)connect disconnect:(DisconnectBlock)disconnect; diff --git a/iOS/SonarKitTests/SonarCppBridgingTests.mm b/iOS/SonarKitTests/SonarCppBridgingTests.mm index 02052878d..645961a2b 100644 --- a/iOS/SonarKitTests/SonarCppBridgingTests.mm +++ b/iOS/SonarKitTests/SonarCppBridgingTests.mm @@ -10,11 +10,11 @@ #if FB_SONARKIT_ENABLED #import -#import +#import using facebook::flipper::SonarCppWrapperPlugin; -@interface DummyPlugin : NSObject +@interface DummyPlugin : NSObject @end @implementation DummyPlugin @@ -29,7 +29,7 @@ using facebook::flipper::SonarCppWrapperPlugin; @implementation SonarCppBridgingTests - (void)testCppWrapperRetainsObjCPlugin { - NSObject *dummyPlugin = [DummyPlugin new]; + NSObject *dummyPlugin = [DummyPlugin new]; auto retainCountBefore = CFGetRetainCount((void *)dummyPlugin); SonarCppWrapperPlugin wrapperPlugin(dummyPlugin); auto retainCountAfter = CFGetRetainCount((void *)dummyPlugin);