From 790f23301eacfba0ee9f09ff39dfa6ebdedc59ea Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Thu, 25 Mar 2021 15:59:15 -0700 Subject: [PATCH] Refactor Layout Plugin Summary: This diff moves the iOS descriptors and other layout helpers into its own buck target. Earlier everything was part of the FlipperKitLayoutPlugin target. When kcui, tried to add macos descriptors, we realised that FlipperKitLayoutPlugin doesn't have macos platform in it and thus he had to put #if TARGET_OS_SIMULATOR check in iOS descriptors and at some other places. In order to make the integration easier I decided to split the Layout Plugin in following way. ``` FlipperKitLayoutPlugin -> FlipperKitLayoutIOSDescriptors (platform set as IOS) -> FlipperKitLayoutHelpers (used in iOS Descriptors and usefule for Macos too) -> FlipperKitLayoutMacOSDescriptors(coming soon by kcui)(platform set as MacOS) ``` Reviewed By: kcui Differential Revision: D27127587 fbshipit-source-id: f108ef81914297e93c886fe53dabf0a4bf11ebc1 --- FlipperKit.podspec | 36 +++++++++++++------ .../CKCenterLayoutComponent+Sonar.mm | 4 +-- .../CKComponent+Sonar.h | 4 +-- .../CKComponent+Sonar.mm | 4 +-- .../CKFlexboxComponent+Sonar.mm | 4 +-- .../CKInsetComponent+Sonar.mm | 4 +-- .../CKRatioLayoutComponent+Sonar.mm | 4 +-- .../CKStatelessComponent+Sonar.mm | 4 +-- .../SKComponentLayoutDescriptor.h | 2 +- .../SKComponentLayoutDescriptor.mm | 2 +- .../SKComponentMountedViewDescriptor.h | 2 +- .../SKComponentMountedViewDescriptor.mm | 2 +- .../SKComponentRootViewDescriptor.h | 2 +- .../SKComponentRootViewDescriptor.mm | 2 +- .../FlipperKitLayoutPlugin.h | 7 ++-- .../FlipperKitLayoutPlugin.mm | 8 ++--- .../SKDescriptorMapper.h | 6 ++-- .../SKDescriptorMapper.mm | 10 +++--- .../SKTapListenerMock.h | 2 +- .../SonarKitLayoutPluginTests.m | 2 +- .../TestNodeDescriptor.h | 2 +- ...FlipperKitLayoutDescriptorMapperProtocol.h | 22 ++++++++++++ .../FlipperKitLayoutHelpers}/SKInvalidation.h | 0 .../FlipperKitLayoutHelpers}/SKInvalidation.m | 0 .../FlipperKitLayoutHelpers}/SKNamed.h | 0 .../FlipperKitLayoutHelpers}/SKNamed.mm | 0 .../SKNodeDescriptor.h | 4 +-- .../SKNodeDescriptor.mm | 5 +-- .../FlipperKitLayoutHelpers}/SKObject.h | 0 .../FlipperKitLayoutHelpers}/SKObject.mm | 0 .../SKSearchResultNode.h | 0 .../SKSearchResultNode.m | 0 .../FlipperKitLayoutHelpers}/SKTapListener.h | 0 .../SKTapListenerImpl.h | 0 .../SKTapListenerImpl.m | 0 .../FlipperKitLayoutHelpers}/SKTouch.h | 5 ++- .../FlipperKitLayoutHelpers}/SKTouch.m | 4 +-- .../UICollectionView+SKInvalidation.h | 0 .../UICollectionView+SKInvalidation.mm | 0 .../UIColor+SKSonarValueCoder.h | 0 .../UIColor+SKSonarValueCoder.mm | 0 .../UIView+SKInvalidation.h | 0 .../UIView+SKInvalidation.mm | 0 .../utils/SKHiddenWindow.h | 0 .../utils/SKHiddenWindow.m | 0 .../utils/SKObjectHash.h | 0 .../utils/SKSwizzle.h | 0 .../utils/SKSwizzle.mm | 0 .../utils/SKYogaKitHelper.h | 0 .../SKApplicationDescriptor.h | 4 ++- .../SKApplicationDescriptor.m | 3 +- .../SKButtonDescriptor.h | 3 +- .../SKButtonDescriptor.mm | 5 ++- .../SKScrollViewDescriptor.h | 4 ++- .../SKScrollViewDescriptor.m | 2 -- .../SKViewControllerDescriptor.h | 4 ++- .../SKViewControllerDescriptor.m | 2 -- .../SKViewDescriptor.h | 4 ++- .../SKViewDescriptor.mm | 15 ++++---- iOS/Sample/Podfile.lock | 7 +++- iOS/SampleSwift/Podfile.lock | 7 +++- 61 files changed, 133 insertions(+), 80 deletions(-) create mode 100644 iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/FlipperKitLayoutDescriptorMapperProtocol.h rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/SKInvalidation.h (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/SKInvalidation.m (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/SKNamed.h (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/SKNamed.mm (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/SKNodeDescriptor.h (96%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/SKNodeDescriptor.mm (94%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/SKObject.h (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/SKObject.mm (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/SKSearchResultNode.h (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/SKSearchResultNode.m (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/SKTapListener.h (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/SKTapListenerImpl.h (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/SKTapListenerImpl.m (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/SKTouch.h (83%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/SKTouch.m (94%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/UICollectionView+SKInvalidation.h (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/UICollectionView+SKInvalidation.mm (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/UIColor+SKSonarValueCoder.h (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/UIColor+SKSonarValueCoder.mm (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/UIView+SKInvalidation.h (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/UIView+SKInvalidation.mm (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/utils/SKHiddenWindow.h (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/utils/SKHiddenWindow.m (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/utils/SKObjectHash.h (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/utils/SKSwizzle.h (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/utils/SKSwizzle.mm (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin => FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers}/utils/SKYogaKitHelper.h (100%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors => FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors}/SKApplicationDescriptor.h (78%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors => FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors}/SKApplicationDescriptor.m (97%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors => FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors}/SKButtonDescriptor.h (78%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors => FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors}/SKButtonDescriptor.mm (96%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors => FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors}/SKScrollViewDescriptor.h (78%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors => FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors}/SKScrollViewDescriptor.m (98%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors => FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors}/SKViewControllerDescriptor.h (80%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors => FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors}/SKViewControllerDescriptor.m (97%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors => FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors}/SKViewDescriptor.h (79%) rename iOS/Plugins/{FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors => FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors}/SKViewDescriptor.mm (98%) diff --git a/FlipperKit.podspec b/FlipperKit.podspec index 68e3bcc3e..f351ef2fe 100644 --- a/FlipperKit.podspec +++ b/FlipperKit.podspec @@ -102,25 +102,40 @@ Pod::Spec.new do |spec| ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutTextSearchable/FKTextSearchable.h' end + spec.subspec 'FlipperKitLayoutHelpers' do |ss| + ss.header_dir = 'FlipperKitLayoutHelpers' + 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', + 'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKInvalidation.h', + 'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/FlipperKitLayoutDescriptorMapperProtocol.h', + 'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNodeDescriptor.h', + 'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTouch.h', + 'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNamed.h' + ss.private_header_files = 'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKObject.h', + 'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIColor+SKSonarValueCoder.h', + 'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKObjectHash.h', + 'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKSwizzle.h', + 'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKYogaKitHelper.h' + end + + spec.subspec 'FlipperKitLayoutIOSDescriptors' do |ss| + ss.header_dir = 'FlipperKitLayoutIOSDescriptors' + ss.compiler_flags = folly_compiler_flags + ss.source_files = 'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/**/*.{h,mm,m}' + end + spec.subspec "FlipperKitLayoutPlugin" do |ss| ss.header_dir = "FlipperKitLayoutPlugin" ss.dependency 'FlipperKit/Core' ss.dependency 'FlipperKit/FlipperKitLayoutTextSearchable' ss.dependency 'FlipperKit/FlipperKitHighlightOverlay' + ss.dependency 'FlipperKit/FlipperKitLayoutHelpers' + ss.dependency 'FlipperKit/FlipperKitLayoutIOSDescriptors' ss.dependency 'YogaKit', yogakit_version ss.compiler_flags = folly_compiler_flags ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' - ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.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}' ss.exclude_files = ['iOS/Plugins/FlipperKitLayoutPlugin/fb/*','iOS/Plugins/FlipperKitLayoutPlugin/facebook/*','iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/fb/*' ,'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/facebook/*'] ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**", "ONLY_ACTIVE_ARCH": "YES" } @@ -134,6 +149,7 @@ Pod::Spec.new do |spec| ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' ss.dependency 'FlipperKit/FlipperKitLayoutTextSearchable' ss.dependency 'FlipperKit/FlipperKitHighlightOverlay' + ss.dependency 'FlipperKit/FlipperKitLayoutHelpers' 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/CKCenterLayoutComponent+Sonar.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKCenterLayoutComponent+Sonar.mm index 51e5e5d9a..83f826e27 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKCenterLayoutComponent+Sonar.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKCenterLayoutComponent+Sonar.mm @@ -9,8 +9,8 @@ #import "CKCenterLayoutComponent+Sonar.h" -#import -#import +#import +#import #import "CKComponent+Sonar.h" diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.h index 713e23075..f4986ac79 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.h +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.h @@ -7,8 +7,8 @@ #import #import -#import -#import +#import +#import typedef id (^SKNodeDataChanged)(id value); diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm index 29f3a7120..5134447b7 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm @@ -16,8 +16,8 @@ #import #import #import -#import -#import +#import +#import #import #import diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm index 92a4d226b..78fc3d30c 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/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/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKInsetComponent+Sonar.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKInsetComponent+Sonar.mm index 2aa6d4425..90acfca5c 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKInsetComponent+Sonar.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKInsetComponent+Sonar.mm @@ -10,8 +10,8 @@ #import "CKInsetComponent+Sonar.h" #import -#import -#import +#import +#import #import "CKComponent+Sonar.h" diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKRatioLayoutComponent+Sonar.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKRatioLayoutComponent+Sonar.mm index 52897e76e..3ffae0cd3 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKRatioLayoutComponent+Sonar.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKRatioLayoutComponent+Sonar.mm @@ -9,8 +9,8 @@ #import "CKRatioLayoutComponent+Sonar.h" -#import -#import +#import +#import #import "CKComponent+Sonar.h" diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKStatelessComponent+Sonar.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKStatelessComponent+Sonar.mm index 1caaa7fd8..0689384fb 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKStatelessComponent+Sonar.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKStatelessComponent+Sonar.mm @@ -9,8 +9,8 @@ #import "CKStatelessComponent+Sonar.h" -#import -#import +#import +#import #import "CKComponent+Sonar.h" diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.h index f0135f410..855f86452 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.h +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import #import "SKSubDescriptor.h" diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm index 2aa4dfff5..adfa2a655 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm @@ -24,7 +24,7 @@ #import #import -#import +#import #import #import "CKComponent+Sonar.h" diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentMountedViewDescriptor.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentMountedViewDescriptor.h index b58f3b29d..21b763bad 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentMountedViewDescriptor.h +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentMountedViewDescriptor.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import @class SKComponentMountedView; diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentMountedViewDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentMountedViewDescriptor.mm index ded8e9a06..811c2bf3e 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentMountedViewDescriptor.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentMountedViewDescriptor.mm @@ -13,7 +13,7 @@ #import #import -#import +#import #import #import "CKComponent+Sonar.h" diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.h index 59b779cca..8a3878f83 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.h +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import @class CKComponentRootView; diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm index 14371acb6..af811385b 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm @@ -16,8 +16,8 @@ #import #import +#import #import -#import #import "SKComponentLayoutWrapper.h" diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h index c27aaf46b..a383724bc 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h @@ -7,14 +7,15 @@ #if FB_SONARKIT_ENABLED +#import "SKDescriptorMapper.h" + #import #import #import -#import "SKDescriptorMapper.h" -#import "SKInvalidation.h" -#import "SKTapListener.h" +#import +#import @interface FlipperKitLayoutPlugin : NSObject diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.mm index f7c7e1adf..146c50573 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.mm @@ -13,12 +13,12 @@ #import #import #import +#import +#import +#import +#import #import #import "SKDescriptorMapper.h" -#import "SKNodeDescriptor.h" -#import "SKSearchResultNode.h" -#import "SKTapListener.h" -#import "SKTapListenerImpl.h" NSObject* parseLayoutEditorMessage(NSObject* message); NSObject* flattenLayoutEditorMessage(NSObject* field); diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h index 637353b28..93b1c09bb 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h @@ -5,11 +5,11 @@ * LICENSE file in the root directory of this source tree. */ +#import +#import #import -@class SKNodeDescriptor; - -@interface SKDescriptorMapper : NSObject +@interface SKDescriptorMapper : NSObject - (instancetype)initWithDefaults; diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.mm index 87eab1ef4..a22e1a17d 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.mm @@ -9,11 +9,11 @@ #import "SKDescriptorMapper.h" -#import "SKApplicationDescriptor.h" -#import "SKButtonDescriptor.h" -#import "SKScrollViewDescriptor.h" -#import "SKViewControllerDescriptor.h" -#import "SKViewDescriptor.h" +#import +#import +#import +#import +#import @implementation SKDescriptorMapper { NSMutableDictionary* _descriptors; diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SKTapListenerMock.h b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SKTapListenerMock.h index b2f203bb4..260e155fb 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SKTapListenerMock.h +++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SKTapListenerMock.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import @interface SKTapListenerMock : NSObject diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SonarKitLayoutPluginTests.m b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SonarKitLayoutPluginTests.m index 4d2e9663f..d2268d653 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SonarKitLayoutPluginTests.m +++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SonarKitLayoutPluginTests.m @@ -9,9 +9,9 @@ #if FB_SONARKIT_ENABLED +#import #import #import -#import #import #import diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/TestNodeDescriptor.h b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/TestNodeDescriptor.h index 97b3c26e9..7e7de6748 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/TestNodeDescriptor.h +++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/TestNodeDescriptor.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import #import "TestNode.h" diff --git a/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/FlipperKitLayoutDescriptorMapperProtocol.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/FlipperKitLayoutDescriptorMapperProtocol.h new file mode 100644 index 000000000..60c2de9a3 --- /dev/null +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/FlipperKitLayoutDescriptorMapperProtocol.h @@ -0,0 +1,22 @@ +/* + * Copyright (c) Facebook, Inc. and its affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#import + +@class SKNodeDescriptor; + +@protocol SKDescriptorMapperProtocol + +- (instancetype)initWithDefaults; + +- (SKNodeDescriptor*)descriptorForClass:(Class)cls; + +- (void)registerDescriptor:(SKNodeDescriptor*)descriptor forClass:(Class)cls; + +- (NSArray*)allDescriptors; + +@end diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKInvalidation.h similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKInvalidation.h diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.m b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKInvalidation.m similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.m rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKInvalidation.m diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNamed.h similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNamed.h diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.mm b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNamed.mm similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.mm rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNamed.mm diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNodeDescriptor.h similarity index 96% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNodeDescriptor.h index c72f01ea5..c32095c8b 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNodeDescriptor.h @@ -7,7 +7,7 @@ #import -#import "SKDescriptorMapper.h" +#import #import "SKNamed.h" #import "SKTouch.h" @@ -30,7 +30,7 @@ typedef void (^SKNodeUpdateData)(id value); Initializes the node-descriptor with a SKDescriptorMapper which contains mappings between Class -> SKNodeDescriptor. */ -- (instancetype)initWithDescriptorMapper:(SKDescriptorMapper*)mapper; +- (instancetype)initWithDescriptorMapper:(id)mapper; /** Gets the node-descriptor registered for a specific class. diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.mm b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNodeDescriptor.mm similarity index 94% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.mm rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNodeDescriptor.mm index 2a836c82d..325e09e44 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.mm +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKNodeDescriptor.mm @@ -11,13 +11,14 @@ #import @implementation SKNodeDescriptor { - SKDescriptorMapper* _mapper; + id _mapper; } - (void)setUp { } -- (instancetype)initWithDescriptorMapper:(SKDescriptorMapper*)mapper { +- (instancetype)initWithDescriptorMapper: + (id)mapper { if (self = [super init]) { _mapper = mapper; } diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKObject.h similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKObject.h diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.mm b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKObject.mm similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.mm rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKObject.mm diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKSearchResultNode.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKSearchResultNode.h similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKSearchResultNode.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKSearchResultNode.h diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKSearchResultNode.m b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKSearchResultNode.m similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKSearchResultNode.m rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKSearchResultNode.m diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListener.h similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListener.h diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListenerImpl.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListenerImpl.h similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListenerImpl.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListenerImpl.h diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListenerImpl.m b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListenerImpl.m similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListenerImpl.m rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTapListenerImpl.m diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTouch.h similarity index 83% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTouch.h index 0f85fa543..21f677b70 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTouch.h @@ -5,10 +5,9 @@ * LICENSE file in the root directory of this source tree. */ +#import #import -#import "SKDescriptorMapper.h" - typedef void (^SKTouchFinishDelegate)(id currentNode); typedef void (^SKProcessFinishDelegate)(NSDictionary* tree); @@ -16,7 +15,7 @@ typedef void (^SKProcessFinishDelegate)(NSDictionary* tree); - (instancetype)initWithTouchPoint:(CGPoint)touchPoint withRootNode:(id)node - withDescriptorMapper:(SKDescriptorMapper*)mapper + withDescriptorMapper:(id)mapper finishWithBlock:(SKTouchFinishDelegate)d; - (void)continueWithChildIndex:(NSUInteger)childIndex diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.m b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTouch.m similarity index 94% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.m rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTouch.m index 6907ee20e..7863245d9 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.m +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKTouch.m @@ -15,7 +15,7 @@ CGPoint _currentTouchPoint; - SKDescriptorMapper* _descriptorMapper; + id _descriptorMapper; NSMutableArray>* _nodeStack; NSMutableArray* _treeStack; @@ -23,7 +23,7 @@ - (instancetype)initWithTouchPoint:(CGPoint)touchPoint withRootNode:(id)node - withDescriptorMapper:(SKDescriptorMapper*)mapper + withDescriptorMapper:(id)mapper finishWithBlock:(SKTouchFinishDelegate)finishBlock { if (self = [super init]) { _onFinish = finishBlock; diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UICollectionView+SKInvalidation.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UICollectionView+SKInvalidation.h similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UICollectionView+SKInvalidation.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UICollectionView+SKInvalidation.h diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UICollectionView+SKInvalidation.mm b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UICollectionView+SKInvalidation.mm similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UICollectionView+SKInvalidation.mm rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UICollectionView+SKInvalidation.mm diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIColor+SKSonarValueCoder.h similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIColor+SKSonarValueCoder.h diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.mm b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIColor+SKSonarValueCoder.mm similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.mm rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIColor+SKSonarValueCoder.mm diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIView+SKInvalidation.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIView+SKInvalidation.h similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIView+SKInvalidation.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIView+SKInvalidation.h diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIView+SKInvalidation.mm b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIView+SKInvalidation.mm similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIView+SKInvalidation.mm rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIView+SKInvalidation.mm diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKHiddenWindow.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKHiddenWindow.h similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKHiddenWindow.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKHiddenWindow.h diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKHiddenWindow.m b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKHiddenWindow.m similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKHiddenWindow.m rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKHiddenWindow.m diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKObjectHash.h similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKObjectHash.h diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKSwizzle.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKSwizzle.h similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKSwizzle.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKSwizzle.h diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKSwizzle.mm b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKSwizzle.mm similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKSwizzle.mm rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKSwizzle.mm diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKYogaKitHelper.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKYogaKitHelper.h similarity index 100% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKYogaKitHelper.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKYogaKitHelper.h diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKApplicationDescriptor.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKApplicationDescriptor.h similarity index 78% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKApplicationDescriptor.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKApplicationDescriptor.h index 3eb967d81..25bd4d3aa 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKApplicationDescriptor.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKApplicationDescriptor.h @@ -7,7 +7,9 @@ #import -#import "SKNodeDescriptor.h" +#import + +@class SKDescriptorMapper; @interface SKApplicationDescriptor : SKNodeDescriptor diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKApplicationDescriptor.m b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKApplicationDescriptor.m similarity index 97% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKApplicationDescriptor.m rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKApplicationDescriptor.m index 7cd940ef5..a79a84958 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKApplicationDescriptor.m +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKApplicationDescriptor.m @@ -9,9 +9,8 @@ #import "SKApplicationDescriptor.h" +#import #import -#import "SKDescriptorMapper.h" -#import "SKHiddenWindow.h" @implementation SKApplicationDescriptor diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKButtonDescriptor.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKButtonDescriptor.h similarity index 78% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKButtonDescriptor.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKButtonDescriptor.h index 0bc6b22e5..17106be48 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKButtonDescriptor.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKButtonDescriptor.h @@ -7,9 +7,10 @@ #import -#import "SKNodeDescriptor.h" +#import @class UIButton; +@class SKDescriptorMapper; @interface SKButtonDescriptor : SKNodeDescriptor diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKButtonDescriptor.mm b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKButtonDescriptor.mm similarity index 96% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKButtonDescriptor.mm rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKButtonDescriptor.mm index 63b6c5530..9a1b9657a 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKButtonDescriptor.mm +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKButtonDescriptor.mm @@ -9,9 +9,8 @@ #import "SKButtonDescriptor.h" -#import "SKDescriptorMapper.h" -#import "SKObject.h" -#import "UIColor+SKSonarValueCoder.h" +#import +#import @implementation SKButtonDescriptor diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKScrollViewDescriptor.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKScrollViewDescriptor.h similarity index 78% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKScrollViewDescriptor.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKScrollViewDescriptor.h index b9d029de0..5b021779b 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKScrollViewDescriptor.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKScrollViewDescriptor.h @@ -7,7 +7,9 @@ #import -#import "SKNodeDescriptor.h" +#import + +@class SKDescriptorMapper; @interface SKScrollViewDescriptor : SKNodeDescriptor diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKScrollViewDescriptor.m b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKScrollViewDescriptor.m similarity index 98% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKScrollViewDescriptor.m rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKScrollViewDescriptor.m index 08b58d108..36c01c525 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKScrollViewDescriptor.m +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKScrollViewDescriptor.m @@ -9,8 +9,6 @@ #import "SKScrollViewDescriptor.h" -#import "SKDescriptorMapper.h" - @implementation SKScrollViewDescriptor - (NSString*)identifierForNode:(UIScrollView*)node { diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewControllerDescriptor.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKViewControllerDescriptor.h similarity index 80% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewControllerDescriptor.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKViewControllerDescriptor.h index f431e2686..8388c8b41 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewControllerDescriptor.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKViewControllerDescriptor.h @@ -9,7 +9,9 @@ #import -#import "SKNodeDescriptor.h" +#import + +@class SKDescriptorMapper; @interface SKViewControllerDescriptor : SKNodeDescriptor diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewControllerDescriptor.m b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKViewControllerDescriptor.m similarity index 97% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewControllerDescriptor.m rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKViewControllerDescriptor.m index 3cc042947..17c406cb9 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewControllerDescriptor.m +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKViewControllerDescriptor.m @@ -9,8 +9,6 @@ #import "SKViewControllerDescriptor.h" -#import "SKDescriptorMapper.h" - @implementation SKViewControllerDescriptor - (NSString*)identifierForNode:(UIViewController*)node { diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.h b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKViewDescriptor.h similarity index 79% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.h rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKViewDescriptor.h index d3eab4f37..aa1f7ae27 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.h +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKViewDescriptor.h @@ -9,7 +9,9 @@ #import -#import "SKNodeDescriptor.h" +#import + +@class SKDescriptorMapper; @interface SKViewDescriptor : SKNodeDescriptor diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.mm b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKViewDescriptor.mm similarity index 98% rename from iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.mm rename to iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKViewDescriptor.mm index d9d9a98be..ac4285a16 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.mm +++ b/iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/FlipperKitLayoutIOSDescriptors/SKViewDescriptor.mm @@ -10,13 +10,13 @@ #import "SKViewDescriptor.h" #import +#import +#import +#import +#import +#import +#import #import -#import "SKDescriptorMapper.h" -#import "SKHiddenWindow.h" -#import "SKNamed.h" -#import "SKObject.h" -#import "SKYogaKitHelper.h" -#import "UIColor+SKSonarValueCoder.h" @implementation SKViewDescriptor @@ -30,7 +30,8 @@ static NSDictionary* YGOverflowEnumMap = nil; static NSDictionary* YGDisplayEnumMap = nil; static NSDictionary* YGUnitEnumMap = nil; -- (instancetype)initWithDescriptorMapper:(SKDescriptorMapper*)mapper { +- (instancetype)initWithDescriptorMapper: + (id)mapper { if (self = [super initWithDescriptorMapper:mapper]) { initEnumDictionaries(); } diff --git a/iOS/Sample/Podfile.lock b/iOS/Sample/Podfile.lock index 58d722b2b..c59268e6a 100644 --- a/iOS/Sample/Podfile.lock +++ b/iOS/Sample/Podfile.lock @@ -41,12 +41,17 @@ PODS: - ComponentKit (= 0.30) - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers - FlipperKit/FlipperKitLayoutPlugin - FlipperKit/FlipperKitLayoutTextSearchable - RenderCore (= 0.30) + - FlipperKit/FlipperKitLayoutHelpers (0.74.0) + - FlipperKit/FlipperKitLayoutIOSDescriptors (0.74.0) - FlipperKit/FlipperKitLayoutPlugin (0.74.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - FlipperKit/FlipperKitLayoutIOSDescriptors - FlipperKit/FlipperKitLayoutTextSearchable - YogaKit (~> 1.18) - FlipperKit/FlipperKitLayoutTextSearchable (0.74.0) @@ -116,7 +121,7 @@ SPEC CHECKSUMS: Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: 602921fee03edacf18f5d6f3d3594ba477f456e5 - FlipperKit: f42987ea58737ac0fb3fbc38f8e703452ba56940 + FlipperKit: fcac029fe04990813aca73c0d897bf0a91bf2b43 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b RenderCore: d779c47622b313ce2d51bb36d084517af38b0dc1 diff --git a/iOS/SampleSwift/Podfile.lock b/iOS/SampleSwift/Podfile.lock index 2cb4375c3..3c762a1d1 100644 --- a/iOS/SampleSwift/Podfile.lock +++ b/iOS/SampleSwift/Podfile.lock @@ -41,12 +41,17 @@ PODS: - ComponentKit (= 0.30) - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers - FlipperKit/FlipperKitLayoutPlugin - FlipperKit/FlipperKitLayoutTextSearchable - RenderCore (= 0.30) + - FlipperKit/FlipperKitLayoutHelpers (0.74.0) + - FlipperKit/FlipperKitLayoutIOSDescriptors (0.74.0) - FlipperKit/FlipperKitLayoutPlugin (0.74.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - FlipperKit/FlipperKitLayoutIOSDescriptors - FlipperKit/FlipperKitLayoutTextSearchable - YogaKit (~> 1.18) - FlipperKit/FlipperKitLayoutTextSearchable (0.74.0) @@ -113,7 +118,7 @@ SPEC CHECKSUMS: Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: 602921fee03edacf18f5d6f3d3594ba477f456e5 - FlipperKit: f42987ea58737ac0fb3fbc38f8e703452ba56940 + FlipperKit: fcac029fe04990813aca73c0d897bf0a91bf2b43 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b RenderCore: d779c47622b313ce2d51bb36d084517af38b0dc1