From eff95991c678fbac4cb7996b33e19437d4a63314 Mon Sep 17 00:00:00 2001
From: Roman Gorbunov <flyrise@fb.com>
Date: Thu, 5 Sep 2019 07:28:35 -0700
Subject: [PATCH] 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
---
 FlipperKit.podspec                                     | 10 +++++++++-
 .../SKComponentLayoutDescriptor.mm                     |  2 +-
 .../FlipperKitLayoutPlugin/SKTapListenerImpl.m         |  3 ++-
 .../descriptors/SKViewDescriptor.mm                    |  2 +-
 .../FlipperKitHighlightOverlay}/SKHighlightOverlay.h   |  0
 .../FlipperKitHighlightOverlay/SKHighlightOverlay.mm}  |  0
 6 files changed, 13 insertions(+), 4 deletions(-)
 rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitHighlightOverlay}/SKHighlightOverlay.h (100%)
 rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.m => FlipperKitPluginUtils/FlipperKitHighlightOverlay/SKHighlightOverlay.mm} (100%)

diff --git a/FlipperKit.podspec b/FlipperKit.podspec
index 8e7db426b..6b24304eb 100644
--- a/FlipperKit.podspec
+++ b/FlipperKit.podspec
@@ -82,6 +82,13 @@ Pod::Spec.new do |spec|
                                "HEADER_SEARCH_PATHS" => header_search_paths }
   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|
     ss.header_dir = 'FlipperKitLayoutTextSearchable'
     ss.compiler_flags = folly_compiler_flags
@@ -93,6 +100,7 @@ Pod::Spec.new do |spec|
     ss.header_dir = "FlipperKitLayoutPlugin"
     ss.dependency             'FlipperKit/Core'
     ss.dependency             'FlipperKit/FlipperKitLayoutTextSearchable'
+    ss.dependency             'FlipperKit/FlipperKitHighlightOverlay'
     ss.dependency             'YogaKit', yogakit_version
     ss.compiler_flags       = folly_compiler_flags
     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/SKNamed.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',
@@ -118,6 +125,7 @@ Pod::Spec.new do |spec|
     ss.dependency             'ComponentKit', '~> 0.0'
     ss.dependency             'FlipperKit/FlipperKitLayoutPlugin'
     ss.dependency             'FlipperKit/FlipperKitLayoutTextSearchable'
+    ss.dependency             'FlipperKit/FlipperKitHighlightOverlay'
     ss.compiler_flags       = folly_compiler_flags
     ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h',
                              'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h'
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm
index aa0015608..9abd5a4de 100644
--- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm
+++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm
@@ -20,7 +20,7 @@
 #import <ComponentKit/CKInsetComponent.h>
 #import <ComponentKit/CKFlexboxComponent.h>
 
-#import <FlipperKitLayoutPlugin/SKHighlightOverlay.h>
+#import <FlipperKitHighlightOverlay/SKHighlightOverlay.h>
 #import <FlipperKitLayoutPlugin/SKObject.h>
 #import <FlipperKitLayoutTextSearchable/FKTextSearchable.h>
 
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListenerImpl.m b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListenerImpl.m
index 9f58e5e22..ad95a6025 100644
--- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListenerImpl.m
+++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListenerImpl.m
@@ -9,9 +9,10 @@
 
 #import "SKTapListenerImpl.h"
 
-#import "SKHighlightOverlay.h"
 #import "SKHiddenWindow.h"
 
+#import <FlipperKitHighlightOverlay/SKHighlightOverlay.h>
+
 @implementation SKTapListenerImpl
 {
   NSMutableArray<SKTapReceiver> *_receiversWaitingForInput;
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.mm
index 0bfba4744..64e54e064 100644
--- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.mm
+++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.mm
@@ -10,12 +10,12 @@
 #import "SKViewDescriptor.h"
 
 #import "SKDescriptorMapper.h"
-#import "SKHighlightOverlay.h"
 #import "SKNamed.h"
 #import "SKObject.h"
 #import "SKYogaKitHelper.h"
 #import "UIColor+SKSonarValueCoder.h"
 #import <YogaKit/UIView+Yoga.h>
+#import <FlipperKitHighlightOverlay/SKHighlightOverlay.h>
 
 @implementation SKViewDescriptor
 
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitHighlightOverlay/SKHighlightOverlay.h
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h
rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitHighlightOverlay/SKHighlightOverlay.h
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.m b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitHighlightOverlay/SKHighlightOverlay.mm
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.m
rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitHighlightOverlay/SKHighlightOverlay.mm