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

Rename all The c++ JNI classes

Browse Source 
Summary: Pull Request resolved: https://github.com/facebook/flipper/pull/272

Reviewed By: passy

Differential Revision: D9861432

Pulled By: jknoxville

fbshipit-source-id: 523b8fc28541b922bbcc0939514f4ddd0a3fc1b0
This commit is contained in:
John Knox
2018-09-18 07:16:56 -07:00
committed by Facebook Github Bot
parent a480be90a2
commit 9d9fa17134
14 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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/SonarKitNetworkPlugin.h',
'iOS/FBDefines/FBMacros.h',
'iOS/SonarKit/**/{FlipperStateUpdateListener,SonarClient,SonarPlugin,SonarConnection,SonarResponder,SKMacros}.h'
'iOS/SonarKit/**/{FlipperStateUpdateListener,SonarClient,SonarPlugin,SonarConnection,FlipperResponder,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",

8
iOS/SonarKit.xcodeproj/project.pbxproj
View File

@@ -100,7 +100,7 @@
53D4C50A20A5B72800613A96 /* SonarClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 53D19A1120A4BAB900A371E3 /* SonarClient.h */; };
53D4C50B20A5B72800613A96 /* SonarConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 53D19A1820A4BAB900A371E3 /* SonarConnection.h */; };
53D4C50C20A5B72800613A96 /* SonarPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 53D19A1620A4BAB900A371E3 /* SonarPlugin.h */; };
53D4C50D20A5B72800613A96 /* SonarResponder.h in Headers */ = {isa = PBXBuildFile; fileRef = 53D19A1320A4BAB900A371E3 /* SonarResponder.h */; };
53D4C50D20A5B72800613A96 /* FlipperResponder.h in Headers */ = {isa = PBXBuildFile; fileRef = 53D19A1320A4BAB900A371E3 /* FlipperResponder.h */; };
53D4C50F20A5B72800613A96 /* SKPortForwardingServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 53D19A1B20A4BABA00A371E3 /* SKPortForwardingServer.h */; };
53D4C51020A5B72800613A96 /* SKPortForwardingCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 53D19A1C20A4BABA00A371E3 /* SKPortForwardingCommon.h */; };
53D4C51220A5B89900613A96 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53D4C51120A5B89900613A96 /* Foundation.framework */; };
@@ -195,7 +195,7 @@
53D19A1020A4BAB900A371E3 /* SKMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKMacros.h; sourceTree = "<group>"; };
53D19A1120A4BAB900A371E3 /* SonarClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SonarClient.h; sourceTree = "<group>"; };
53D19A1220A4BAB900A371E3 /* SonarClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SonarClient.mm; sourceTree = "<group>"; };
53D19A1320A4BAB900A371E3 /* SonarResponder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SonarResponder.h; sourceTree = "<group>"; };
53D19A1320A4BAB900A371E3 /* FlipperResponder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlipperResponder.h; sourceTree = "<group>"; };
53D19A1420A4BAB900A371E3 /* SonarUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SonarUtil.m; sourceTree = "<group>"; };
53D19A1620A4BAB900A371E3 /* SonarPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SonarPlugin.h; sourceTree = "<group>"; };
53D19A1820A4BAB900A371E3 /* SonarConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SonarConnection.h; sourceTree = "<group>"; };
@@ -427,7 +427,7 @@
53D19A1220A4BAB900A371E3 /* SonarClient.mm */,
53D19A1820A4BAB900A371E3 /* SonarConnection.h */,
53D19A1620A4BAB900A371E3 /* SonarPlugin.h */,
53D19A1320A4BAB900A371E3 /* SonarResponder.h */,
53D19A1320A4BAB900A371E3 /* FlipperResponder.h */,
53D19A1420A4BAB900A371E3 /* SonarUtil.m */,
53D19A1920A4BABA00A371E3 /* Utilities */,
53D19A0920A4BA3600A371E3 /* Info.plist */,
@@ -504,7 +504,7 @@
537A854221123223004A52BB /* SKSwizzle.h in Headers */,
537A853321123223004A52BB /* SKComponentHostingViewDescriptor.h in Headers */,
537A853221123223004A52BB /* SonarKitLayoutComponentKitSupport.h in Headers */,
53D4C50D20A5B72800613A96 /* SonarResponder.h in Headers */,
53D4C50D20A5B72800613A96 /* FlipperResponder.h in Headers */,
537A853D21123223004A52BB /* SKHighlightOverlay.h in Headers */,
537A854C21123223004A52BB /* SonarKitLayoutPlugin.h in Headers */,
537A850E21123223004A52BB /* SonarKitNetworkPlugin.h in Headers */,

2
iOS/SonarKit/CppBridge/SonarCppBridgingConnection.mm
View File

@@ -34,7 +34,7 @@
- (void)receive:(NSString *)method withBlock:(SonarReceiver)receiver
{
const auto lambda = [receiver](const folly::dynamic &message,
std::unique_ptr<facebook::flipper::SonarResponder> responder) {
std::unique_ptr<facebook::flipper::FlipperResponder> responder) {
@autoreleasepool {
SonarCppBridgingResponder *const objCResponder =
[[SonarCppBridgingResponder alloc] initWithCppResponder:std::move(responder)];

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

@@ -5,7 +5,7 @@
* file in the root directory of this source tree.
*
*/
#import <Sonar/SonarResponder.h>
#import <Sonar/FlipperResponder.h>
#import <SonarKit/SonarResponder.h>
/**
@@ -14,5 +14,5 @@ that forwards messages to the underlying C++ responder. This class allows
pure Objective-C plugins to send messages to the underlying responder.
*/
@interface SonarCppBridgingResponder : NSObject <SonarResponder>
- (instancetype)initWithCppResponder:(std::unique_ptr<facebook::flipper::SonarResponder>)responder;
- (instancetype)initWithCppResponder:(std::unique_ptr<facebook::flipper::FlipperResponder>)responder;
@end

4
iOS/SonarKit/CppBridge/SonarCppBridgingResponder.mm
View File

@@ -10,10 +10,10 @@
#import <FBCxxUtils/FBCxxFollyDynamicConvert.h>
@implementation SonarCppBridgingResponder {
std::unique_ptr<facebook::flipper::SonarResponder> responder_;
std::unique_ptr<facebook::flipper::FlipperResponder> responder_;
}
- (instancetype)initWithCppResponder:(std::unique_ptr<facebook::flipper::SonarResponder>)responder
- (instancetype)initWithCppResponder:(std::unique_ptr<facebook::flipper::FlipperResponder>)responder
{
if (!responder) {
return nil;