From 966a027c5bcaadbe4d38f17d6f73f6eeea07fe64 Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Wed, 31 Mar 2021 04:28:49 -0700 Subject: [PATCH] Add dependencies to layouthelper and ios descriptor pods (#2140) Summary: This diff makes sure that pod lib lint succeeds and the CI is green for iOS. It got broken when I landed my changes for the refactoring of FlipperKitLayoutPlugin. It wasn't picked up by flipper-oss-ios-job as it builds sample app and sample app had all the paths to the header search path which individually FlipperKitLayoutHelpers and FlipperKitIOSDescriptors were missing. I will add the validation of pods as a job in sandcastle when one touches FlipperKit pods, this will avoid such cases in future. ## Changelog Pull Request resolved: https://github.com/facebook/flipper/pull/2140 Test Plan: Imported from GitHub, without a `Test Plan:` line. iOS jobs are green on CI in GH. Reviewed By: passy Differential Revision: D27417743 Pulled By: priteshrnandgaonkar fbshipit-source-id: 17aa4b04bf9954c4bd138261103751a245409568 --- FlipperKit.podspec | 7 +++++++ .../FlipperKitLayoutHelpers/{utils => }/SKHiddenWindow.h | 0 .../FlipperKitLayoutHelpers/{utils => }/SKHiddenWindow.m | 0 .../FlipperKitLayoutHelpers/SKNodeDescriptor.h | 2 +- .../FlipperKitLayoutHelpers/{utils => }/SKObjectHash.h | 0 .../FlipperKitLayoutHelpers/{utils => }/SKSwizzle.h | 0 .../FlipperKitLayoutHelpers/{utils => }/SKSwizzle.mm | 0 .../FlipperKitLayoutHelpers/SKTouch.h | 2 +- .../FlipperKitLayoutHelpers/{utils => }/SKYogaKitHelper.h | 0 9 files changed, 9 insertions(+), 2 deletions(-) rename iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/{utils => }/SKHiddenWindow.h (100%) rename iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/{utils => }/SKHiddenWindow.m (100%) rename iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/{utils => }/SKObjectHash.h (100%) rename iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/{utils => }/SKSwizzle.h (100%) rename iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/{utils => }/SKSwizzle.mm (100%) rename iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/{utils => }/SKYogaKitHelper.h (100%) diff --git a/FlipperKit.podspec b/FlipperKit.podspec index f351ef2fe..a21086b7d 100644 --- a/FlipperKit.podspec +++ b/FlipperKit.podspec @@ -104,6 +104,9 @@ Pod::Spec.new do |spec| spec.subspec 'FlipperKitLayoutHelpers' do |ss| ss.header_dir = 'FlipperKitLayoutHelpers' + ss.dependency 'FlipperKit/Core' + ss.dependency 'FlipperKit/FlipperKitLayoutTextSearchable' + ss.dependency 'FlipperKit/FlipperKitHighlightOverlay' ss.compiler_flags = folly_compiler_flags ss.source_files = 'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/**/**/*.{h,mm,m}' ss.public_header_files = 'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListener.h', @@ -121,6 +124,10 @@ Pod::Spec.new do |spec| spec.subspec 'FlipperKitLayoutIOSDescriptors' do |ss| ss.header_dir = 'FlipperKitLayoutIOSDescriptors' + ss.dependency 'FlipperKit/Core' + ss.dependency 'FlipperKit/FlipperKitHighlightOverlay' + ss.dependency 'FlipperKit/FlipperKitLayoutHelpers' + ss.dependency 'YogaKit', yogakit_version ss.compiler_flags = folly_compiler_flags ss.source_files = 'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/**/*.{h,mm,m}' end diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKHiddenWindow.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKHiddenWindow.h similarity index 100% rename from iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKHiddenWindow.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKHiddenWindow.h diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKHiddenWindow.m b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKHiddenWindow.m similarity index 100% rename from iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKHiddenWindow.m rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKHiddenWindow.m diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNodeDescriptor.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNodeDescriptor.h index c32095c8b..67300d56d 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNodeDescriptor.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNodeDescriptor.h @@ -7,7 +7,7 @@ #import -#import +#import "FlipperKitLayoutDescriptorMapperProtocol.h" #import "SKNamed.h" #import "SKTouch.h" diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKObjectHash.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKObjectHash.h similarity index 100% rename from iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKObjectHash.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKObjectHash.h diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKSwizzle.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKSwizzle.h similarity index 100% rename from iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKSwizzle.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKSwizzle.h diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKSwizzle.mm b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKSwizzle.mm similarity index 100% rename from iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKSwizzle.mm rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKSwizzle.mm diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTouch.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTouch.h index 21f677b70..56a5e263b 100644 --- a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTouch.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTouch.h @@ -5,8 +5,8 @@ * LICENSE file in the root directory of this source tree. */ -#import #import +#import "FlipperKitLayoutDescriptorMapperProtocol.h" typedef void (^SKTouchFinishDelegate)(id currentNode); typedef void (^SKProcessFinishDelegate)(NSDictionary* tree); diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKYogaKitHelper.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKYogaKitHelper.h similarity index 100% rename from iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKYogaKitHelper.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKYogaKitHelper.h