From ba7b43a5472dbee89cd9d7139d1dc1488e69f17c Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Thu, 20 Sep 2018 04:27:10 -0700 Subject: [PATCH] Rename SonarKitLayoutPlugin to FlipperKitLayoutPlugin Summary: Renames SonarKitLayoutPlugin to FlipperKitLayoutPlugin Reviewed By: passy Differential Revision: D9949785 fbshipit-source-id: 8cfde4dfad3e34038d2f66f0ce4393db9d83ef60 --- docs/layout-plugin.md | 2 +- .../FlipperKitLayoutPlugin.h} | 2 +- .../FlipperKitLayoutPlugin.mm} | 8 ++-- .../SKDescriptorMapper.h | 0 .../SKDescriptorMapper.mm | 0 .../SKHighlightOverlay.h | 0 .../SKHighlightOverlay.m | 0 .../FlipperKitLayoutPlugin}/SKInvalidation.h | 0 .../FlipperKitLayoutPlugin}/SKInvalidation.m | 0 .../FlipperKitLayoutPlugin}/SKNamed.h | 0 .../FlipperKitLayoutPlugin}/SKNamed.mm | 0 .../SKNodeDescriptor.h | 0 .../SKNodeDescriptor.mm | 0 .../FlipperKitLayoutPlugin}/SKObject.h | 0 .../FlipperKitLayoutPlugin}/SKObject.mm | 0 .../SKSearchResultNode.h | 0 .../SKSearchResultNode.m | 0 .../FlipperKitLayoutPlugin}/SKTapListener.h | 0 .../SKTapListenerImpl.h | 0 .../SKTapListenerImpl.m | 0 .../FlipperKitLayoutPlugin}/SKTouch.h | 0 .../FlipperKitLayoutPlugin}/SKTouch.m | 0 .../UICollectionView+SKInvalidation.h | 0 .../UICollectionView+SKInvalidation.mm | 0 .../UIColor+SKSonarValueCoder.h | 0 .../UIColor+SKSonarValueCoder.mm | 0 .../UIView+SKInvalidation.h | 0 .../UIView+SKInvalidation.mm | 0 .../descriptors/SKApplicationDescriptor.h | 0 .../descriptors/SKApplicationDescriptor.m | 0 .../descriptors/SKButtonDescriptor.h | 0 .../descriptors/SKButtonDescriptor.mm | 0 .../descriptors/SKScrollViewDescriptor.h | 0 .../descriptors/SKScrollViewDescriptor.m | 0 .../descriptors/SKViewControllerDescriptor.h | 0 .../descriptors/SKViewControllerDescriptor.m | 0 .../descriptors/SKViewDescriptor.h | 0 .../descriptors/SKViewDescriptor.mm | 0 .../utils/SKHiddenWindow.h | 0 .../utils/SKHiddenWindow.m | 0 .../utils/SKObjectHash.h | 0 .../FlipperKitLayoutPlugin}/utils/SKSwizzle.h | 0 .../utils/SKSwizzle.mm | 0 .../utils/SKYogaKitHelper.h | 0 .../CKComponent+Sonar.h | 4 +- .../CKComponent+Sonar.mm | 4 +- .../CKFlexboxComponent+Sonar.h | 0 .../CKFlexboxComponent+Sonar.mm | 4 +- .../CKInsetComponent+Sonar.h | 0 .../CKInsetComponent+Sonar.mm | 4 +- .../SKComponentHostingViewDescriptor.h | 2 +- .../SKComponentHostingViewDescriptor.mm | 2 +- .../SKComponentLayoutDescriptor.h | 2 +- .../SKComponentLayoutDescriptor.mm | 4 +- .../SKComponentLayoutWrapper.h | 0 .../SKComponentLayoutWrapper.mm | 0 .../SKComponentRootViewDescriptor.h | 2 +- .../SKComponentRootViewDescriptor.mm | 2 +- .../SonarKitLayoutComponentKitSupport.h | 2 +- .../SonarKitLayoutComponentKitSupport.mm | 2 +- .../SonarKitLayoutComponentKitSupport/Utils.h | 0 .../Utils.mm | 0 .../SKTapListenerMock.h | 2 +- .../SKTapListenerMock.m | 0 .../SonarKitLayoutPluginTests.m | 20 ++++----- .../SonarKitLayoutPluginTests/TestNode.h | 0 .../SonarKitLayoutPluginTests/TestNode.m | 0 .../TestNodeDescriptor.h | 2 +- .../TestNodeDescriptor.m | 0 iOS/Sample/AppDelegate.mm | 4 +- iOS/Sample/Podfile.lock | 12 +++--- iOS/SampleSwift/SampleSwift/AppDelegate.swift | 2 +- iOS/SonarKit.podspec | 42 +++++++++---------- 73 files changed, 65 insertions(+), 65 deletions(-) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h} (90%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.mm => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.mm} (98%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKDescriptorMapper.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKDescriptorMapper.mm (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKHighlightOverlay.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKHighlightOverlay.m (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKInvalidation.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKInvalidation.m (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKNamed.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKNamed.mm (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKNodeDescriptor.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKNodeDescriptor.mm (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKObject.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKObject.mm (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKSearchResultNode.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKSearchResultNode.m (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKTapListener.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKTapListenerImpl.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKTapListenerImpl.m (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKTouch.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/SKTouch.m (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/UICollectionView+SKInvalidation.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/UICollectionView+SKInvalidation.mm (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/UIColor+SKSonarValueCoder.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/UIColor+SKSonarValueCoder.mm (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/UIView+SKInvalidation.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/UIView+SKInvalidation.mm (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/descriptors/SKApplicationDescriptor.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/descriptors/SKApplicationDescriptor.m (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/descriptors/SKButtonDescriptor.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/descriptors/SKButtonDescriptor.mm (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/descriptors/SKScrollViewDescriptor.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/descriptors/SKScrollViewDescriptor.m (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/descriptors/SKViewControllerDescriptor.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/descriptors/SKViewControllerDescriptor.m (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/descriptors/SKViewDescriptor.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/descriptors/SKViewDescriptor.mm (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/utils/SKHiddenWindow.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/utils/SKHiddenWindow.m (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/utils/SKObjectHash.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/utils/SKSwizzle.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/utils/SKSwizzle.mm (100%) rename iOS/Plugins/{SonarKitLayoutPlugin/SonarKitLayoutPlugin => FlipperKitLayoutPlugin/FlipperKitLayoutPlugin}/utils/SKYogaKitHelper.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.h (85%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.mm (99%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm (97%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutComponentKitSupport/CKInsetComponent+Sonar.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutComponentKitSupport/CKInsetComponent+Sonar.mm (87%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.h (85%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.mm (96%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.h (85%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm (98%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.mm (100%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.h (85%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm (96%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h (86%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.mm (95%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutComponentKitSupport/Utils.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutComponentKitSupport/Utils.mm (100%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutPluginTests/SKTapListenerMock.h (85%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutPluginTests/SKTapListenerMock.m (100%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutPluginTests/SonarKitLayoutPluginTests.m (93%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutPluginTests/TestNode.h (100%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutPluginTests/TestNode.m (100%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutPluginTests/TestNodeDescriptor.h (84%) rename iOS/Plugins/{SonarKitLayoutPlugin => FlipperKitLayoutPlugin}/SonarKitLayoutPluginTests/TestNodeDescriptor.m (100%) diff --git a/docs/layout-plugin.md b/docs/layout-plugin.md index 4226a4f2b..c8de93bfa 100644 --- a/docs/layout-plugin.md +++ b/docs/layout-plugin.md @@ -65,7 +65,7 @@ dependencies { ```objective-c #import -#import +#import SKDescriptorMapper *mapper = [[SKDescriptorMapper alloc] initWithDefaults]; [client addPlugin:[[SonarKitLayoutPlugin alloc] initWithRootNode:context.application withDescriptorMapper:mapper]] diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h similarity index 90% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h index ef2d73ed9..710b0ba72 100644 --- a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h @@ -15,7 +15,7 @@ #import "SKInvalidation.h" #import "SKDescriptorMapper.h" -@interface SonarKitLayoutPlugin : NSObject +@interface FlipperKitLayoutPlugin : NSObject - (instancetype)initWithRootNode:(id)rootNode withDescriptorMapper:(SKDescriptorMapper *)mapper; diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.mm similarity index 98% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.mm index 59e2e75f7..3d48f9cd2 100644 --- a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.mm @@ -7,7 +7,7 @@ */ #if FB_SONARKIT_ENABLED -#import "SonarKitLayoutPlugin.h" +#import "FlipperKitLayoutPlugin.h" #import #import @@ -20,7 +20,7 @@ #import "SKSearchResultNode.h" #import -@implementation SonarKitLayoutPlugin +@implementation FlipperKitLayoutPlugin { NSMapTable *_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 responder) { FlipperPerformBlockOnMainThread(^{ [weakSelf onCallGetRoot: responder]; }); diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKDescriptorMapper.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKDescriptorMapper.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKDescriptorMapper.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.mm similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKDescriptorMapper.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.mm diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKHighlightOverlay.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKHighlightOverlay.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKHighlightOverlay.m b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.m similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKHighlightOverlay.m rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.m diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKInvalidation.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKInvalidation.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKInvalidation.m b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.m similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKInvalidation.m rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.m diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNamed.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNamed.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNamed.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.mm similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNamed.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.mm diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNodeDescriptor.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNodeDescriptor.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNodeDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.mm similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNodeDescriptor.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.mm diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKObject.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKObject.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKObject.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.mm similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKObject.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.mm diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKSearchResultNode.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKSearchResultNode.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKSearchResultNode.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKSearchResultNode.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKSearchResultNode.m b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKSearchResultNode.m similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKSearchResultNode.m rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKSearchResultNode.m diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTapListener.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTapListener.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTapListenerImpl.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListenerImpl.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTapListenerImpl.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListenerImpl.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTapListenerImpl.m b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListenerImpl.m similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTapListenerImpl.m rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListenerImpl.m diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTouch.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTouch.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTouch.m b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.m similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTouch.m rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.m diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UICollectionView+SKInvalidation.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UICollectionView+SKInvalidation.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UICollectionView+SKInvalidation.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UICollectionView+SKInvalidation.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UICollectionView+SKInvalidation.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UICollectionView+SKInvalidation.mm similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UICollectionView+SKInvalidation.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UICollectionView+SKInvalidation.mm diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIColor+SKSonarValueCoder.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIColor+SKSonarValueCoder.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIColor+SKSonarValueCoder.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.mm similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIColor+SKSonarValueCoder.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.mm diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIView+SKInvalidation.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIView+SKInvalidation.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIView+SKInvalidation.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIView+SKInvalidation.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIView+SKInvalidation.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIView+SKInvalidation.mm similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIView+SKInvalidation.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIView+SKInvalidation.mm diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKApplicationDescriptor.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKApplicationDescriptor.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKApplicationDescriptor.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKApplicationDescriptor.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKApplicationDescriptor.m b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKApplicationDescriptor.m similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKApplicationDescriptor.m rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKApplicationDescriptor.m diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKButtonDescriptor.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKButtonDescriptor.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKButtonDescriptor.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKButtonDescriptor.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKButtonDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKButtonDescriptor.mm similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKButtonDescriptor.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKButtonDescriptor.mm diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKScrollViewDescriptor.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKScrollViewDescriptor.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKScrollViewDescriptor.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKScrollViewDescriptor.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKScrollViewDescriptor.m b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKScrollViewDescriptor.m similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKScrollViewDescriptor.m rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKScrollViewDescriptor.m diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKViewControllerDescriptor.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewControllerDescriptor.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKViewControllerDescriptor.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewControllerDescriptor.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKViewControllerDescriptor.m b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewControllerDescriptor.m similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKViewControllerDescriptor.m rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewControllerDescriptor.m diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKViewDescriptor.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKViewDescriptor.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKViewDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.mm similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/descriptors/SKViewDescriptor.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.mm diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKHiddenWindow.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKHiddenWindow.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKHiddenWindow.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKHiddenWindow.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKHiddenWindow.m b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKHiddenWindow.m similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKHiddenWindow.m rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKHiddenWindow.m diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKObjectHash.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKObjectHash.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKSwizzle.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKSwizzle.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKSwizzle.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKSwizzle.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKSwizzle.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKSwizzle.mm similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKSwizzle.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKSwizzle.mm diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKYogaKitHelper.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKYogaKitHelper.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKYogaKitHelper.h rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKYogaKitHelper.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.h b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.h similarity index 85% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.h rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.h index be4936d98..0a45d7f13 100644 --- a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.h +++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.h @@ -7,8 +7,8 @@ */ #import #import -#import -#import +#import +#import FB_LINK_REQUIRE(CKComponent_Sonar) @interface CKComponent (Sonar) diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.mm b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.mm similarity index 99% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.mm index 8cf04e1ee..b9afe8fa0 100644 --- a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.mm @@ -14,8 +14,8 @@ #import #import #import -#import -#import +#import +#import /** This protocol isn't actually adopted anywhere, it just lets us use the SEL below */ @protocol SonarKitLayoutComponentKitOverrideInformalProtocol diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.h b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.h rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm similarity index 97% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm index dcbc5f36f..471bde8fb 100644 --- a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm @@ -9,8 +9,8 @@ #import "CKFlexboxComponent+Sonar.h" -#import -#import +#import +#import #import "CKComponent+Sonar.h" #import "Utils.h" diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKInsetComponent+Sonar.h b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKInsetComponent+Sonar.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKInsetComponent+Sonar.h rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKInsetComponent+Sonar.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKInsetComponent+Sonar.mm b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKInsetComponent+Sonar.mm similarity index 87% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKInsetComponent+Sonar.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKInsetComponent+Sonar.mm index 780aa1272..efeffc560 100644 --- a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKInsetComponent+Sonar.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKInsetComponent+Sonar.mm @@ -9,8 +9,8 @@ #import "CKInsetComponent+Sonar.h" -#import -#import +#import +#import #import "CKComponent+Sonar.h" diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.h b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.h similarity index 85% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.h rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.h index f2f448177..9cc7f3862 100644 --- a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.h +++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.h @@ -5,7 +5,7 @@ * file in the root directory of this source tree. * */ -#import +#import @class CKComponentHostingView; diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.mm similarity index 96% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.mm index 87a8327fd..73fed8d3c 100644 --- a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.mm @@ -16,7 +16,7 @@ #import #import -#import +#import #import "SKComponentLayoutWrapper.h" diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.h b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.h similarity index 85% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.h rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.h index fb8ed237c..a6ec89f25 100644 --- a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.h +++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.h @@ -5,7 +5,7 @@ * file in the root directory of this source tree. * */ -#import +#import @class SKComponentLayoutWrapper; diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm similarity index 98% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm index 0a14f8398..0fb5c8331 100644 --- a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm @@ -20,8 +20,8 @@ #import #import -#import -#import +#import +#import #import "SKComponentLayoutWrapper.h" #import "CKComponent+Sonar.h" diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.mm b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.mm similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.mm diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.h b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.h similarity index 85% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.h rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.h index cc2995a81..ed26fa830 100644 --- a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.h +++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.h @@ -5,7 +5,7 @@ * file in the root directory of this source tree. * */ -#import +#import @class CKComponentRootView; diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm similarity index 96% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm index 7769c82fb..a9f73c825 100644 --- a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm @@ -16,7 +16,7 @@ #import #import -#import +#import #import "SKComponentLayoutWrapper.h" diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h similarity index 86% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h index 8512169dc..d8ec9b1a7 100644 --- a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h +++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h @@ -7,7 +7,7 @@ */ #import -#import +#import @interface SonarKitLayoutComponentKitSupport : NSObject diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.mm b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.mm similarity index 95% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.mm index 894e7a098..54a3e81e1 100644 --- a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.mm @@ -12,7 +12,7 @@ #import #import -#import +#import #import "SKComponentHostingViewDescriptor.h" #import "SKComponentRootViewDescriptor.h" diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/Utils.h b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/Utils.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/Utils.h rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/Utils.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/Utils.mm b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/Utils.mm similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/Utils.mm rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/Utils.mm diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPluginTests/SKTapListenerMock.h b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SKTapListenerMock.h similarity index 85% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPluginTests/SKTapListenerMock.h rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SKTapListenerMock.h index cabd0e95c..85261275f 100644 --- a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPluginTests/SKTapListenerMock.h +++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SKTapListenerMock.h @@ -5,7 +5,7 @@ * file in the root directory of this source tree. * */ -#import +#import @interface SKTapListenerMock : NSObject diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPluginTests/SKTapListenerMock.m b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SKTapListenerMock.m similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPluginTests/SKTapListenerMock.m rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SKTapListenerMock.m diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPluginTests/SonarKitLayoutPluginTests.m b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SonarKitLayoutPluginTests.m similarity index 93% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPluginTests/SonarKitLayoutPluginTests.m rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SonarKitLayoutPluginTests.m index b7e4d4dd7..45d209843 100644 --- a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPluginTests/SonarKitLayoutPluginTests.m +++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SonarKitLayoutPluginTests.m @@ -9,9 +9,9 @@ #if FB_SONARKIT_ENABLED -#import -#import -#import +#import +#import +#import #import #import @@ -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]; diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPluginTests/TestNode.h b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/TestNode.h similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPluginTests/TestNode.h rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/TestNode.h diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPluginTests/TestNode.m b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/TestNode.m similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPluginTests/TestNode.m rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/TestNode.m diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPluginTests/TestNodeDescriptor.h b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/TestNodeDescriptor.h similarity index 84% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPluginTests/TestNodeDescriptor.h rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/TestNodeDescriptor.h index 8e0f58763..5a1e7532d 100644 --- a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPluginTests/TestNodeDescriptor.h +++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/TestNodeDescriptor.h @@ -5,7 +5,7 @@ * file in the root directory of this source tree. * */ -#import +#import #import "TestNode.h" diff --git a/iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPluginTests/TestNodeDescriptor.m b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/TestNodeDescriptor.m similarity index 100% rename from iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPluginTests/TestNodeDescriptor.m rename to iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/TestNodeDescriptor.m diff --git a/iOS/Sample/AppDelegate.mm b/iOS/Sample/AppDelegate.mm index 496ce44db..e7e9f6071 100644 --- a/iOS/Sample/AppDelegate.mm +++ b/iOS/Sample/AppDelegate.mm @@ -8,7 +8,7 @@ #import "AppDelegate.h" #import -#import +#import #import #import #import @@ -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]]]; diff --git a/iOS/Sample/Podfile.lock b/iOS/Sample/Podfile.lock index 434a1ccee..d15cd1e3f 100644 --- a/iOS/Sample/Podfile.lock +++ b/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 diff --git a/iOS/SampleSwift/SampleSwift/AppDelegate.swift b/iOS/SampleSwift/SampleSwift/AppDelegate.swift index 088cf8712..cdab74d11 100644 --- a/iOS/SampleSwift/SampleSwift/AppDelegate.swift +++ b/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() diff --git a/iOS/SonarKit.podspec b/iOS/SonarKit.podspec index c5d91ccfa..07e826a91 100644 --- a/iOS/SonarKit.podspec +++ b/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