From a460da4770b8d9e910f87f00826fdc3283e58fb2 Mon Sep 17 00:00:00 2001 From: Ali <> Date: Sat, 9 Nov 2019 23:14:22 +0400 Subject: [PATCH] Temp --- Config/BUILD | 0 Config/objc_module_provider.bzl | 31 +++++++++++++++++++ submodules/AsyncDisplayKit/BUILD | 28 +++++------------ .../AsyncDisplayKit/Source/ASButtonNode.mm | 2 +- .../AsyncDisplayKit/Source/ASCellNode.mm | 2 +- .../Source/ASCollectionNode.mm | 2 +- .../Source/ASCollectionView.mm | 2 +- .../AsyncDisplayKit/Source/ASControlNode.mm | 2 +- .../Source/ASDisplayNode+Convenience.mm | 2 +- .../Source/ASDisplayNode+Layout.mm | 4 +-- .../Source/ASDisplayNode+LayoutSpec.mm | 4 +-- .../AsyncDisplayKit/Source/ASDisplayNode.mm | 6 ++-- .../Source/ASEditableTextNode.mm | 2 +- .../Source/ASImageNode+AnimatedImage.mm | 2 +- .../AsyncDisplayKit/Source/ASImageNode.mm | 2 +- .../Source/ASMainThreadDeallocation.mm | 2 +- .../AsyncDisplayKit/Source/ASMapNode.mm | 2 +- .../Source/ASMultiplexImageNode.mm | 2 +- .../Source/ASNetworkImageLoadInfo.mm | 4 +-- .../Source/ASNetworkImageNode.mm | 2 +- .../AsyncDisplayKit/Source/ASTableNode.mm | 2 +- .../AsyncDisplayKit/Source/ASTableView.mm | 2 +- .../AsyncDisplayKit/Source/ASTextNode.mm | 2 +- .../AsyncDisplayKit/Source/ASTextNode2.mm | 4 +-- .../AsyncDisplayKit/Source/ASVideoNode.mm | 2 +- .../Source/ASViewController.mm | 2 +- .../Source/Details/ASDataController.mm | 4 +-- .../Source/Details/ASGraphicsContext.mm | 2 +- .../Source/Details/ASHighlightOverlayLayer.mm | 2 +- .../Source/Details/ASMainSerialQueue.mm | 2 +- .../Source/Details/ASRangeController.mm | 2 +- .../Source/Details/_ASCollectionViewCell.mm | 2 +- .../Source/Details/_ASDisplayView.mm | 2 +- .../Source/Layout/ASInsetLayoutSpec.mm | 2 +- .../AsyncDisplayKit/Source/Layout/ASLayout.mm | 2 +- .../Source/Layout/ASLayoutElement.mm | 2 +- .../Source/Layout/ASLayoutSpec+Subclasses.mm | 2 +- .../Source/Layout/ASLayoutSpec.mm | 4 +-- .../Source/Layout/ASRatioLayoutSpec.mm | 2 +- .../Source/Layout/ASRelativeLayoutSpec.mm | 2 +- .../Private/ASDisplayNode+AsyncDisplay.mm | 2 +- .../Private/ASDisplayNode+UIViewBridge.mm | 2 +- .../Source/Private/ASInternalHelpers.mm | 2 +- .../Private/ASResponderChainEnumerator.mm | 2 +- .../Private/ASTwoDimensionalArrayUtils.mm | 2 +- .../Private/Layout/ASLayoutSpecPrivate.h | 2 +- .../Private/Layout/ASStackPositionedLayout.mm | 2 +- .../TextExperiment/Component/ASTextLayout.mm | 2 +- .../TextExperiment/Utility/ASTextUtilities.h | 2 +- .../Source/Private/_ASCoreAnimationExtras.mm | 2 +- .../Source/Private/_ASHierarchyChangeSet.mm | 2 +- .../Source/Private/_ASPendingState.mm | 2 +- .../Source/TextKit/ASTextKitContext.mm | 2 +- .../TextKit/ASTextKitRenderer+Positioning.mm | 2 +- .../Source/TextKit/ASTextKitRenderer.mm | 4 +-- .../Source/TextKit/ASTextKitShadower.mm | 2 +- .../Source/TextKit/ASTextKitTailTruncater.mm | 2 +- .../Source/UIImage+ASConvenience.mm | 2 +- .../Source/UIResponder+AsyncDisplayKit.mm | 2 +- 59 files changed, 103 insertions(+), 86 deletions(-) create mode 100644 Config/BUILD create mode 100644 Config/objc_module_provider.bzl diff --git a/Config/BUILD b/Config/BUILD new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Config/objc_module_provider.bzl b/Config/objc_module_provider.bzl new file mode 100644 index 0000000000..dfa41c95c7 --- /dev/null +++ b/Config/objc_module_provider.bzl @@ -0,0 +1,31 @@ + +def _impl(ctx): + output_dir = ctx.attr.name + "_ModuleHeaders" + dir = ctx.actions.declare_directory(output_dir) + files = [] + files_command = "" + for file in ctx.files.headers: + outFile = ctx.actions.declare_file(output_dir + "/" + ctx.attr.module_name + "/" + file.basename) + files.append(outFile) + files_command = files_command + " && cp " + file.path + " " + outFile.path + ctx.actions.run_shell( + outputs = [dir] + files, + inputs = ctx.files.headers, + command = "mkdir -p " + dir.path + " " + files_command + ) + return [ + apple_common.new_objc_provider( + include_system = depset([dir.path]), + header = depset(files), + ), + ] + +objc_module = rule( + implementation = _impl, + attrs = { + "module_name": attr.string(mandatory = True), + "headers": attr.label_list( + allow_files = [".h", ".hpp"], + ), + }, +) diff --git a/submodules/AsyncDisplayKit/BUILD b/submodules/AsyncDisplayKit/BUILD index 8ff32fdb93..8786111315 100644 --- a/submodules/AsyncDisplayKit/BUILD +++ b/submodules/AsyncDisplayKit/BUILD @@ -17,30 +17,18 @@ ASYNCDISPLAYKIT_PRIVATE_HEADERS = glob([ ) exported_headers_rule_name = "AsyncDisplayKit_ExportedHeaders" -private_headers_rule_name = "AsyncDisplayKit_PrivateHeaders" exported_headers_path = "includedir" -private_headers_path = "privateincludedir" name = "AsyncDisplayKit" headers = ASYNCDISPLAYKIT_EXPORTED_HEADERS genrule( name = exported_headers_rule_name, srcs = headers, - # Headers can be nested multiple levels, so we use `x.split('/')[::-1][0] for x in headers` to get their basenames outs = [exported_headers_path + "/" + name + "/" + x.split('/')[::-1][0] for x in headers], - # Finally we copy all headers to the `exported_headers_path` directory cmd = "cp $(SRCS) $(RULEDIR)" + "/" + exported_headers_path + "/" + name, ) exported_headers = [":" + exported_headers_rule_name] -genrule( - name = private_headers_rule_name, - srcs = ASYNCDISPLAYKIT_PRIVATE_HEADERS, - outs = [private_headers_path + "/" + name + "/" + x.split('/')[::-1][0] for x in ASYNCDISPLAYKIT_PRIVATE_HEADERS], - cmd = "cp $(SRCS) $(RULEDIR)" + "/" + private_headers_path + "/" + name, -) -private_headers = [":" + private_headers_rule_name] - objc_library( name = "AsyncDisplayKit", enable_modules = True, @@ -49,23 +37,21 @@ objc_library( "Source/**/*.m", "Source/**/*.mm", "Source/Base/*.m", - ]) + ASYNCDISPLAYKIT_EXPORTED_HEADERS + ASYNCDISPLAYKIT_PRIVATE_HEADERS + private_headers, + ]) + ASYNCDISPLAYKIT_EXPORTED_HEADERS + ASYNCDISPLAYKIT_PRIVATE_HEADERS, hdrs = exported_headers, defines = [ "MINIMAL_ASDK", ], - copts = [ - #"-I$(locations :AsyncDisplayKit_PrivateHeaders)", - ], includes = [ exported_headers_path, - private_headers_path, ], sdk_frameworks = [ - "QuartzCore", - "CoreMedia", - "CoreText", - "CoreGraphics", + "Foundation", + "UIKit", + "QuartzCore", + "CoreMedia", + "CoreText", + "CoreGraphics", ], visibility = [ "//visibility:public", diff --git a/submodules/AsyncDisplayKit/Source/ASButtonNode.mm b/submodules/AsyncDisplayKit/Source/ASButtonNode.mm index 828996bc9f..8a28095abf 100644 --- a/submodules/AsyncDisplayKit/Source/ASButtonNode.mm +++ b/submodules/AsyncDisplayKit/Source/ASButtonNode.mm @@ -15,7 +15,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" @implementation ASButtonNode diff --git a/submodules/AsyncDisplayKit/Source/ASCellNode.mm b/submodules/AsyncDisplayKit/Source/ASCellNode.mm index 5793dfabd7..91f561a129 100644 --- a/submodules/AsyncDisplayKit/Source/ASCellNode.mm +++ b/submodules/AsyncDisplayKit/Source/ASCellNode.mm @@ -12,7 +12,7 @@ #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import #import diff --git a/submodules/AsyncDisplayKit/Source/ASCollectionNode.mm b/submodules/AsyncDisplayKit/Source/ASCollectionNode.mm index 6068f1f038..60e39d57e5 100644 --- a/submodules/AsyncDisplayKit/Source/ASCollectionNode.mm +++ b/submodules/AsyncDisplayKit/Source/ASCollectionNode.mm @@ -19,7 +19,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import #import diff --git a/submodules/AsyncDisplayKit/Source/ASCollectionView.mm b/submodules/AsyncDisplayKit/Source/ASCollectionView.mm index b619fd53a7..6883b8dd3d 100644 --- a/submodules/AsyncDisplayKit/Source/ASCollectionView.mm +++ b/submodules/AsyncDisplayKit/Source/ASCollectionView.mm @@ -24,7 +24,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import #import diff --git a/submodules/AsyncDisplayKit/Source/ASControlNode.mm b/submodules/AsyncDisplayKit/Source/ASControlNode.mm index 1256d2d629..34bc21ed38 100644 --- a/submodules/AsyncDisplayKit/Source/ASControlNode.mm +++ b/submodules/AsyncDisplayKit/Source/ASControlNode.mm @@ -13,7 +13,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import #import diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode+Convenience.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode+Convenience.mm index 42ae4e4a72..72cc4c23f1 100644 --- a/submodules/AsyncDisplayKit/Source/ASDisplayNode+Convenience.mm +++ b/submodules/AsyncDisplayKit/Source/ASDisplayNode+Convenience.mm @@ -12,7 +12,7 @@ #import #import -#import +#import "Private/ASResponderChainEnumerator.h" @implementation ASDisplayNode (Convenience) diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode+Layout.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode+Layout.mm index b7956541b4..041acc4929 100644 --- a/submodules/AsyncDisplayKit/Source/ASDisplayNode+Layout.mm +++ b/submodules/AsyncDisplayKit/Source/ASDisplayNode+Layout.mm @@ -10,10 +10,10 @@ #import #import #import -#import +#import "Private/ASDisplayNodeInternal.h" #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import #import diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode+LayoutSpec.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode+LayoutSpec.mm index d79073ffdd..9a156ff61a 100644 --- a/submodules/AsyncDisplayKit/Source/ASDisplayNode+LayoutSpec.mm +++ b/submodules/AsyncDisplayKit/Source/ASDisplayNode+LayoutSpec.mm @@ -9,12 +9,12 @@ #import #import -#import +#import "Private/_ASScopeTimer.h" #import #import #import #import -#import +#import "Private/ASLayoutSpecPrivate.h" #import #import diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm index 8817bb8d8e..ed63b73e4d 100644 --- a/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm +++ b/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm @@ -35,10 +35,10 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import -#import +#import "Private/ASLayoutSpecPrivate.h" #import #import #import @@ -46,7 +46,7 @@ #import #import #import -#import +#import "Private/ASResponderChainEnumerator.h" #import // Conditionally time these scopes to our debug ivars (only exist in debug/profile builds) diff --git a/submodules/AsyncDisplayKit/Source/ASEditableTextNode.mm b/submodules/AsyncDisplayKit/Source/ASEditableTextNode.mm index 21f94b4493..0a34894c0c 100644 --- a/submodules/AsyncDisplayKit/Source/ASEditableTextNode.mm +++ b/submodules/AsyncDisplayKit/Source/ASEditableTextNode.mm @@ -15,7 +15,7 @@ #import #import #import -#import +#import "TextKit/ASTextNodeWordKerner.h" #import @implementation ASEditableTextNodeTargetForAction diff --git a/submodules/AsyncDisplayKit/Source/ASImageNode+AnimatedImage.mm b/submodules/AsyncDisplayKit/Source/ASImageNode+AnimatedImage.mm index 7e4ccc2d10..10af9b7c4f 100644 --- a/submodules/AsyncDisplayKit/Source/ASImageNode+AnimatedImage.mm +++ b/submodules/AsyncDisplayKit/Source/ASImageNode+AnimatedImage.mm @@ -20,7 +20,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import #import diff --git a/submodules/AsyncDisplayKit/Source/ASImageNode.mm b/submodules/AsyncDisplayKit/Source/ASImageNode.mm index e17597bde9..75537dd974 100644 --- a/submodules/AsyncDisplayKit/Source/ASImageNode.mm +++ b/submodules/AsyncDisplayKit/Source/ASImageNode.mm @@ -23,7 +23,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import #import diff --git a/submodules/AsyncDisplayKit/Source/ASMainThreadDeallocation.mm b/submodules/AsyncDisplayKit/Source/ASMainThreadDeallocation.mm index 1cf90ada05..66f6a481a1 100644 --- a/submodules/AsyncDisplayKit/Source/ASMainThreadDeallocation.mm +++ b/submodules/AsyncDisplayKit/Source/ASMainThreadDeallocation.mm @@ -10,7 +10,7 @@ #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import diff --git a/submodules/AsyncDisplayKit/Source/ASMapNode.mm b/submodules/AsyncDisplayKit/Source/ASMapNode.mm index 1c204ab974..c23ecd20dd 100644 --- a/submodules/AsyncDisplayKit/Source/ASMapNode.mm +++ b/submodules/AsyncDisplayKit/Source/ASMapNode.mm @@ -17,7 +17,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import diff --git a/submodules/AsyncDisplayKit/Source/ASMultiplexImageNode.mm b/submodules/AsyncDisplayKit/Source/ASMultiplexImageNode.mm index 476ace1a38..beb76ed868 100644 --- a/submodules/AsyncDisplayKit/Source/ASMultiplexImageNode.mm +++ b/submodules/AsyncDisplayKit/Source/ASMultiplexImageNode.mm @@ -18,7 +18,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import diff --git a/submodules/AsyncDisplayKit/Source/ASNetworkImageLoadInfo.mm b/submodules/AsyncDisplayKit/Source/ASNetworkImageLoadInfo.mm index 4c3d553e74..c80603b7e1 100644 --- a/submodules/AsyncDisplayKit/Source/ASNetworkImageLoadInfo.mm +++ b/submodules/AsyncDisplayKit/Source/ASNetworkImageLoadInfo.mm @@ -6,8 +6,8 @@ // Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0 // -#import -#import +#import "ASNetworkImageLoadInfo.h" +#import "Private/ASNetworkImageLoadInfo+Private.h" @implementation ASNetworkImageLoadInfo diff --git a/submodules/AsyncDisplayKit/Source/ASNetworkImageNode.mm b/submodules/AsyncDisplayKit/Source/ASNetworkImageNode.mm index 29a600d8e8..1fc0368fd9 100644 --- a/submodules/AsyncDisplayKit/Source/ASNetworkImageNode.mm +++ b/submodules/AsyncDisplayKit/Source/ASNetworkImageNode.mm @@ -17,7 +17,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import #import diff --git a/submodules/AsyncDisplayKit/Source/ASTableNode.mm b/submodules/AsyncDisplayKit/Source/ASTableNode.mm index b1ce6a6274..45d10ddffb 100644 --- a/submodules/AsyncDisplayKit/Source/ASTableNode.mm +++ b/submodules/AsyncDisplayKit/Source/ASTableNode.mm @@ -16,7 +16,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import #import diff --git a/submodules/AsyncDisplayKit/Source/ASTableView.mm b/submodules/AsyncDisplayKit/Source/ASTableView.mm index 170abb50b5..c8ef4ef33e 100644 --- a/submodules/AsyncDisplayKit/Source/ASTableView.mm +++ b/submodules/AsyncDisplayKit/Source/ASTableView.mm @@ -23,7 +23,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import #import diff --git a/submodules/AsyncDisplayKit/Source/ASTextNode.mm b/submodules/AsyncDisplayKit/Source/ASTextNode.mm index e872a09297..cb71774b67 100644 --- a/submodules/AsyncDisplayKit/Source/ASTextNode.mm +++ b/submodules/AsyncDisplayKit/Source/ASTextNode.mm @@ -32,7 +32,7 @@ #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import diff --git a/submodules/AsyncDisplayKit/Source/ASTextNode2.mm b/submodules/AsyncDisplayKit/Source/ASTextNode2.mm index 7fa844ba1d..916ebaf672 100644 --- a/submodules/AsyncDisplayKit/Source/ASTextNode2.mm +++ b/submodules/AsyncDisplayKit/Source/ASTextNode2.mm @@ -13,7 +13,7 @@ #import #import -#import +#import "Private/ASDisplayNode+FrameworkPrivate.h" #import #import #import @@ -23,7 +23,7 @@ #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import diff --git a/submodules/AsyncDisplayKit/Source/ASVideoNode.mm b/submodules/AsyncDisplayKit/Source/ASVideoNode.mm index 05478d91d6..fefa5bae2f 100644 --- a/submodules/AsyncDisplayKit/Source/ASVideoNode.mm +++ b/submodules/AsyncDisplayKit/Source/ASVideoNode.mm @@ -17,7 +17,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import diff --git a/submodules/AsyncDisplayKit/Source/ASViewController.mm b/submodules/AsyncDisplayKit/Source/ASViewController.mm index 5992c050f1..09ddd44c14 100644 --- a/submodules/AsyncDisplayKit/Source/ASViewController.mm +++ b/submodules/AsyncDisplayKit/Source/ASViewController.mm @@ -15,7 +15,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" @implementation ASViewController { diff --git a/submodules/AsyncDisplayKit/Source/Details/ASDataController.mm b/submodules/AsyncDisplayKit/Source/Details/ASDataController.mm index a842e76c44..b29ad7c155 100644 --- a/submodules/AsyncDisplayKit/Source/Details/ASDataController.mm +++ b/submodules/AsyncDisplayKit/Source/Details/ASDataController.mm @@ -33,7 +33,7 @@ #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import #import @@ -955,4 +955,4 @@ typedef void (^ASDataControllerSynchronizationBlock)(); @end -#endif \ No newline at end of file +#endif diff --git a/submodules/AsyncDisplayKit/Source/Details/ASGraphicsContext.mm b/submodules/AsyncDisplayKit/Source/Details/ASGraphicsContext.mm index b950613d0d..1d8cf33cfd 100644 --- a/submodules/AsyncDisplayKit/Source/Details/ASGraphicsContext.mm +++ b/submodules/AsyncDisplayKit/Source/Details/ASGraphicsContext.mm @@ -10,7 +10,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import #import diff --git a/submodules/AsyncDisplayKit/Source/Details/ASHighlightOverlayLayer.mm b/submodules/AsyncDisplayKit/Source/Details/ASHighlightOverlayLayer.mm index 03cf468165..a8fd8c6233 100644 --- a/submodules/AsyncDisplayKit/Source/Details/ASHighlightOverlayLayer.mm +++ b/submodules/AsyncDisplayKit/Source/Details/ASHighlightOverlayLayer.mm @@ -12,7 +12,7 @@ #import #import -#import +#import "Private/ASInternalHelpers.h" static const CGFloat kCornerRadius = 2.5; static const UIEdgeInsets padding = {2, 4, 1.5, 4}; diff --git a/submodules/AsyncDisplayKit/Source/Details/ASMainSerialQueue.mm b/submodules/AsyncDisplayKit/Source/Details/ASMainSerialQueue.mm index 06cb7c3b9b..8dc6218ea3 100644 --- a/submodules/AsyncDisplayKit/Source/Details/ASMainSerialQueue.mm +++ b/submodules/AsyncDisplayKit/Source/Details/ASMainSerialQueue.mm @@ -10,7 +10,7 @@ #import #import -#import +#import "Private/ASInternalHelpers.h" @interface ASMainSerialQueue () { diff --git a/submodules/AsyncDisplayKit/Source/Details/ASRangeController.mm b/submodules/AsyncDisplayKit/Source/Details/ASRangeController.mm index f3539ea4b7..31fc79e80e 100644 --- a/submodules/AsyncDisplayKit/Source/Details/ASRangeController.mm +++ b/submodules/AsyncDisplayKit/Source/Details/ASRangeController.mm @@ -17,7 +17,7 @@ #import #import // Required for interfaceState and hierarchyState setter methods. #import -#import +#import "Private/ASInternalHelpers.h" #import #import #import diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASCollectionViewCell.mm b/submodules/AsyncDisplayKit/Source/Details/_ASCollectionViewCell.mm index a7f0b55d3f..6051c5be50 100644 --- a/submodules/AsyncDisplayKit/Source/Details/_ASCollectionViewCell.mm +++ b/submodules/AsyncDisplayKit/Source/Details/_ASCollectionViewCell.mm @@ -13,7 +13,7 @@ #import #import -#import +#import "Private/ASInternalHelpers.h" @implementation _ASCollectionViewCell diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayView.mm b/submodules/AsyncDisplayKit/Source/Details/_ASDisplayView.mm index 5225fb9958..ae4d39c155 100644 --- a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayView.mm +++ b/submodules/AsyncDisplayKit/Source/Details/_ASDisplayView.mm @@ -16,7 +16,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import #import diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASInsetLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/Layout/ASInsetLayoutSpec.mm index 450480f1c4..3fa325b580 100644 --- a/submodules/AsyncDisplayKit/Source/Layout/ASInsetLayoutSpec.mm +++ b/submodules/AsyncDisplayKit/Source/Layout/ASInsetLayoutSpec.mm @@ -12,7 +12,7 @@ #import #import -#import +#import "Private/ASInternalHelpers.h" @interface ASInsetLayoutSpec () { diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayout.mm b/submodules/AsyncDisplayKit/Source/Layout/ASLayout.mm index 055daa88f5..5a2e8a916b 100644 --- a/submodules/AsyncDisplayKit/Source/Layout/ASLayout.mm +++ b/submodules/AsyncDisplayKit/Source/Layout/ASLayout.mm @@ -18,7 +18,7 @@ #import #import -#import +#import "Private/ASInternalHelpers.h" #import NSString *const ASThreadDictMaxConstraintSizeKey = @"kASThreadDictMaxConstraintSizeKey"; diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElement.mm b/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElement.mm index 887f609e99..434d9800f3 100644 --- a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElement.mm +++ b/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElement.mm @@ -13,7 +13,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import #include diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec+Subclasses.mm b/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec+Subclasses.mm index 17ff53e6c5..3ab1e7bfd2 100644 --- a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec+Subclasses.mm +++ b/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec+Subclasses.mm @@ -10,7 +10,7 @@ #import #import -#import +#import "Private/ASLayoutSpecPrivate.h" #pragma mark - ASNullLayoutSpec diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec.mm index 8da22d3d01..dde5521eba 100644 --- a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec.mm +++ b/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec.mm @@ -8,7 +8,7 @@ // #import -#import +#import "Private/ASLayoutSpecPrivate.h" #import @@ -16,7 +16,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASRatioLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/Layout/ASRatioLayoutSpec.mm index 1580b2a60c..e0d32730e2 100644 --- a/submodules/AsyncDisplayKit/Source/Layout/ASRatioLayoutSpec.mm +++ b/submodules/AsyncDisplayKit/Source/Layout/ASRatioLayoutSpec.mm @@ -16,7 +16,7 @@ #import #import -#import +#import "Private/ASInternalHelpers.h" #pragma mark - ASRatioLayoutSpec diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASRelativeLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/Layout/ASRelativeLayoutSpec.mm index f096ce51d4..e980161ea6 100644 --- a/submodules/AsyncDisplayKit/Source/Layout/ASRelativeLayoutSpec.mm +++ b/submodules/AsyncDisplayKit/Source/Layout/ASRelativeLayoutSpec.mm @@ -11,7 +11,7 @@ #import -#import +#import "Private/ASInternalHelpers.h" @implementation ASRelativeLayoutSpec diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+AsyncDisplay.mm b/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+AsyncDisplay.mm index 4efd2b0a79..ff6e01da58 100644 --- a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+AsyncDisplay.mm +++ b/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+AsyncDisplay.mm @@ -14,7 +14,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+UIViewBridge.mm b/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+UIViewBridge.mm index a6d60a7748..294a5a1fe5 100644 --- a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+UIViewBridge.mm +++ b/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+UIViewBridge.mm @@ -9,7 +9,7 @@ #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import #import diff --git a/submodules/AsyncDisplayKit/Source/Private/ASInternalHelpers.mm b/submodules/AsyncDisplayKit/Source/Private/ASInternalHelpers.mm index a9926ccca4..ac4ee50166 100644 --- a/submodules/AsyncDisplayKit/Source/Private/ASInternalHelpers.mm +++ b/submodules/AsyncDisplayKit/Source/Private/ASInternalHelpers.mm @@ -7,7 +7,7 @@ // Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0 // -#import +#import "Private/ASInternalHelpers.h" #import diff --git a/submodules/AsyncDisplayKit/Source/Private/ASResponderChainEnumerator.mm b/submodules/AsyncDisplayKit/Source/Private/ASResponderChainEnumerator.mm index bb16e0fc57..a9392086a2 100644 --- a/submodules/AsyncDisplayKit/Source/Private/ASResponderChainEnumerator.mm +++ b/submodules/AsyncDisplayKit/Source/Private/ASResponderChainEnumerator.mm @@ -7,7 +7,7 @@ // Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0 // -#import +#import "Private/ASResponderChainEnumerator.h" #import @implementation ASResponderChainEnumerator { diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTwoDimensionalArrayUtils.mm b/submodules/AsyncDisplayKit/Source/Private/ASTwoDimensionalArrayUtils.mm index 67267b7a94..a5140f91fc 100644 --- a/submodules/AsyncDisplayKit/Source/Private/ASTwoDimensionalArrayUtils.mm +++ b/submodules/AsyncDisplayKit/Source/Private/ASTwoDimensionalArrayUtils.mm @@ -9,7 +9,7 @@ #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import diff --git a/submodules/AsyncDisplayKit/Source/Private/Layout/ASLayoutSpecPrivate.h b/submodules/AsyncDisplayKit/Source/Private/Layout/ASLayoutSpecPrivate.h index 930232096c..2a143dc674 100644 --- a/submodules/AsyncDisplayKit/Source/Private/Layout/ASLayoutSpecPrivate.h +++ b/submodules/AsyncDisplayKit/Source/Private/Layout/ASLayoutSpecPrivate.h @@ -7,7 +7,7 @@ // Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0 // -#import +#import "Private/ASInternalHelpers.h" #import #if DEBUG diff --git a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackPositionedLayout.mm b/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackPositionedLayout.mm index 727db5d2dd..ef7152642b 100644 --- a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackPositionedLayout.mm +++ b/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackPositionedLayout.mm @@ -13,7 +13,7 @@ #import #import -#import +#import "Private/ASInternalHelpers.h" #import #import diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLayout.mm b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLayout.mm index 135709a845..9259f625b3 100644 --- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLayout.mm +++ b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLayout.mm @@ -14,7 +14,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/ASTextUtilities.h b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/ASTextUtilities.h index f21a931ba8..50b47a01c0 100644 --- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/ASTextUtilities.h +++ b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/ASTextUtilities.h @@ -10,7 +10,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #ifndef ASTEXT_CLAMP // return the clamped value diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASCoreAnimationExtras.mm b/submodules/AsyncDisplayKit/Source/Private/_ASCoreAnimationExtras.mm index b55bd6442f..a8a0a9fe89 100644 --- a/submodules/AsyncDisplayKit/Source/Private/_ASCoreAnimationExtras.mm +++ b/submodules/AsyncDisplayKit/Source/Private/_ASCoreAnimationExtras.mm @@ -7,7 +7,7 @@ // Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0 // -#import +#import "_ASCoreAnimationExtras.h" #import #import diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASHierarchyChangeSet.mm b/submodules/AsyncDisplayKit/Source/Private/_ASHierarchyChangeSet.mm index 77d4d1af3f..89d0af9de9 100644 --- a/submodules/AsyncDisplayKit/Source/Private/_ASHierarchyChangeSet.mm +++ b/submodules/AsyncDisplayKit/Source/Private/_ASHierarchyChangeSet.mm @@ -10,7 +10,7 @@ #ifndef MINIMAL_ASDK #import -#import +#import "Private/ASInternalHelpers.h" #import #import #import diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASPendingState.mm b/submodules/AsyncDisplayKit/Source/Private/_ASPendingState.mm index 9e9778cf04..eb11e055f0 100644 --- a/submodules/AsyncDisplayKit/Source/Private/_ASPendingState.mm +++ b/submodules/AsyncDisplayKit/Source/Private/_ASPendingState.mm @@ -14,7 +14,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #define __shouldSetNeedsDisplay(layer) (flags.needsDisplay \ || (flags.setOpaque && opaque != (layer).opaque)\ diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitContext.mm b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitContext.mm index 8883f3175f..89aed4b525 100644 --- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitContext.mm +++ b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitContext.mm @@ -7,7 +7,7 @@ // Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0 // -#import +#import "ASTextKitContext.h" #if AS_ENABLE_TEXTNODE diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+Positioning.mm b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+Positioning.mm index 9dc770e1d9..45b4573bd6 100644 --- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+Positioning.mm +++ b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+Positioning.mm @@ -7,7 +7,7 @@ // Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0 // -#import +#import "ASTextKitRenderer+Positioning.h" #if AS_ENABLE_TEXTNODE diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer.mm b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer.mm index b724d70747..e96d7db7ea 100644 --- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer.mm +++ b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer.mm @@ -7,7 +7,7 @@ // Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0 // -#import +#import "ASTextKitRenderer.h" #if AS_ENABLE_TEXTNODE @@ -17,7 +17,7 @@ #import #import #import -#import +#import "Private/ASInternalHelpers.h" #import //#define LOG(...) NSLog(__VA_ARGS__) diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitShadower.mm b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitShadower.mm index a2f37f7e06..3c4096757f 100644 --- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitShadower.mm +++ b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitShadower.mm @@ -7,7 +7,7 @@ // Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0 // -#import +#import "ASTextKitShadower.h" #if AS_ENABLE_TEXTNODE diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTailTruncater.mm b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTailTruncater.mm index b81e27be05..a8be67ba13 100644 --- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTailTruncater.mm +++ b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTailTruncater.mm @@ -7,7 +7,7 @@ // Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0 // -#import +#import "ASTextKitTailTruncater.h" #if AS_ENABLE_TEXTNODE diff --git a/submodules/AsyncDisplayKit/Source/UIImage+ASConvenience.mm b/submodules/AsyncDisplayKit/Source/UIImage+ASConvenience.mm index 936514cf14..f3493093f9 100644 --- a/submodules/AsyncDisplayKit/Source/UIImage+ASConvenience.mm +++ b/submodules/AsyncDisplayKit/Source/UIImage+ASConvenience.mm @@ -9,7 +9,7 @@ #import #import -#import +#import "Private/ASInternalHelpers.h" #import #pragma mark - ASDKFastImageNamed diff --git a/submodules/AsyncDisplayKit/Source/UIResponder+AsyncDisplayKit.mm b/submodules/AsyncDisplayKit/Source/UIResponder+AsyncDisplayKit.mm index 8c3ec24de3..ee26560877 100644 --- a/submodules/AsyncDisplayKit/Source/UIResponder+AsyncDisplayKit.mm +++ b/submodules/AsyncDisplayKit/Source/UIResponder+AsyncDisplayKit.mm @@ -11,7 +11,7 @@ #import #import -#import +#import "Private/ASResponderChainEnumerator.h" @implementation UIResponder (AsyncDisplayKit)