Moving SKHighlightOverlay

Summary: Moving FlipperKitLayoutPlugin/FlipperKitPluginUtils/SKHighlightOverlay to shared folder, so Layout and WorkingRange plugins can depend on it

Reviewed By: kevin0571

Differential Revision: D17156396

fbshipit-source-id: 3f17371f2ab4818924d61e6cfb243f60ad1f2892
This commit is contained in:
Roman Gorbunov
2019-09-05 07:28:35 -07:00
committed by Facebook Github Bot
parent 26c9bf3853
commit eff95991c6
6 changed files with 13 additions and 4 deletions

View File

@@ -82,6 +82,13 @@ Pod::Spec.new do |spec|
"HEADER_SEARCH_PATHS" => header_search_paths } "HEADER_SEARCH_PATHS" => header_search_paths }
end end
spec.subspec 'FlipperKitHighlightOverlay' do |ss|
ss.header_dir = 'FlipperKitHighlightOverlay'
ss.compiler_flags = folly_compiler_flags
ss.source_files = 'iOS/Plugins/FlipperKitPluginUtils/FlipperKitHighlightOverlay/SKHighlightOverlay.{h,mm}'
ss.public_header_files = 'iOS/Plugins/FlipperKitPluginUtils/FlipperKitHighlightOverlay/SKHighlightOverlay.h'
end
spec.subspec 'FlipperKitLayoutTextSearchable' do |ss| spec.subspec 'FlipperKitLayoutTextSearchable' do |ss|
ss.header_dir = 'FlipperKitLayoutTextSearchable' ss.header_dir = 'FlipperKitLayoutTextSearchable'
ss.compiler_flags = folly_compiler_flags ss.compiler_flags = folly_compiler_flags
@@ -93,6 +100,7 @@ Pod::Spec.new do |spec|
ss.header_dir = "FlipperKitLayoutPlugin" ss.header_dir = "FlipperKitLayoutPlugin"
ss.dependency 'FlipperKit/Core' ss.dependency 'FlipperKit/Core'
ss.dependency 'FlipperKit/FlipperKitLayoutTextSearchable' ss.dependency 'FlipperKit/FlipperKitLayoutTextSearchable'
ss.dependency 'FlipperKit/FlipperKitHighlightOverlay'
ss.dependency 'YogaKit', yogakit_version ss.dependency 'YogaKit', yogakit_version
ss.compiler_flags = folly_compiler_flags ss.compiler_flags = folly_compiler_flags
ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h',
@@ -103,7 +111,6 @@ Pod::Spec.new do |spec|
'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h',
'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h',
'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h',
'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h',
'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h',
'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h',
'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKSwizzle.h', 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKSwizzle.h',
@@ -118,6 +125,7 @@ Pod::Spec.new do |spec|
ss.dependency 'ComponentKit', '~> 0.0' ss.dependency 'ComponentKit', '~> 0.0'
ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' ss.dependency 'FlipperKit/FlipperKitLayoutPlugin'
ss.dependency 'FlipperKit/FlipperKitLayoutTextSearchable' ss.dependency 'FlipperKit/FlipperKitLayoutTextSearchable'
ss.dependency 'FlipperKit/FlipperKitHighlightOverlay'
ss.compiler_flags = folly_compiler_flags ss.compiler_flags = folly_compiler_flags
ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h',
'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h' 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h'

View File

@@ -20,7 +20,7 @@
#import <ComponentKit/CKInsetComponent.h> #import <ComponentKit/CKInsetComponent.h>
#import <ComponentKit/CKFlexboxComponent.h> #import <ComponentKit/CKFlexboxComponent.h>
#import <FlipperKitLayoutPlugin/SKHighlightOverlay.h> #import <FlipperKitHighlightOverlay/SKHighlightOverlay.h>
#import <FlipperKitLayoutPlugin/SKObject.h> #import <FlipperKitLayoutPlugin/SKObject.h>
#import <FlipperKitLayoutTextSearchable/FKTextSearchable.h> #import <FlipperKitLayoutTextSearchable/FKTextSearchable.h>

View File

@@ -9,9 +9,10 @@
#import "SKTapListenerImpl.h" #import "SKTapListenerImpl.h"
#import "SKHighlightOverlay.h"
#import "SKHiddenWindow.h" #import "SKHiddenWindow.h"
#import <FlipperKitHighlightOverlay/SKHighlightOverlay.h>
@implementation SKTapListenerImpl @implementation SKTapListenerImpl
{ {
NSMutableArray<SKTapReceiver> *_receiversWaitingForInput; NSMutableArray<SKTapReceiver> *_receiversWaitingForInput;

View File

@@ -10,12 +10,12 @@
#import "SKViewDescriptor.h" #import "SKViewDescriptor.h"
#import "SKDescriptorMapper.h" #import "SKDescriptorMapper.h"
#import "SKHighlightOverlay.h"
#import "SKNamed.h" #import "SKNamed.h"
#import "SKObject.h" #import "SKObject.h"
#import "SKYogaKitHelper.h" #import "SKYogaKitHelper.h"
#import "UIColor+SKSonarValueCoder.h" #import "UIColor+SKSonarValueCoder.h"
#import <YogaKit/UIView+Yoga.h> #import <YogaKit/UIView+Yoga.h>
#import <FlipperKitHighlightOverlay/SKHighlightOverlay.h>
@implementation SKViewDescriptor @implementation SKViewDescriptor