Make project imports consistent

AsyncDisplayKit.xcodeproj/project.pbxproj

@@ -186,7 +186,6 @@
 		051943141A1575670030A7D0 /* Photos.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Photos.framework; path = System/Library/Frameworks/Photos.framework; sourceTree = SDKROOT; };
 		052EE0651A159FEF002C6279 /* ASMultiplexImageNodeTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASMultiplexImageNodeTests.m; sourceTree = "<group>"; };
 		052EE06A1A15A0D8002C6279 /* TestResources */ = {isa = PBXFileReference; lastKnownFileType = folder; path = TestResources; sourceTree = "<group>"; };
-		053011A719B9882B00A9F2D0 /* ASRangeControllerInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASRangeControllerInternal.h; sourceTree = "<group>"; };
 		054963471A1EA066000F8E56 /* ASBasicImageDownloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASBasicImageDownloader.h; sourceTree = "<group>"; };
 		054963481A1EA066000F8E56 /* ASBasicImageDownloader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASBasicImageDownloader.mm; sourceTree = "<group>"; };
 		055B9FA61A1C154B00035D6D /* ASNetworkImageNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASNetworkImageNode.h; sourceTree = "<group>"; };
@@ -368,17 +367,19 @@
 		058D09B1195D04C000B7D73C /* AsyncDisplayKit */ = {
 			isa = PBXGroup;
 			children = (
-				6BDC61F51978FEA400E50D21 /* AsyncDisplayKit.h */,
+				055F1A3A19ABD43F004DAFF1 /* ASCellNode.h */,
+				055F1A3B19ABD43F004DAFF1 /* ASCellNode.m */,
+				AC3C4A4F1A1139C100143C57 /* ASCollectionView.h */,
+				AC3C4A501A1139C100143C57 /* ASCollectionView.mm */,
+				AC3C4A531A113EEC00143C57 /* ASCollectionViewProtocols.h */,
+				058D09D5195D050800B7D73C /* ASControlNode.h */,
+				058D09D6195D050800B7D73C /* ASControlNode.m */,
+				058D09D7195D050800B7D73C /* ASControlNode+Subclasses.h */,
 				058D09D8195D050800B7D73C /* ASDisplayNode.h */,
 				058D09D9195D050800B7D73C /* ASDisplayNode.mm */,
 				058D09DA195D050800B7D73C /* ASDisplayNode+Subclasses.h */,
 				058D09DB195D050800B7D73C /* ASDisplayNodeExtras.h */,
 				058D09DC195D050800B7D73C /* ASDisplayNodeExtras.mm */,
-				058D09D5195D050800B7D73C /* ASControlNode.h */,
-				058D09D6195D050800B7D73C /* ASControlNode.m */,
-				058D09D7195D050800B7D73C /* ASControlNode+Subclasses.h */,
-				058D09DF195D050800B7D73C /* ASTextNode.h */,
-				058D09E0195D050800B7D73C /* ASTextNode.mm */,
 				0587F9BB1A7309ED00AFF0BA /* ASEditableTextNode.h */,
 				0587F9BC1A7309ED00AFF0BA /* ASEditableTextNode.mm */,
 				058D09DD195D050800B7D73C /* ASImageNode.h */,
@@ -387,16 +388,14 @@
 				0516FA3F1A1563D200B4EBED /* ASMultiplexImageNode.mm */,
 				055B9FA61A1C154B00035D6D /* ASNetworkImageNode.h */,
 				055B9FA71A1C154B00035D6D /* ASNetworkImageNode.mm */,
-				055F1A3219ABD3E3004DAFF1 /* ASTableView.h */,
-				0574D5E119C110610097DC25 /* ASTableViewProtocols.h */,
-				055F1A3319ABD3E3004DAFF1 /* ASTableView.mm */,
-				AC3C4A4F1A1139C100143C57 /* ASCollectionView.h */,
-				AC3C4A531A113EEC00143C57 /* ASCollectionViewProtocols.h */,
-				AC3C4A501A1139C100143C57 /* ASCollectionView.mm */,
-				055F1A3A19ABD43F004DAFF1 /* ASCellNode.h */,
-				055F1A3B19ABD43F004DAFF1 /* ASCellNode.m */,
 				D785F6601A74327E00291744 /* ASScrollNode.h */,
 				D785F6611A74327E00291744 /* ASScrollNode.m */,
+				055F1A3219ABD3E3004DAFF1 /* ASTableView.h */,
+				055F1A3319ABD3E3004DAFF1 /* ASTableView.mm */,
+				0574D5E119C110610097DC25 /* ASTableViewProtocols.h */,
+				058D09DF195D050800B7D73C /* ASTextNode.h */,
+				058D09E0195D050800B7D73C /* ASTextNode.mm */,
+				6BDC61F51978FEA400E50D21 /* AsyncDisplayKit.h */,
 				058D09E1195D050800B7D73C /* Details */,
 				058D0A01195D050800B7D73C /* Private */,
 				058D09B2195D04C000B7D73C /* Supporting Files */,
@@ -448,24 +447,28 @@
 		058D09E1195D050800B7D73C /* Details */ = {
 			isa = PBXGroup;
 			children = (
-				464052191A3F83C40061C0BA /* ASDataController.h */,
-				4640521A1A3F83C40061C0BA /* ASDataController.mm */,
-				4640521B1A3F83C40061C0BA /* ASFlowLayoutController.h */,
-				4640521C1A3F83C40061C0BA /* ASFlowLayoutController.mm */,
-				4640521D1A3F83C40061C0BA /* ASLayoutController.h */,
-				4640521E1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h */,
-				4640521F1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.mm */,
-				05F20AA31A15733C00DCA68A /* ASImageProtocols.h */,
 				058D09E2195D050800B7D73C /* _ASDisplayLayer.h */,
 				058D09E3195D050800B7D73C /* _ASDisplayLayer.mm */,
 				058D09E4195D050800B7D73C /* _ASDisplayView.h */,
 				058D09E5195D050800B7D73C /* _ASDisplayView.mm */,
 				054963471A1EA066000F8E56 /* ASBasicImageDownloader.h */,
 				054963481A1EA066000F8E56 /* ASBasicImageDownloader.mm */,
+				464052191A3F83C40061C0BA /* ASDataController.h */,
+				4640521A1A3F83C40061C0BA /* ASDataController.mm */,
+				05A6D05819D0EB64002DD95E /* ASDealloc2MainObject.h */,
+				05A6D05919D0EB64002DD95E /* ASDealloc2MainObject.m */,
+				4640521B1A3F83C40061C0BA /* ASFlowLayoutController.h */,
+				4640521C1A3F83C40061C0BA /* ASFlowLayoutController.mm */,
 				058D09E6195D050800B7D73C /* ASHighlightOverlayLayer.h */,
 				058D09E7195D050800B7D73C /* ASHighlightOverlayLayer.mm */,
+				05F20AA31A15733C00DCA68A /* ASImageProtocols.h */,
+				4640521D1A3F83C40061C0BA /* ASLayoutController.h */,
+				4640521E1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h */,
+				4640521F1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.mm */,
 				058D09E8195D050800B7D73C /* ASMutableAttributedStringBuilder.h */,
 				058D09E9195D050800B7D73C /* ASMutableAttributedStringBuilder.m */,
+				055F1A3619ABD413004DAFF1 /* ASRangeController.h */,
+				055F1A3719ABD413004DAFF1 /* ASRangeController.mm */,
 				058D09EA195D050800B7D73C /* ASTextNodeCoreTextAdditions.h */,
 				058D09EB195D050800B7D73C /* ASTextNodeCoreTextAdditions.m */,
 				058D09EC195D050800B7D73C /* ASTextNodeRenderer.h */,
@@ -476,17 +479,13 @@
 				058D09F1195D050800B7D73C /* ASTextNodeTextKitHelpers.mm */,
 				058D09F2195D050800B7D73C /* ASTextNodeTypes.h */,
 				058D09F3195D050800B7D73C /* ASTextNodeWordKerner.h */,
-				058D0A12195D050800B7D73C /* ASThread.h */,
 				058D09F4195D050800B7D73C /* ASTextNodeWordKerner.m */,
+				058D0A12195D050800B7D73C /* ASThread.h */,
 				058D09F5195D050800B7D73C /* NSMutableAttributedString+TextKitAdditions.h */,
 				058D09F6195D050800B7D73C /* NSMutableAttributedString+TextKitAdditions.m */,
-				055F1A3619ABD413004DAFF1 /* ASRangeController.h */,
-				055F1A3719ABD413004DAFF1 /* ASRangeController.mm */,
 				058D09F7195D050800B7D73C /* Transactions */,
 				058D09FF195D050800B7D73C /* UIView+ASConvenience.h */,
 				058D0A00195D050800B7D73C /* UIView+ASConvenience.m */,
-				05A6D05819D0EB64002DD95E /* ASDealloc2MainObject.h */,
-				05A6D05919D0EB64002DD95E /* ASDealloc2MainObject.m */,
 			);
 			path = Details;
 			sourceTree = "<group>";
@@ -521,7 +520,6 @@
 				058D0A0C195D050800B7D73C /* ASDisplayNodeInternal.h */,
 				058D0A0D195D050800B7D73C /* ASImageNode+CGExtras.h */,
 				058D0A0E195D050800B7D73C /* ASImageNode+CGExtras.m */,
-				053011A719B9882B00A9F2D0 /* ASRangeControllerInternal.h */,
 				058D0A10195D050800B7D73C /* ASSentinel.h */,
 				058D0A11195D050800B7D73C /* ASSentinel.m */,
 			);

AsyncDisplayKit/ASCellNode.h

@@ -8,6 +8,7 @@
 
 #import <AsyncDisplayKit/ASDisplayNode.h>
 
+
 /**
  * Generic cell node.  Subclass ASCellNode instead of <ASDisplayNode> to use <ASTableView>.
  */

AsyncDisplayKit/ASCollectionView.h

@@ -11,6 +11,7 @@
 #import <AsyncDisplayKit/ASRangeController.h>
 #import <AsyncDisplayKit/ASCollectionViewProtocols.h>
 
+
 @class ASCellNode;
 @protocol ASCollectionViewDataSource;
 @protocol ASCollectionViewDelegate;

AsyncDisplayKit/ASControlNode.h

@@ -8,6 +8,7 @@
 
 #import <AsyncDisplayKit/ASDisplayNode.h>
 
+
 /**
   @abstract Kinds of events possible for control nodes.
   @discussion These events are identical to their UIControl counterparts.

AsyncDisplayKit/ASDisplayNode.h

@@ -8,9 +8,10 @@
 
 #import <UIKit/UIKit.h>
 
-#import "_ASAsyncTransactionContainer.h"
+#import <AsyncDisplayKit/_ASAsyncTransactionContainer.h>
-#import "ASBaseDefines.h"
+#import <AsyncDisplayKit/ASBaseDefines.h>
-#import "ASDealloc2MainObject.h"
+#import <AsyncDisplayKit/ASDealloc2MainObject.h>
+
 
 typedef UIView *(^ASDisplayNodeViewBlock)();
 typedef CALayer *(^ASDisplayNodeLayerBlock)();

AsyncDisplayKit/ASEditableTextNode.h

@@ -8,6 +8,7 @@
 
 #import <AsyncDisplayKit/ASDisplayNode.h>
 
+
 @protocol ASEditableTextNodeDelegate;
 
 //! @abstract ASEditableTextNode implements a node that supports text editing.

AsyncDisplayKit/ASImageNode.h

@@ -8,6 +8,7 @@
 
 #import <AsyncDisplayKit/ASControlNode.h>
 
+
 /**
  * Image tints.
  */

AsyncDisplayKit/ASMultiplexImageNode.h

@@ -9,6 +9,7 @@
 #import <AsyncDisplayKit/ASImageNode.h>
 #import <AsyncDisplayKit/ASImageProtocols.h>
 
+
 @protocol ASMultiplexImageNodeDelegate;
 @protocol ASMultiplexImageNodeDataSource;
 

AsyncDisplayKit/ASNetworkImageNode.h

@@ -9,6 +9,7 @@
 #import <AsyncDisplayKit/ASImageNode.h>
 #import <AsyncDisplayKit/ASImageProtocols.h>
 
+
 @protocol ASNetworkImageNodeDelegate;
 
 

AsyncDisplayKit/ASScrollNode.h

@@ -6,9 +6,10 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
+#import <UIKit/UIKit.h>
+
 #import <AsyncDisplayKit/ASDisplayNode.h>
 
-#import <UIKit/UIKit.h>
 
 /**
  * Simple node that wraps UIScrollView.

AsyncDisplayKit/ASTableView.h

@@ -11,6 +11,7 @@
 #import <AsyncDisplayKit/ASRangeController.h>
 #import <AsyncDisplayKit/ASTableViewProtocols.h>
 
+
 @class ASCellNode;
 @protocol ASTableViewDataSource;
 @protocol ASTableViewDelegate;

AsyncDisplayKit/ASTextNode.h

@@ -8,6 +8,7 @@
 
 #import <AsyncDisplayKit/ASControlNode.h>
 
+
 @protocol ASTextNodeDelegate;
 
 /**

AsyncDisplayKit/Details/ASBasicImageDownloader.h

@@ -8,6 +8,7 @@
 
 #import <AsyncDisplayKit/ASImageProtocols.h>
 
+
 /**
  * @abstract Simple NSURLSession-based image downloader.
  */

AsyncDisplayKit/Details/ASDataController.h

@@ -3,6 +3,7 @@
 #import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASDealloc2MainObject.h>
 
+
 @class ASCellNode;
 @class ASDataController;
 

AsyncDisplayKit/Details/ASDealloc2MainObject.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
+
 /**
  * _OBJC_SUPPORTED_INLINE_REFCNT_WITH_DEALLOC2MAIN permits classes to implement their own reference counting and enforce
  * deallocation on the main thread, but requires manual reference counting.  This superclass exposes such functionality

AsyncDisplayKit/Details/ASFlowLayoutController.h

@@ -2,6 +2,7 @@
 
 #import <AsyncDisplayKit/ASLayoutController.h>
 
+
 typedef NS_ENUM(NSUInteger, ASFlowLayoutDirection) {
   ASFlowLayoutDirectionVertical,
   ASFlowLayoutDirectionHorizontal,

AsyncDisplayKit/Details/ASHighlightOverlayLayer.h

@@ -8,6 +8,7 @@
 
 #import <QuartzCore/QuartzCore.h>
 
+
 @interface ASHighlightOverlayLayer : CALayer
 
 /**

AsyncDisplayKit/Details/ASImageProtocols.h

@@ -9,6 +9,7 @@
 #import <CoreGraphics/CoreGraphics.h>
 #import <Foundation/Foundation.h>
 
+
 @protocol ASImageCacheProtocol <NSObject>
 
 @required

AsyncDisplayKit/Details/ASLayoutController.h

@@ -2,6 +2,7 @@
 
 #import <UIKit/UIKit.h>
 
+
 typedef struct {
   CGFloat leadingBufferScreenfuls;
   CGFloat trailingBufferScreenfuls;

AsyncDisplayKit/Details/ASMultidimensionalArrayUtils.h

@@ -2,7 +2,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "ASBaseDefines.h"
+#import <AsyncDisplayKit/ASBaseDefines.h>
+
 
 /**
  * Helper class for operation on multidimensional array, where the object of array may be an object or an array.

AsyncDisplayKit/Details/ASMutableAttributedStringBuilder.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
+
 /*
  * Use this class to compose new attributed strings.  You may use the normal
  * attributed string calls on this the same way you would on a normal mutable

AsyncDisplayKit/Details/ASRangeController.h

@@ -13,6 +13,7 @@
 #import <AsyncDisplayKit/ASFlowLayoutController.h>
 #import <AsyncDisplayKit/ASLayoutController.h>
 
+
 @protocol ASRangeControllerDelegate;
 
 

AsyncDisplayKit/Details/ASTextNodeCoreTextAdditions.h

@@ -11,6 +11,7 @@
 
 #import <AsyncDisplayKit/ASBaseDefines.h>
 
+
 ASDISPLAYNODE_EXTERN_C_BEGIN
 /**
  @abstract Returns whether a given attribute is an unsupported Core Text attribute.

AsyncDisplayKit/Details/ASTextNodeRenderer.h

@@ -8,6 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
+
 typedef void (^as_renderer_index_block_t)(NSUInteger characterIndex,
                                           CGRect glyphBoundingRect,
                                           BOOL *stop);

AsyncDisplayKit/Details/ASTextNodeShadower.h

@@ -9,6 +9,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
+
 /**
  * @abstract Negates/inverts a UIEdgeInsets.
  * @discussion Useful for undoing the application of shadow padding to a frame/bounds CGRect.

AsyncDisplayKit/Details/ASTextNodeTextKitHelpers.h

@@ -11,6 +11,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
+
 @interface ASTextKitComponents : NSObject
 
 /**

AsyncDisplayKit/Details/ASTextNodeWordKerner.h

@@ -9,6 +9,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/NSLayoutManager.h>
 
+
 /**
   @abstract This class acts as the NSLayoutManagerDelegate for ASTextNode.
   @discussion Its current job is word kerning, i.e. adjusting the width of spaces to match the set

AsyncDisplayKit/Details/ASThread.h

@@ -13,10 +13,11 @@
 #import <stdbool.h>
 #import <stdlib.h>
 
+#import <libkern/OSAtomic.h>
+
 #import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASBaseDefines.h>
 
-#import <libkern/OSAtomic.h>
 
 static inline BOOL ASDisplayNodeThreadIsMain()
 {

AsyncDisplayKit/Details/NSMutableAttributedString+TextKitAdditions.h

@@ -8,6 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
+
 @interface NSMutableAttributedString (TextKitAdditions)
 
 - (void)attributeTextInRange:(NSRange)range withTextKitMinimumLineHeight:(CGFloat)minimumLineHeight;

AsyncDisplayKit/Details/Transactions/_ASAsyncTransaction.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
+
 @class _ASAsyncTransaction;
 
 typedef void(^asyncdisplaykit_async_transaction_completion_block_t)(_ASAsyncTransaction *completedTransaction, BOOL canceled);

AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionContainer+Private.h

@@ -6,7 +6,8 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "_ASAsyncTransactionContainer.h"
+#import <AsyncDisplayKit/_ASAsyncTransactionContainer.h>
+
 
 @interface CALayer (ASAsyncTransactionContainerTransactions)
 @property (nonatomic, retain, setter=asyncdisplaykit_setAsyncLayerTransactions:) NSHashTable *asyncdisplaykit_asyncLayerTransactions;

AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionContainer.h

@@ -6,9 +6,10 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <QuartzCore/QuartzCore.h>
+#import <CoreGraphics/CoreGraphics.h>
 #import <UIKit/UIKit.h>
 
+
 @class _ASAsyncTransaction;
 
 typedef NS_ENUM(NSUInteger, ASAsyncTransactionContainerState) {

AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionGroup.h

@@ -8,6 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
+
 @class _ASAsyncTransaction;
 
 /// A group of transaction container layers, for which the current transactions are committed together at the end of the next runloop tick.

AsyncDisplayKit/Details/UIView+ASConvenience.h

@@ -8,6 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
+
 /**
  These are the properties we support from CALayer (implemented in the pending state)
  */

AsyncDisplayKit/Details/_ASDisplayLayer.h

@@ -8,6 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
+
 @class ASSentinel;
 @protocol _ASDisplayLayerDelegate;
 

AsyncDisplayKit/Details/_ASDisplayView.h

@@ -8,6 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
+
 // This class is only for use by ASDisplayNode and should never be subclassed or used directly.
 // Note that the "node" property is added to UIView directly via a category in ASDisplayNode.