jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename iOS SonarPlugin to FlipperPlugin

Browse Source 
Summary: Rename iOS SonarPlugin to FlipperPlugin

Reviewed By: jknoxville

Differential Revision: D9915094

fbshipit-source-id: ea2ca60ab578aca8c8f028e3deea4a3b9a48a63b
This commit is contained in:
Pritesh Nandgaonkar
2018-09-18 09:43:27 -07:00
committed by Facebook Github Bot
parent a488e34514
commit f970e60edd
13 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h
View File

@@ -9,13 +9,13 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <SonarKit/SonarPlugin.h> #import <SonarKit/FlipperPlugin.h>
#import "SKTapListener.h" #import "SKTapListener.h"
#import "SKInvalidation.h" #import "SKInvalidation.h"
#import "SKDescriptorMapper.h" #import "SKDescriptorMapper.h"
@interface SonarKitLayoutPlugin : NSObject<SonarPlugin, SKInvalidationDelegate> @interface SonarKitLayoutPlugin : NSObject<FlipperPlugin, SKInvalidationDelegate>
- (instancetype)initWithRootNode:(id<NSObject>)rootNode - (instancetype)initWithRootNode:(id<NSObject>)rootNode
withDescriptorMapper:(SKDescriptorMapper *)mapper; withDescriptorMapper:(SKDescriptorMapper *)mapper;

4
iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h
View File

@@ -9,9 +9,9 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <SonarKit/SonarPlugin.h> #import <SonarKit/FlipperPlugin.h>
@interface SKBufferingPlugin : NSObject<SonarPlugin> @interface SKBufferingPlugin : NSObject<FlipperPlugin>
- (instancetype)initWithQueue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER; - (instancetype)initWithQueue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER;

2
iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h
View File

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

28
iOS/Sample/Podfile.lock
View File

@@ -16,36 +16,36 @@ PODS:
- PeerTalk (0.0.2) - PeerTalk (0.0.2)
- RSocket (0.10.0): - RSocket (0.10.0):
- Folly - Folly
- Sonar (0.7.1): - Sonar (0.7.2):
- Folly (~> 1.1) - Folly (~> 1.1)
- RSocket (~> 0.10) - RSocket (~> 0.10)
- SonarKit (0.7.1): - SonarKit (0.7.2):
- SonarKit/Core (= 0.7.1) - SonarKit/Core (= 0.7.2)
- SonarKit/Core (0.7.1): - SonarKit/Core (0.7.2):
- CocoaAsyncSocket (~> 7.6) - CocoaAsyncSocket (~> 7.6)
- Folly (~> 1.1) - Folly (~> 1.1)
- OpenSSL-Static (= 1.0.2.c1) - OpenSSL-Static (= 1.0.2.c1)
- PeerTalk (~> 0.0.2) - PeerTalk (~> 0.0.2)
- Sonar (~> 0.7.1) - Sonar (~> 0.7.2)
- SonarKit/CppBridge - SonarKit/CppBridge
- SonarKit/FBCxxUtils - SonarKit/FBCxxUtils
- SonarKit/FBDefines - SonarKit/FBDefines
- SonarKit/CppBridge (0.7.1) - SonarKit/CppBridge (0.7.2)
- SonarKit/FBCxxUtils (0.7.1) - SonarKit/FBCxxUtils (0.7.2)
- SonarKit/FBDefines (0.7.1) - SonarKit/FBDefines (0.7.2)
- SonarKit/SKIOSNetworkPlugin (0.7.1): - SonarKit/SKIOSNetworkPlugin (0.7.2):
- SonarKit/Core - SonarKit/Core
- SonarKit/SonarKitNetworkPlugin - SonarKit/SonarKitNetworkPlugin
- SonarKit/SonarKitLayoutComponentKitSupport (0.7.1): - SonarKit/SonarKitLayoutComponentKitSupport (0.7.2):
- ComponentKit - ComponentKit
- SonarKit/Core - SonarKit/Core
- SonarKit/SonarKitLayoutPlugin - SonarKit/SonarKitLayoutPlugin
- Yoga (~> 1.9) - Yoga (~> 1.9)
- SonarKit/SonarKitLayoutPlugin (0.7.1): - SonarKit/SonarKitLayoutPlugin (0.7.2):
- SonarKit/Core - SonarKit/Core
- Yoga (~> 1.9) - Yoga (~> 1.9)
- YogaKit (~> 1.8) - YogaKit (~> 1.8)
- SonarKit/SonarKitNetworkPlugin (0.7.1): - SonarKit/SonarKitNetworkPlugin (0.7.2):
- SonarKit/Core - SonarKit/Core
- Yoga (1.9.0) - Yoga (1.9.0)
- YogaKit (1.9.0): - YogaKit (1.9.0):
@@ -90,8 +90,8 @@ SPEC CHECKSUMS:
OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e
PeerTalk: 77481b0a8136f226b90ccf828d6061f70139ffde PeerTalk: 77481b0a8136f226b90ccf828d6061f70139ffde
RSocket: 4fdb7e562db30a2d4fceddefdc601749ffc9ebe2 RSocket: 4fdb7e562db30a2d4fceddefdc601749ffc9ebe2
Sonar: 63e5e5d1f217b691a528b68bb88ddc545dc808d5 Sonar: cfbef2d6119e92563d51bf3cdd9ae34f4eda068b
SonarKit: f457030ca47e09e714a7eadd64c9d0837c6a6b52 SonarKit: 34ede518cc5ebc9678acd0b09403674cab04a991
Yoga: aaae8abea68951f60bee05f6277d3eed90bb91bb Yoga: aaae8abea68951f60bee05f6277d3eed90bb91bb
YogaKit: d447a9bb808718e6f58e52a2255a8050081a3ead YogaKit: d447a9bb808718e6f58e52a2255a8050081a3ead

26
iOS/SampleSwift/Podfile.lock
View File

@@ -14,27 +14,27 @@ PODS:
- PeerTalk (0.0.2) - PeerTalk (0.0.2)
- RSocket (0.10.0): - RSocket (0.10.0):
- Folly - Folly
- Sonar (0.6.16): - Sonar (0.7.2):
- Folly (~> 1.1) - Folly (~> 1.1)
- RSocket (~> 0.10) - RSocket (~> 0.10)
- SonarKit (0.6.16): - SonarKit (0.7.2):
- SonarKit/Core (= 0.6.16) - SonarKit/Core (= 0.7.2)
- SonarKit/Core (0.6.16): - SonarKit/Core (0.7.2):
- CocoaAsyncSocket (~> 7.6) - CocoaAsyncSocket (~> 7.6)
- Folly (~> 1.1) - Folly (~> 1.1)
- OpenSSL-Static (= 1.0.2.c1) - OpenSSL-Static (= 1.0.2.c1)
- PeerTalk (~> 0.0.2) - PeerTalk (~> 0.0.2)
- Sonar (~> 0.6.16) - Sonar (~> 0.7.2)
- SonarKit/CppBridge - SonarKit/CppBridge
- SonarKit/FBCxxUtils - SonarKit/FBCxxUtils
- SonarKit/FBDefines - SonarKit/FBDefines
- SonarKit/CppBridge (0.6.16) - SonarKit/CppBridge (0.7.2)
- SonarKit/FBCxxUtils (0.6.16) - SonarKit/FBCxxUtils (0.7.2)
- SonarKit/FBDefines (0.6.16) - SonarKit/FBDefines (0.7.2)
- SonarKit/SKIOSNetworkPlugin (0.6.16): - SonarKit/SKIOSNetworkPlugin (0.7.2):
- SonarKit/Core - SonarKit/Core
- SonarKit/SonarKitNetworkPlugin - SonarKit/SonarKitNetworkPlugin
- SonarKit/SonarKitNetworkPlugin (0.6.16): - SonarKit/SonarKitNetworkPlugin (0.7.2):
- SonarKit/Core - SonarKit/Core
DEPENDENCIES: DEPENDENCIES:
@@ -71,9 +71,9 @@ SPEC CHECKSUMS:
OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e
PeerTalk: 77481b0a8136f226b90ccf828d6061f70139ffde PeerTalk: 77481b0a8136f226b90ccf828d6061f70139ffde
RSocket: 4fdb7e562db30a2d4fceddefdc601749ffc9ebe2 RSocket: 4fdb7e562db30a2d4fceddefdc601749ffc9ebe2
Sonar: 74d1e3a853f1453511108ac1b3e7469a2b2ade92 Sonar: cfbef2d6119e92563d51bf3cdd9ae34f4eda068b
SonarKit: 99c7f51f670c6203c225f509ca5b6f85c6ce734a SonarKit: 34ede518cc5ebc9678acd0b09403674cab04a991
PODFILE CHECKSUM: bfd82cb10666824db61b62e1ff7196e0b2305f0c PODFILE CHECKSUM: bfd82cb10666824db61b62e1ff7196e0b2305f0c
COCOAPODS: 1.5.2 COCOAPODS: 1.5.3

2
iOS/SonarKit.podspec
View File

@@ -64,7 +64,7 @@ Pod::Spec.new do |spec|
'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKResponseInfo.h', 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKResponseInfo.h',
'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h', 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h',
'iOS/FBDefines/FBMacros.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\"" 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", ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
"DEFINES_MODULE" => "YES", "DEFINES_MODULE" => "YES",

4
iOS/SonarKit/CppBridge/SonarCppWrapperPlugin.h
View File

@@ -11,12 +11,12 @@
#import <Sonar/SonarPlugin.h> #import <Sonar/SonarPlugin.h>
#import <SonarKit/CppBridge/SonarCppBridgingConnection.h> #import <SonarKit/CppBridge/SonarCppBridgingConnection.h>
#import <SonarKit/SonarPlugin.h> #import <SonarKit/FlipperPlugin.h>
namespace facebook { namespace facebook {
namespace flipper { namespace flipper {
using ObjCPlugin = NSObject<SonarPlugin> *; using ObjCPlugin = NSObject<FlipperPlugin> *;
/** /**
SonarCppWrapperPlugin is a simple C++ wrapper around Objective-C Sonar plugins SonarCppWrapperPlugin is a simple C++ wrapper around Objective-C Sonar plugins

8
iOS/SonarKit/FlipperClient.h
View File

@@ -8,7 +8,7 @@
#ifdef FB_SONARKIT_ENABLED #ifdef FB_SONARKIT_ENABLED
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "SonarPlugin.h" #import "FlipperPlugin.h"
#import "FlipperStateUpdateListener.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. Register a plugin with the client.
*/ */
- (void)addPlugin:(NSObject<SonarPlugin> *)plugin; - (void)addPlugin:(NSObject<FlipperPlugin> *)plugin;
/** /**
Unregister a plugin with the client. Unregister a plugin with the client.
*/ */
- (void)removePlugin:(NSObject<SonarPlugin> *)plugin; - (void)removePlugin:(NSObject<FlipperPlugin> *)plugin;
/** /**
Retrieve the plugin with a given identifier which was previously registered with this client. Retrieve the plugin with a given identifier which was previously registered with this client.
*/ */
- (NSObject<SonarPlugin> *)pluginWithIdentifier:(NSString *)identifier; - (NSObject<FlipperPlugin> *)pluginWithIdentifier:(NSString *)identifier;
/** /**
Establish a connection to the Sonar desktop. Establish a connection to the Sonar desktop.

6
iOS/SonarKit/FlipperClient.mm
View File

@@ -84,17 +84,17 @@ using WrapperPlugin = facebook::flipper::SonarCppWrapperPlugin;
_cppClient->refreshPlugins(); _cppClient->refreshPlugins();
} }
- (void)addPlugin:(NSObject<SonarPlugin> *)plugin - (void)addPlugin:(NSObject<FlipperPlugin> *)plugin
{ {
_cppClient->addPlugin(std::make_shared<WrapperPlugin>(plugin)); _cppClient->addPlugin(std::make_shared<WrapperPlugin>(plugin));
} }
- (void)removePlugin:(NSObject<SonarPlugin> *)plugin - (void)removePlugin:(NSObject<FlipperPlugin> *)plugin
{ {
_cppClient->removePlugin(std::make_shared<WrapperPlugin>(plugin)); _cppClient->removePlugin(std::make_shared<WrapperPlugin>(plugin));
} }
- (NSObject<SonarPlugin> *)pluginWithIdentifier:(NSString *)identifier - (NSObject<FlipperPlugin> *)pluginWithIdentifier:(NSString *)identifier
{ {
auto cppPlugin = _cppClient->getPlugin([identifier UTF8String]); auto cppPlugin = _cppClient->getPlugin([identifier UTF8String]);
if (auto wrapper = dynamic_cast<WrapperPlugin *>(cppPlugin.get())) { if (auto wrapper = dynamic_cast<WrapperPlugin *>(cppPlugin.get())) {

2
iOS/SonarKit/SonarPlugin.h → iOS/SonarKit/FlipperPlugin.h
View File

@@ -15,7 +15,7 @@ SK_EXTERN_C_END
@protocol SonarConnection; @protocol SonarConnection;
@protocol SonarPlugin @protocol FlipperPlugin
/** /**
The plugin's identifier. This should map to a javascript plugin with the same identifier to ensure The plugin's identifier. This should map to a javascript plugin with the same identifier to ensure

2
iOS/SonarKit/SonarUtil.m
View File

@@ -6,7 +6,7 @@
* *
*/ */
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "SonarPlugin.h" #import "FlipperPlugin.h"
void SonarPerformBlockOnMainThread(void(^block)()) void SonarPerformBlockOnMainThread(void(^block)())
{ {

4
iOS/SonarKitTestUtils/BlockBasedSonarPlugin.h
View File

@@ -7,14 +7,14 @@
*/ */
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <SonarKit/SonarPlugin.h> #import <SonarKit/FlipperPlugin.h>
@protocol SonarConnection; @protocol SonarConnection;
typedef void (^ConnectBlock)(id<SonarConnection>); typedef void (^ConnectBlock)(id<SonarConnection>);
typedef void (^DisconnectBlock)(); typedef void (^DisconnectBlock)();
@interface BlockBasedSonarPlugin : NSObject<SonarPlugin> @interface BlockBasedSonarPlugin : NSObject<FlipperPlugin>
- (instancetype)initIdentifier:(NSString *)identifier connect:(ConnectBlock)connect disconnect:(DisconnectBlock)disconnect; - (instancetype)initIdentifier:(NSString *)identifier connect:(ConnectBlock)connect disconnect:(DisconnectBlock)disconnect;

6
iOS/SonarKitTests/SonarCppBridgingTests.mm
View File

@@ -10,11 +10,11 @@
#if FB_SONARKIT_ENABLED #if FB_SONARKIT_ENABLED
#import <SonarKit/CppBridge/SonarCppWrapperPlugin.h> #import <SonarKit/CppBridge/SonarCppWrapperPlugin.h>
#import <SonarKit/SonarPlugin.h> #import <SonarKit/FlipperPlugin.h>
using facebook::flipper::SonarCppWrapperPlugin; using facebook::flipper::SonarCppWrapperPlugin;
@interface DummyPlugin : NSObject <SonarPlugin> @interface DummyPlugin : NSObject <FlipperPlugin>
@end @end
@implementation DummyPlugin @implementation DummyPlugin
@@ -29,7 +29,7 @@ using facebook::flipper::SonarCppWrapperPlugin;
@implementation SonarCppBridgingTests @implementation SonarCppBridgingTests
- (void)testCppWrapperRetainsObjCPlugin { - (void)testCppWrapperRetainsObjCPlugin {
NSObject<SonarPlugin> *dummyPlugin = [DummyPlugin new]; NSObject<FlipperPlugin> *dummyPlugin = [DummyPlugin new];
auto retainCountBefore = CFGetRetainCount((void *)dummyPlugin); auto retainCountBefore = CFGetRetainCount((void *)dummyPlugin);
SonarCppWrapperPlugin wrapperPlugin(dummyPlugin); SonarCppWrapperPlugin wrapperPlugin(dummyPlugin);
auto retainCountAfter = CFGetRetainCount((void *)dummyPlugin); auto retainCountAfter = CFGetRetainCount((void *)dummyPlugin);