From 814f72535c28171382988a278e97d4905eaffd75 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Wed, 16 Sep 2015 15:15:07 -0700 Subject: [PATCH 01/37] Add nullability annotations for public API --- AsyncDisplayKit/ASCellNode.h | 3 ++ AsyncDisplayKit/ASCollectionNode.h | 4 ++ AsyncDisplayKit/ASCollectionNode.m | 2 +- AsyncDisplayKit/ASCollectionView.h | 19 ++++--- AsyncDisplayKit/ASControlNode+Subclasses.h | 13 +++-- AsyncDisplayKit/ASControlNode.h | 11 +++-- AsyncDisplayKit/ASDisplayNode+Subclasses.h | 22 +++++---- AsyncDisplayKit/ASDisplayNode.h | 49 ++++++++++--------- AsyncDisplayKit/ASDisplayNodeExtras.h | 22 +++++---- AsyncDisplayKit/ASDisplayNodeExtras.mm | 10 ++-- AsyncDisplayKit/ASEditableTextNode.h | 5 +- AsyncDisplayKit/ASImageNode.h | 8 +-- AsyncDisplayKit/ASImageNode.mm | 2 +- AsyncDisplayKit/ASMultiplexImageNode.h | 33 +++++++------ AsyncDisplayKit/ASNetworkImageNode.h | 11 +++-- AsyncDisplayKit/ASScrollNode.h | 3 ++ AsyncDisplayKit/ASTableView.h | 17 ++++--- AsyncDisplayKit/ASTableViewProtocols.h | 26 +++++----- AsyncDisplayKit/ASTextNode.h | 18 ++++--- .../Swift/Sample.xcodeproj/project.pbxproj | 2 + examples/Swift/Sample/ViewController.swift | 2 +- 21 files changed, 170 insertions(+), 112 deletions(-) diff --git a/AsyncDisplayKit/ASCellNode.h b/AsyncDisplayKit/ASCellNode.h index 12cc6302..380eddbe 100644 --- a/AsyncDisplayKit/ASCellNode.h +++ b/AsyncDisplayKit/ASCellNode.h @@ -8,6 +8,7 @@ #import +NS_ASSUME_NONNULL_BEGIN /** * Generic cell node. Subclass ASCellNode instead of to use . @@ -43,3 +44,5 @@ @property (nonatomic, copy) NSString *text; @end + +NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/AsyncDisplayKit/ASCollectionNode.h b/AsyncDisplayKit/ASCollectionNode.h index c0489b22..46301402 100644 --- a/AsyncDisplayKit/ASCollectionNode.h +++ b/AsyncDisplayKit/ASCollectionNode.h @@ -8,6 +8,8 @@ #import +NS_ASSUME_NONNULL_BEGIN + /** * ASCollectionNode is a node based class that wraps an ASCollectionView. It can be used * as a subnode of another node, and provide room for many (great) features and improvements later on. @@ -19,3 +21,5 @@ @property (nonatomic, readonly) ASCollectionView *view; @end + +NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/AsyncDisplayKit/ASCollectionNode.m b/AsyncDisplayKit/ASCollectionNode.m index 2a131bfe..29332897 100644 --- a/AsyncDisplayKit/ASCollectionNode.m +++ b/AsyncDisplayKit/ASCollectionNode.m @@ -13,7 +13,7 @@ - (instancetype)init { ASDISPLAYNODE_NOT_DESIGNATED_INITIALIZER(); - self = [self initWithCollectionViewLayout:nil]; // Will throw an exception for lacking a UICV Layout. + self = [self initWithCollectionViewLayout:[UICollectionViewFlowLayout new]]; return nil; } diff --git a/AsyncDisplayKit/ASCollectionView.h b/AsyncDisplayKit/ASCollectionView.h index 47568355..70264fc4 100644 --- a/AsyncDisplayKit/ASCollectionView.h +++ b/AsyncDisplayKit/ASCollectionView.h @@ -18,6 +18,7 @@ @protocol ASCollectionViewDataSource; @protocol ASCollectionViewDelegate; +NS_ASSUME_NONNULL_BEGIN /** * Node-based collection view. @@ -90,7 +91,7 @@ * Boolean parameter that contains the value YES if all of the related animations completed successfully or * NO if they were interrupted. This parameter may be nil. If supplied, the block is run on the main thread. */ -- (void)performBatchAnimated:(BOOL)animated updates:(void (^)())updates completion:(void (^)(BOOL))completion; +- (void)performBatchAnimated:(BOOL)animated updates:(void (^ _Nullable)())updates completion:(void (^ _Nullable)(BOOL))completion; /** * Perform a batch of updates asynchronously. This method must be called from the main thread. @@ -101,7 +102,7 @@ * Boolean parameter that contains the value YES if all of the related animations completed successfully or * NO if they were interrupted. This parameter may be nil. If supplied, the block is run on the main thread. */ -- (void)performBatchUpdates:(void (^)())updates completion:(void (^)(BOOL))completion; +- (void)performBatchUpdates:(void (^ _Nullable)())updates completion:(void (^ _Nullable)(BOOL))completion; /** * Reload everything from scratch, destroying the working range and all cached nodes. @@ -110,7 +111,7 @@ * the main thread. * @warning This method is substantially more expensive than UICollectionView's version. */ -- (void)reloadDataWithCompletion:(void (^)())completion; +- (void)reloadDataWithCompletion:(void (^ _Nullable)())completion; /** * Reload everything from scratch, destroying the working range and all cached nodes. @@ -169,7 +170,7 @@ * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes * before this method is called. */ -- (void)insertItemsAtIndexPaths:(NSArray *)indexPaths; +- (void)insertItemsAtIndexPaths:(NSArray *)indexPaths; /** * Deletes the items specified by an array of index paths. @@ -179,7 +180,7 @@ * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes * before this method is called. */ -- (void)deleteItemsAtIndexPaths:(NSArray *)indexPaths; +- (void)deleteItemsAtIndexPaths:(NSArray *)indexPaths; /** * Reloads the specified items. @@ -189,7 +190,7 @@ * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes * before this method is called. */ -- (void)reloadItemsAtIndexPaths:(NSArray *)indexPaths; +- (void)reloadItemsAtIndexPaths:(NSArray *)indexPaths; /** * Moves the item at a specified location to a destination location. @@ -217,7 +218,7 @@ * * @returns an array containing the nodes being displayed on screen. */ -- (NSArray *)visibleNodes; +- (NSArray *)visibleNodes; /** * Query the sized node at `indexPath` for its calculatedSize. @@ -303,7 +304,7 @@ @optional - (void)collectionView:(ASCollectionView *)collectionView willDisplayNodeForItemAtIndexPath:(NSIndexPath *)indexPath; -- (void)collectionView:(ASCollectionView *)collectionView didEndDisplayingNodeForItemAtIndexPath:(NSIndexPath*)indexPath; +- (void)collectionView:(ASCollectionView *)collectionView didEndDisplayingNodeForItemAtIndexPath:(NSIndexPath *)indexPath; /** * Receive a message that the collectionView is near the end of its data set and more data should be fetched if @@ -353,3 +354,5 @@ @property (nonatomic, assign) ASRangeTuningParameters rangeTuningParameters ASDISPLAYNODE_DEPRECATED; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/ASControlNode+Subclasses.h b/AsyncDisplayKit/ASControlNode+Subclasses.h index 062f2154..90c5f68e 100644 --- a/AsyncDisplayKit/ASControlNode+Subclasses.h +++ b/AsyncDisplayKit/ASControlNode+Subclasses.h @@ -8,6 +8,7 @@ #import +NS_ASSUME_NONNULL_BEGIN /** * The subclass header _ASControlNode+Subclasses_ defines methods to be @@ -24,7 +25,7 @@ @param touchEvent An event object encapsulating the information specific to the user event. @discussion ASControlNode implements this method to send all action messages associated with controlEvents. The list of targets is constructed from prior invocations of addTarget:action:forControlEvents:. */ -- (void)sendActionsForControlEvents:(ASControlNodeEvent)controlEvents withEvent:(UIEvent *)touchEvent; +- (void)sendActionsForControlEvents:(ASControlNodeEvent)controlEvents withEvent:(nullable UIEvent *)touchEvent; /** @abstract Sent to the control when tracking begins. @@ -32,7 +33,7 @@ @param touchEvent An event object encapsulating the information specific to the user event. @result YES if the receiver should respond continuously (respond when touch is dragged); NO otherwise. */ -- (BOOL)beginTrackingWithTouch:(UITouch *)touch withEvent:(UIEvent *)touchEvent; +- (BOOL)beginTrackingWithTouch:(UITouch *)touch withEvent:(nullable UIEvent *)touchEvent; /** @abstract Sent continuously to the control as it tracks a touch within the control's bounds. @@ -40,20 +41,20 @@ @param touchEvent An event object encapsulating the information specific to the user event. @result YES if touch tracking should continue; NO otherwise. */ -- (BOOL)continueTrackingWithTouch:(UITouch *)touch withEvent:(UIEvent *)touchEvent; +- (BOOL)continueTrackingWithTouch:(UITouch *)touch withEvent:(nullable UIEvent *)touchEvent; /** @abstract Sent to the control when tracking should be cancelled. @param touchEvent An event object encapsulating the information specific to the user event. This parameter may be nil, indicating that the cancelation was caused by something other than an event, such as the display node being removed from its supernode. */ -- (void)cancelTrackingWithEvent:(UIEvent *)touchEvent; +- (void)cancelTrackingWithEvent:(nullable UIEvent *)touchEvent; /** @abstract Sent to the control when the last touch completely ends, telling it to stop tracking. @param touch The touch that ended. @param touchEvent An event object encapsulating the information specific to the user event. */ -- (void)endTrackingWithTouch:(UITouch *)touch withEvent:(UIEvent *)touchEvent; +- (void)endTrackingWithTouch:(nullable UITouch *)touch withEvent:(nullable UIEvent *)touchEvent; /** @abstract Settable version of highlighted property. @@ -61,3 +62,5 @@ @property (nonatomic, readwrite, assign, getter=isHighlighted) BOOL highlighted; @end + +NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/AsyncDisplayKit/ASControlNode.h b/AsyncDisplayKit/ASControlNode.h index d08a09c6..28a40ad5 100644 --- a/AsyncDisplayKit/ASControlNode.h +++ b/AsyncDisplayKit/ASControlNode.h @@ -8,6 +8,7 @@ #import +NS_ASSUME_NONNULL_BEGIN /** @abstract Kinds of events possible for control nodes. @@ -75,7 +76,7 @@ typedef NS_OPTIONS(NSUInteger, ASControlNodeEvent) @param controlEvents A bitmask specifying the control events for which the action message is sent. May not be 0. See "Control Events" for bitmask constants. @discussion You may call this method multiple times, and you may specify multiple target-action pairs for a particular event. Targets are held weakly. */ -- (void)addTarget:(id)target action:(SEL)action forControlEvents:(ASControlNodeEvent)controlEvents; +- (void)addTarget:(nullable id)target action:(SEL)action forControlEvents:(ASControlNodeEvent)controlEvents; /** @abstract Returns the actions that are associated with a target and a particular control event. @@ -83,7 +84,7 @@ typedef NS_OPTIONS(NSUInteger, ASControlNodeEvent) @param controlEvent A single constant of type ASControlNodeEvent that specifies a particular user action on the control; for a list of these constants, see "Control Events". May not be 0 or ASControlNodeEventAllEvents. @result An array of selector names as NSString objects, or nil if there are no action selectors associated with controlEvent. */ -- (NSArray *)actionsForTarget:(id)target forControlEvent:(ASControlNodeEvent)controlEvent; +- (nullable NSArray *)actionsForTarget:(id)target forControlEvent:(ASControlNodeEvent)controlEvent; /** @abstract Returns all target objects associated with the receiver. @@ -97,13 +98,15 @@ typedef NS_OPTIONS(NSUInteger, ASControlNodeEvent) @param action A selector identifying an action message. Pass NULL to remove all action messages paired with target. @param controlEvents A bitmask specifying the control events associated with target and action. See "Control Events" for bitmask constants. May not be 0. */ -- (void)removeTarget:(id)target action:(SEL)action forControlEvents:(ASControlNodeEvent)controlEvents; +- (void)removeTarget:(nullable id)target action:(nullable SEL)action forControlEvents:(ASControlNodeEvent)controlEvents; /** @abstract Sends the actions for the control events for a particular event. @param controlEvents A bitmask specifying the control events for which to send actions. See "Control Events" for bitmask constants. May not be 0. @param event The event which triggered these control actions. May be nil. */ -- (void)sendActionsForControlEvents:(ASControlNodeEvent)controlEvents withEvent:(UIEvent *)event; +- (void)sendActionsForControlEvents:(ASControlNodeEvent)controlEvents withEvent:(nullable UIEvent *)event; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/ASDisplayNode+Subclasses.h b/AsyncDisplayKit/ASDisplayNode+Subclasses.h index 44b81ac1..5814376d 100644 --- a/AsyncDisplayKit/ASDisplayNode+Subclasses.h +++ b/AsyncDisplayKit/ASDisplayNode+Subclasses.h @@ -15,6 +15,8 @@ @class ASLayoutSpec; +NS_ASSUME_NONNULL_BEGIN + /** * The subclass header _ASDisplayNode+Subclasses_ defines the following methods that either must or can be overriden by * subclasses of ASDisplayNode. @@ -85,7 +87,7 @@ * * @warning Subclasses must not override this; it returns the last cached layout and is never expensive. */ -@property (nonatomic, readonly, assign) ASLayout *calculatedLayout; +@property (nullable, nonatomic, readonly, assign) ASLayout *calculatedLayout; /** @name View Lifecycle */ @@ -208,7 +210,7 @@ * * @note Called on the display queue and/or main queue (MUST BE THREAD SAFE) */ -+ (UIImage *)displayWithParameters:(id)parameters ++ (nullable UIImage *)displayWithParameters:(id)parameters isCancelled:(asdisplaynode_iscancelled_block_t)isCancelledBlock; /** @@ -305,7 +307,7 @@ * @param touches A set of UITouch instances. * @param event A UIEvent associated with the touch. */ -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event; +- (void)touchesBegan:(NSSet *)touches withEvent:(nullable UIEvent *)event; /** * @abstract Tells the node when touches moved in its view. @@ -313,7 +315,7 @@ * @param touches A set of UITouch instances. * @param event A UIEvent associated with the touch. */ -- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event; +- (void)touchesMoved:(NSSet *)touches withEvent:(nullable UIEvent *)event; /** * @abstract Tells the node when touches ended in its view. @@ -321,7 +323,7 @@ * @param touches A set of UITouch instances. * @param event A UIEvent associated with the touch. */ -- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event; +- (void)touchesEnded:(NSSet *)touches withEvent:(nullable UIEvent *)event; /** * @abstract Tells the node when touches was cancelled in its view. @@ -329,7 +331,7 @@ * @param touches A set of UITouch instances. * @param event A UIEvent associated with the touch. */ -- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event; +- (void)touchesCancelled:(NSSet *)touches withEvent:(nullable UIEvent *)event; /** @name Managing Gesture Recognizers */ @@ -359,7 +361,7 @@ * 1) allows sending events to plain UIViews that don't have attached nodes, * 2) hitTest: is never called before the views are created. */ -- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event; +- (UIView *)hitTest:(CGPoint)point withEvent:(nullable UIEvent *)event; /** @name Observing node-related changes */ @@ -410,7 +412,7 @@ * * @note Called on the display queue and/or main queue (MUST BE THREAD SAFE) */ -- (UIImage *)placeholderImage; +- (nullable UIImage *)placeholderImage; /** @name Description */ @@ -428,8 +430,10 @@ @interface ASDisplayNode (ASDisplayNodePrivate) // This method has proven helpful in a few rare scenarios, similar to a category extension on UIView, // but it's considered private API for now and its use should not be encouraged. -- (ASDisplayNode *)_supernodeWithClass:(Class)supernodeClass; +- (nullable ASDisplayNode *)_supernodeWithClass:(Class)supernodeClass; @end #define ASDisplayNodeAssertThreadAffinity(viewNode) ASDisplayNodeAssert(!viewNode || ASDisplayNodeThreadIsMain() || !(viewNode).nodeLoaded, @"Incorrect display node thread affinity") #define ASDisplayNodeCAssertThreadAffinity(viewNode) ASDisplayNodeCAssert(!viewNode || ASDisplayNodeThreadIsMain() || !(viewNode).nodeLoaded, @"Incorrect display node thread affinity") + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/ASDisplayNode.h b/AsyncDisplayKit/ASDisplayNode.h index 11a138ea..0cfdae93 100644 --- a/AsyncDisplayKit/ASDisplayNode.h +++ b/AsyncDisplayKit/ASDisplayNode.h @@ -15,17 +15,19 @@ #import +NS_ASSUME_NONNULL_BEGIN + @class ASDisplayNode; /** * UIView creation block. Used to create the backing view of a new display node. */ -typedef UIView *(^ASDisplayNodeViewBlock)(); +typedef UIView * _Nonnull(^ASDisplayNodeViewBlock)(); /** * CALayer creation block. Used to create the backing layer of a new display node. */ -typedef CALayer *(^ASDisplayNodeLayerBlock)(); +typedef CALayer * _Nonnull(^ASDisplayNodeLayerBlock)(); /** * ASDisplayNode loaded callback block. This block is called BEFORE the -didLoad method and is always called on the main thread. @@ -60,7 +62,7 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); * @return An ASDisplayNode instance whose view will be a subclass that enables asynchronous rendering, and passes * through -layout and touch handling methods. */ -- (id)init; +- (instancetype)init; /** @@ -71,7 +73,7 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); * @return An ASDisplayNode instance that loads its view with the given block that is guaranteed to run on the main * queue. The view will render synchronously and -layout and touch handling methods on the node will not be called. */ -- (id)initWithViewBlock:(ASDisplayNodeViewBlock)viewBlock; +- (instancetype)initWithViewBlock:(ASDisplayNodeViewBlock)viewBlock; /** * @abstract Alternative initializer with a block to create the backing view. @@ -82,7 +84,7 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); * @return An ASDisplayNode instance that loads its view with the given block that is guaranteed to run on the main * queue. The view will render synchronously and -layout and touch handling methods on the node will not be called. */ -- (id)initWithViewBlock:(ASDisplayNodeViewBlock)viewBlock didLoadBlock:(ASDisplayNodeDidLoadBlock)didLoadBlock; +- (instancetype)initWithViewBlock:(ASDisplayNodeViewBlock)viewBlock didLoadBlock:(nullable ASDisplayNodeDidLoadBlock)didLoadBlock; /** * @abstract Alternative initializer with a block to create the backing layer. @@ -92,7 +94,7 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); * @return An ASDisplayNode instance that loads its layer with the given block that is guaranteed to run on the main * queue. The layer will render synchronously and -layout and touch handling methods on the node will not be called. */ -- (id)initWithLayerBlock:(ASDisplayNodeLayerBlock)layerBlock; +- (instancetype)initWithLayerBlock:(ASDisplayNodeLayerBlock)layerBlock; /** * @abstract Alternative initializer with a block to create the backing layer. @@ -103,7 +105,7 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); * @return An ASDisplayNode instance that loads its layer with the given block that is guaranteed to run on the main * queue. The layer will render synchronously and -layout and touch handling methods on the node will not be called. */ -- (id)initWithLayerBlock:(ASDisplayNodeLayerBlock)layerBlock didLoadBlock:(ASDisplayNodeDidLoadBlock)didLoadBlock; +- (instancetype)initWithLayerBlock:(ASDisplayNodeLayerBlock)layerBlock didLoadBlock:(nullable ASDisplayNodeDidLoadBlock)didLoadBlock; /** @name Properties */ @@ -295,7 +297,7 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); /** * @abstract The receiver's immediate subnodes. */ -@property (nonatomic, readonly, retain) NSArray *subnodes; +@property (nonatomic, readonly, retain) NSArray *subnodes; /** * @abstract The receiver's supernode. @@ -454,7 +456,7 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); * * @return YES if point is inside the receiver's bounds; otherwise, NO. */ -- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event; +- (BOOL)pointInside:(CGPoint)point withEvent:(nullable UIEvent *)event; /** @name Converting Between View Coordinate Systems */ @@ -468,7 +470,7 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); * * @return The point converted to the coordinate system of node. */ -- (CGPoint)convertPoint:(CGPoint)point toNode:(ASDisplayNode *)node; +- (CGPoint)convertPoint:(CGPoint)point toNode:(nullable ASDisplayNode *)node; /** @@ -479,7 +481,7 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); * * @return The point converted to the local coordinate system (bounds) of the receiver. */ -- (CGPoint)convertPoint:(CGPoint)point fromNode:(ASDisplayNode *)node; +- (CGPoint)convertPoint:(CGPoint)point fromNode:(nullable ASDisplayNode *)node; /** @@ -490,7 +492,7 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); * * @return The converted rectangle. */ -- (CGRect)convertRect:(CGRect)rect toNode:(ASDisplayNode *)node; +- (CGRect)convertRect:(CGRect)rect toNode:(nullable ASDisplayNode *)node; /** * @abstract Converts a rectangle from the coordinate system of another node to that of the receiver. @@ -500,7 +502,7 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); * * @return The converted rectangle. */ -- (CGRect)convertRect:(CGRect)rect fromNode:(ASDisplayNode *)node; +- (CGRect)convertRect:(CGRect)rect fromNode:(nullable ASDisplayNode *)node; /** @name UIResponder methods */ @@ -510,7 +512,7 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); - (BOOL)canResignFirstResponder; // default==YES - (BOOL)resignFirstResponder; // default==NO (no-op) - (BOOL)isFirstResponder; -- (BOOL)canPerformAction:(SEL)action withSender:(id)sender; +- (BOOL)canPerformAction:(SEL)action withSender:(nullable id)sender; @end @@ -583,7 +585,7 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); @property (atomic, assign) CGFloat contentsScale; // default=1.0f. See @contentsScaleForDisplay for more info @property (atomic, assign) CATransform3D transform; // default=CATransform3DIdentity @property (atomic, assign) CATransform3D subnodeTransform; // default=CATransform3DIdentity -@property (atomic, copy) NSString *name; // default=nil. Use this to tag your layers in the server-recurse-description / pca or for your own purposes +@property (atomic, copy, nullable) NSString *name; // default=nil. Use this to tag your layers in the server-recurse-description / pca or for your own purposes /** * @abstract The node view's background color. @@ -591,9 +593,9 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); * @discussion In contrast to UIView, setting a transparent color will not set opaque = NO. * This only affects nodes that implement +drawRect like ASTextNode. */ -@property (atomic, retain) UIColor *backgroundColor; // default=nil +@property (atomic, retain, nullable) UIColor *backgroundColor; // default=nil -@property (atomic, retain) UIColor *tintColor; // default=Blue +@property (atomic, retain, null_resettable) UIColor *tintColor; // default=Blue - (void)tintColorDidChange; // Notifies the node when the tintColor has changed. /** @@ -617,18 +619,18 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); // Accessibility support @property (atomic, assign) BOOL isAccessibilityElement; -@property (atomic, copy) NSString *accessibilityLabel; -@property (atomic, copy) NSString *accessibilityHint; -@property (atomic, copy) NSString *accessibilityValue; +@property (nullable, atomic, copy) NSString *accessibilityLabel; +@property (nullable, atomic, copy) NSString *accessibilityHint; +@property (nullable, atomic, copy) NSString *accessibilityValue; @property (atomic, assign) UIAccessibilityTraits accessibilityTraits; @property (atomic, assign) CGRect accessibilityFrame; -@property (atomic, retain) NSString *accessibilityLanguage; +@property (nullable, atomic, retain) NSString *accessibilityLanguage; @property (atomic, assign) BOOL accessibilityElementsHidden; @property (atomic, assign) BOOL accessibilityViewIsModal; @property (atomic, assign) BOOL shouldGroupAccessibilityChildren; // Accessibility identification support -@property (nonatomic, copy) NSString *accessibilityIdentifier; +@property (nullable, nonatomic, copy) NSString *accessibilityIdentifier; @end @@ -659,6 +661,7 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); - (void)addSubnode:(ASDisplayNode *)node; @end + @interface ASDisplayNode (Deprecated) - (void)reclaimMemory ASDISPLAYNODE_DEPRECATED; @@ -666,3 +669,5 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); @property (nonatomic, assign) BOOL placeholderFadesOut ASDISPLAYNODE_DEPRECATED; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/ASDisplayNodeExtras.h b/AsyncDisplayKit/ASDisplayNodeExtras.h index 5ce6ac2b..521dce25 100644 --- a/AsyncDisplayKit/ASDisplayNodeExtras.h +++ b/AsyncDisplayKit/ASDisplayNodeExtras.h @@ -12,22 +12,24 @@ #import #import +NS_ASSUME_NONNULL_BEGIN + ASDISPLAYNODE_EXTERN_C_BEGIN /** Given a layer, returns the associated display node, if any. */ -extern ASDisplayNode *ASLayerToDisplayNode(CALayer *layer); +extern ASDisplayNode * _Nullable ASLayerToDisplayNode(CALayer * _Nullable layer); /** Given a view, returns the associated display node, if any. */ -extern ASDisplayNode *ASViewToDisplayNode(UIView *view); +extern ASDisplayNode * _Nullable ASViewToDisplayNode(UIView * _Nullable view); /** Given a display node, traverses up the layer tree hierarchy, returning the first display node that passes block. */ -extern id ASDisplayNodeFind(ASDisplayNode *node, BOOL (^block)(ASDisplayNode *node)); +extern id ASDisplayNodeFind(ASDisplayNode * _Nullable node, BOOL (^block)(ASDisplayNode *node)); /** Given a display node, traverses up the layer tree hierarchy, returning the first display node of kind class. @@ -35,29 +37,29 @@ extern id ASDisplayNodeFind(ASDisplayNode *node, BOOL (^block)(ASDisplayNode *no extern id ASDisplayNodeFindClass(ASDisplayNode *start, Class c); /** - Given a display node, collects all descendents. This is a specialization of ASCollectContainer() that walks the Core Animation layer tree as opposed to the display node tree, thus supporting non-continues display node hierarchies. + Given a display node, collects all descendents. This is a specialization of ASCollectContainer() that walks the Core Animation layer tree as opposed to the display node tree, thus supporting non-continuous display node hierarchies. */ -extern NSArray *ASCollectDisplayNodes(ASDisplayNode *node); +extern NSArray *ASCollectDisplayNodes(ASDisplayNode *node); /** Given a display node, traverses down the node hierarchy, returning all the display nodes that pass the block. */ -extern NSArray *ASDisplayNodeFindAllSubnodes(ASDisplayNode *start, BOOL (^block)(ASDisplayNode *node)); +extern NSArray *ASDisplayNodeFindAllSubnodes(ASDisplayNode *start, BOOL (^block)(ASDisplayNode *node)); /** Given a display node, traverses down the node hierarchy, returning all the display nodes of kind class. */ -extern NSArray *ASDisplayNodeFindAllSubnodesOfClass(ASDisplayNode *start, Class c); +extern NSArray *ASDisplayNodeFindAllSubnodesOfClass(ASDisplayNode *start, Class c); /** Given a display node, traverses down the node hierarchy, returning the depth-first display node that pass the block. */ -extern id ASDisplayNodeFindFirstSubnode(ASDisplayNode *start, BOOL (^block)(ASDisplayNode *node)); +extern __kindof ASDisplayNode * ASDisplayNodeFindFirstSubnode(ASDisplayNode *start, BOOL (^block)(ASDisplayNode *node)); /** Given a display node, traverses down the node hierarchy, returning the depth-first display node of kind class. */ -extern id ASDisplayNodeFindFirstSubnodeOfClass(ASDisplayNode *start, Class c); +extern __kindof ASDisplayNode * ASDisplayNodeFindFirstSubnodeOfClass(ASDisplayNode *start, Class c); extern UIColor *ASDisplayNodeDefaultPlaceholderColor(); extern UIColor *ASDisplayNodeDefaultTintColor(); @@ -69,3 +71,5 @@ extern void ASDisplayNodeDisableHierarchyNotifications(ASDisplayNode *node); extern void ASDisplayNodeEnableHierarchyNotifications(ASDisplayNode *node); ASDISPLAYNODE_EXTERN_C_END + +NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/AsyncDisplayKit/ASDisplayNodeExtras.mm b/AsyncDisplayKit/ASDisplayNodeExtras.mm index 8d2e2615..e1af9e13 100644 --- a/AsyncDisplayKit/ASDisplayNodeExtras.mm +++ b/AsyncDisplayKit/ASDisplayNodeExtras.mm @@ -54,7 +54,7 @@ static void _ASCollectDisplayNodes(NSMutableArray *array, CALayer *layer) _ASCollectDisplayNodes(array, sublayer); } -extern NSArray *ASCollectDisplayNodes(ASDisplayNode *node) +extern NSArray *ASCollectDisplayNodes(ASDisplayNode *node) { NSMutableArray *list = [NSMutableArray array]; for (CALayer *sublayer in node.layer.sublayers) { @@ -79,14 +79,14 @@ static void _ASDisplayNodeFindAllSubnodes(NSMutableArray *array, ASDisplayNode * } } -extern NSArray *ASDisplayNodeFindAllSubnodes(ASDisplayNode *start, BOOL (^block)(ASDisplayNode *node)) +extern NSArray *ASDisplayNodeFindAllSubnodes(ASDisplayNode *start, BOOL (^block)(ASDisplayNode *node)) { NSMutableArray *list = [NSMutableArray array]; _ASDisplayNodeFindAllSubnodes(list, start, block); return list; } -extern NSArray *ASDisplayNodeFindAllSubnodesOfClass(ASDisplayNode *start, Class c) +extern NSArray *ASDisplayNodeFindAllSubnodesOfClass(ASDisplayNode *start, Class c) { return ASDisplayNodeFindAllSubnodes(start, ^(ASDisplayNode *n) { return [n isKindOfClass:c]; @@ -110,12 +110,12 @@ static ASDisplayNode *_ASDisplayNodeFindFirstSubnode(ASDisplayNode *startNode, B return nil; } -extern id ASDisplayNodeFindFirstSubnode(ASDisplayNode *startNode, BOOL (^block)(ASDisplayNode *node)) +extern __kindof ASDisplayNode * ASDisplayNodeFindFirstSubnode(ASDisplayNode *startNode, BOOL (^block)(ASDisplayNode *node)) { return _ASDisplayNodeFindFirstSubnode(startNode, NO, block); } -extern id ASDisplayNodeFindFirstSubnodeOfClass(ASDisplayNode *start, Class c) +extern __kindof ASDisplayNode * ASDisplayNodeFindFirstSubnodeOfClass(ASDisplayNode *start, Class c) { return ASDisplayNodeFindFirstSubnode(start, ^(ASDisplayNode *n) { return [n isKindOfClass:c]; diff --git a/AsyncDisplayKit/ASEditableTextNode.h b/AsyncDisplayKit/ASEditableTextNode.h index e343b4b4..232fd8ec 100644 --- a/AsyncDisplayKit/ASEditableTextNode.h +++ b/AsyncDisplayKit/ASEditableTextNode.h @@ -8,6 +8,7 @@ #import +NS_ASSUME_NONNULL_BEGIN @protocol ASEditableTextNodeDelegate; @@ -26,7 +27,7 @@ @property (nonatomic, readonly, strong) UITextView *textView; //! @abstract The attributes to apply to new text being entered by the user. -@property (nonatomic, readwrite, strong) NSDictionary *typingAttributes; +@property (nonatomic, readwrite, strong) NSDictionary *typingAttributes; //! @abstract The range of text currently selected. If length is zero, the range is the cursor location. @property (nonatomic, readwrite, assign) NSRange selectedRange; @@ -136,3 +137,5 @@ @end + +NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/AsyncDisplayKit/ASImageNode.h b/AsyncDisplayKit/ASImageNode.h index 8f71a066..961da075 100644 --- a/AsyncDisplayKit/ASImageNode.h +++ b/AsyncDisplayKit/ASImageNode.h @@ -8,6 +8,7 @@ #import +NS_ASSUME_NONNULL_BEGIN /** * Image modification block. Use to transform an image before display. @@ -32,12 +33,12 @@ typedef UIImage *(^asimagenode_modification_block_t)(UIImage *image); * the layer's contentsCenter property. Non-stretchable images work too, of * course. */ -@property (atomic, retain) UIImage *image; +@property (nullable, atomic, retain) UIImage *image; /** @abstract The placeholder color. */ -@property (nonatomic, strong) UIColor *placeholderColor; +@property (nullable, nonatomic, strong) UIColor *placeholderColor; /** * @abstract Indicates whether efficient cropping of the receiver is enabled. @@ -99,7 +100,7 @@ typedef UIImage *(^asimagenode_modification_block_t)(UIImage *image); * `displaySuspended` is YES, `displayCompletionBlock` is will be * performed immediately and `YES` will be passed for `canceled`. */ -- (void)setNeedsDisplayWithCompletion:(void (^)(BOOL canceled))displayCompletionBlock; +- (void)setNeedsDisplayWithCompletion:(void (^ _Nullable)(BOOL canceled))displayCompletionBlock; @end @@ -131,3 +132,4 @@ asimagenode_modification_block_t ASImageNodeRoundBorderModificationBlock(CGFloat asimagenode_modification_block_t ASImageNodeTintColorModificationBlock(UIColor *color); ASDISPLAYNODE_EXTERN_C_END +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/ASImageNode.mm b/AsyncDisplayKit/ASImageNode.mm index dce8d0f0..48bd06aa 100644 --- a/AsyncDisplayKit/ASImageNode.mm +++ b/AsyncDisplayKit/ASImageNode.mm @@ -260,7 +260,7 @@ } #pragma mark - -- (void)setNeedsDisplayWithCompletion:(void (^)(BOOL canceled))displayCompletionBlock +- (void)setNeedsDisplayWithCompletion:(void (^ _Nullable)(BOOL canceled))displayCompletionBlock { if (self.displaySuspended) { if (displayCompletionBlock) diff --git a/AsyncDisplayKit/ASMultiplexImageNode.h b/AsyncDisplayKit/ASMultiplexImageNode.h index db10daa3..4ee7c7f1 100644 --- a/AsyncDisplayKit/ASMultiplexImageNode.h +++ b/AsyncDisplayKit/ASMultiplexImageNode.h @@ -9,10 +9,13 @@ #import #import +NS_ASSUME_NONNULL_BEGIN @protocol ASMultiplexImageNodeDelegate; @protocol ASMultiplexImageNodeDataSource; +typedef __kindof NSObject * ImageIdentifier; + extern NSString *const ASMultiplexImageNodeErrorDomain; /** @@ -77,7 +80,7 @@ typedef NS_ENUM(NSUInteger, ASMultiplexImageNodeErrorCode) { * * @see for more information on the image loading process. */ -@property (nonatomic, readwrite, copy) NSArray *imageIdentifiers; +@property (nonatomic, readwrite, copy) NSArray *imageIdentifiers; /** * @abstract Notify the receiver that its data source has new UIImages or NSURLs available for . @@ -91,12 +94,12 @@ typedef NS_ENUM(NSUInteger, ASMultiplexImageNodeErrorCode) { * * @discussion This value may differ from if the image hasn't yet been displayed. */ -@property (nonatomic, readonly) id loadedImageIdentifier; +@property (nullable, nonatomic, readonly) ImageIdentifier loadedImageIdentifier; /** * @abstract The identifier for the image that the receiver is currently displaying, or nil. */ -@property (nonatomic, readonly) id displayedImageIdentifier; +@property (nullable, nonatomic, readonly) ImageIdentifier displayedImageIdentifier; @end @@ -124,7 +127,7 @@ typedef NS_ENUM(NSUInteger, ASMultiplexImageNodeErrorCode) { */ - (void)multiplexImageNode:(ASMultiplexImageNode *)imageNode didUpdateDownloadProgress:(CGFloat)downloadProgress - forImageWithIdentifier:(id)imageIdentifier; + forImageWithIdentifier:(ImageIdentifier)imageIdentifier; /** * @abstract Notification that the image node's download has finished. @@ -133,8 +136,8 @@ typedef NS_ENUM(NSUInteger, ASMultiplexImageNodeErrorCode) { * @param error The error that occurred while downloading, if one occurred; nil otherwise. */ - (void)multiplexImageNode:(ASMultiplexImageNode *)imageNode -didFinishDownloadingImageWithIdentifier:(id)imageIdentifier - error:(NSError *)error; +didFinishDownloadingImageWithIdentifier:(ImageIdentifier)imageIdentifier + error:(nullable NSError *)error; /** * @abstract Notification that the image node's image was updated. @@ -147,10 +150,10 @@ didFinishDownloadingImageWithIdentifier:(id)imageIdentifier * @see <[ASMultiplexImageNodeDelegate multiplexImageNode:didDisplayUpdatedImage:withIdentifier:]>. */ - (void)multiplexImageNode:(ASMultiplexImageNode *)imageNode - didUpdateImage:(UIImage *)image - withIdentifier:(id)imageIdentifier - fromImage:(UIImage *)previousImage - withIdentifier:(id)previousImageIdentifier; + didUpdateImage:(nullable UIImage *)image + withIdentifier:(nullable ImageIdentifier)imageIdentifier + fromImage:(nullable UIImage *)previousImage + withIdentifier:(nullable ImageIdentifier)previousImageIdentifier; /** * @abstract Notification that the image node displayed a new image. @@ -160,8 +163,8 @@ didFinishDownloadingImageWithIdentifier:(id)imageIdentifier * @discussion This method is only called when `image` changes, and not on subsequent redisplays of the same image. */ - (void)multiplexImageNode:(ASMultiplexImageNode *)imageNode - didDisplayUpdatedImage:(UIImage *)image - withIdentifier:(id)imageIdentifier; + didDisplayUpdatedImage:(nullable UIImage *)image + withIdentifier:(nullable ImageIdentifier)imageIdentifier; /** * @abstract Notification that the image node finished displaying an image. @@ -189,7 +192,7 @@ didFinishDownloadingImageWithIdentifier:(id)imageIdentifier * URL to the image via -multiplexImageNode:URLForImageIdentifier:. * @returns A UIImage corresponding to `imageIdentifier`, or nil if none is available. */ -- (UIImage *)multiplexImageNode:(ASMultiplexImageNode *)imageNode imageForImageIdentifier:(id)imageIdentifier; +- (nullable UIImage *)multiplexImageNode:(ASMultiplexImageNode *)imageNode imageForImageIdentifier:(ImageIdentifier)imageIdentifier; /** * @abstract An image URL for the specified identifier. @@ -200,6 +203,8 @@ didFinishDownloadingImageWithIdentifier:(id)imageIdentifier * multiplexImageNode:imageForImageIdentifier:]> instead. * @returns An NSURL for the image identified by `imageIdentifier`, or nil if none is available. */ -- (NSURL *)multiplexImageNode:(ASMultiplexImageNode *)imageNode URLForImageIdentifier:(id)imageIdentifier; +- (nullable NSURL *)multiplexImageNode:(ASMultiplexImageNode *)imageNode URLForImageIdentifier:(ImageIdentifier)imageIdentifier; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/ASNetworkImageNode.h b/AsyncDisplayKit/ASNetworkImageNode.h index 5dc72352..b3961e10 100644 --- a/AsyncDisplayKit/ASNetworkImageNode.h +++ b/AsyncDisplayKit/ASNetworkImageNode.h @@ -9,6 +9,7 @@ #import #import +NS_ASSUME_NONNULL_BEGIN @protocol ASNetworkImageNodeDelegate; @@ -32,7 +33,7 @@ * * @returns An initialized ASNetworkImageNode. */ -- (instancetype)initWithCache:(id)cache downloader:(id)downloader; +- (instancetype)initWithCache:(nullable id)cache downloader:(id)downloader NS_DESIGNATED_INITIALIZER; /** * Convenience initialiser. @@ -49,14 +50,14 @@ /** * A placeholder image to display while the URL is loading. */ -@property (atomic, strong, readwrite) UIImage *defaultImage; +@property (nullable, atomic, strong, readwrite) UIImage *defaultImage; /** * The URL of a new image to download and display. * * @discussion Changing this property will reset the displayed image to a placeholder () while loading. */ -@property (atomic, strong, readwrite) NSURL *URL; +@property (nullable, atomic, strong, readwrite) NSURL *URL; /** * Download and display a new image. @@ -65,7 +66,7 @@ * * @param reset Whether to display a placeholder () while loading the new image. */ -- (void)setURL:(NSURL *)URL resetToDefault:(BOOL)reset; +- (void)setURL:(nullable NSURL *)URL resetToDefault:(BOOL)reset; /** * If is a local file, set this property to YES to take advantage of UIKit's image cacheing. Defaults to YES. @@ -102,3 +103,5 @@ - (void)imageNodeDidFinishDecoding:(ASNetworkImageNode *)imageNode; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/ASScrollNode.h b/AsyncDisplayKit/ASScrollNode.h index a53090bd..de6c5755 100644 --- a/AsyncDisplayKit/ASScrollNode.h +++ b/AsyncDisplayKit/ASScrollNode.h @@ -10,6 +10,7 @@ #import +NS_ASSUME_NONNULL_BEGIN /** * Simple node that wraps UIScrollView. @@ -22,3 +23,5 @@ @property (nonatomic, readonly, strong) UIScrollView *view; @end + +NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/AsyncDisplayKit/ASTableView.h b/AsyncDisplayKit/ASTableView.h index ed3ecd62..3e42518b 100644 --- a/AsyncDisplayKit/ASTableView.h +++ b/AsyncDisplayKit/ASTableView.h @@ -18,6 +18,7 @@ @protocol ASTableViewDataSource; @protocol ASTableViewDelegate; +NS_ASSUME_NONNULL_BEGIN /** * Node-based table view. @@ -84,7 +85,7 @@ * the main thread. * @warning This method is substantially more expensive than UITableView's version. */ --(void)reloadDataWithCompletion:(void (^)())completion; +-(void)reloadDataWithCompletion:(void (^ _Nullable)())completion; /** * Reload everything from scratch, destroying the working range and all cached nodes. @@ -120,7 +121,7 @@ * Boolean parameter that contains the value YES if all of the related animations completed successfully or * NO if they were interrupted. This parameter may be nil. If supplied, the block is run on the main thread. */ -- (void)endUpdatesAnimated:(BOOL)animated completion:(void (^)(BOOL completed))completion; +- (void)endUpdatesAnimated:(BOOL)animated completion:(void (^ _Nullable)(BOOL completed))completion; /** * Inserts one or more sections, with an option to animate the insertion. @@ -180,7 +181,7 @@ * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes * before this method is called. */ -- (void)insertRowsAtIndexPaths:(NSArray *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation; +- (void)insertRowsAtIndexPaths:(NSArray *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation; /** * Deletes the rows specified by an array of index paths, with an option to animate the deletion. @@ -192,7 +193,7 @@ * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes * before this method is called. */ -- (void)deleteRowsAtIndexPaths:(NSArray *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation; +- (void)deleteRowsAtIndexPaths:(NSArray *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation; /** * Reloads the specified rows using a given animation effect. @@ -204,7 +205,7 @@ * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes * before this method is called. */ -- (void)reloadRowsAtIndexPaths:(NSArray *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation; +- (void)reloadRowsAtIndexPaths:(NSArray *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation; /** * Moves the row at a specified location to a destination location. @@ -232,7 +233,7 @@ * * @returns an array containing the nodes being displayed on screen. */ -- (NSArray *)visibleNodes; +- (NSArray *)visibleNodes; /** * YES to automatically adjust the contentOffset when cells are inserted or deleted "before" @@ -298,7 +299,7 @@ @optional - (void)tableView:(ASTableView *)tableView willDisplayNodeForRowAtIndexPath:(NSIndexPath *)indexPath; -- (void)tableView:(ASTableView *)tableView didEndDisplayingNodeForRowAtIndexPath:(NSIndexPath*)indexPath; +- (void)tableView:(ASTableView *)tableView didEndDisplayingNodeForRowAtIndexPath:(NSIndexPath *)indexPath; /** * Receive a message that the tableView is near the end of its data set and more data should be fetched if necessary. @@ -334,3 +335,5 @@ @property (nonatomic, assign) ASRangeTuningParameters rangeTuningParameters ASDISPLAYNODE_DEPRECATED; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/ASTableViewProtocols.h b/AsyncDisplayKit/ASTableViewProtocols.h index 84458179..df8bb811 100644 --- a/AsyncDisplayKit/ASTableViewProtocols.h +++ b/AsyncDisplayKit/ASTableViewProtocols.h @@ -6,6 +6,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ +NS_ASSUME_NONNULL_BEGIN + /** * This is a subset of UITableViewDataSource. * @@ -21,14 +23,14 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView; -- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section; -- (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section; +- (nullable NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section; +- (nullable NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section; - (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath; - (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath; -- (NSArray *)sectionIndexTitlesForTableView:(UITableView *)tableView; +- (nullable NSArray *)sectionIndexTitlesForTableView:(UITableView *)tableView; - (NSInteger)tableView:(UITableView *)tableView sectionForSectionIndexTitle:(NSString *)title atIndex:(NSInteger)index; - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath; @@ -55,8 +57,8 @@ - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section; - (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section; -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section; -- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section; +- (nullable UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section; +- (nullable UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section; - (void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath; @@ -64,14 +66,14 @@ - (void)tableView:(UITableView *)tableView didHighlightRowAtIndexPath:(NSIndexPath *)indexPath; - (void)tableView:(UITableView *)tableView didUnhighlightRowAtIndexPath:(NSIndexPath *)indexPath; -- (NSIndexPath *)tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath; -- (NSIndexPath *)tableView:(UITableView *)tableView willDeselectRowAtIndexPath:(NSIndexPath *)indexPath; +- (nullable NSIndexPath *)tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath; +- (nullable NSIndexPath *)tableView:(UITableView *)tableView willDeselectRowAtIndexPath:(NSIndexPath *)indexPath; - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath; - (void)tableView:(UITableView *)tableView didDeselectRowAtIndexPath:(NSIndexPath *)indexPath; - (UITableViewCellEditingStyle)tableView:(UITableView *)tableView editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath; -- (NSString *)tableView:(UITableView *)tableView titleForDeleteConfirmationButtonForRowAtIndexPath:(NSIndexPath *)indexPath; -- (NSArray *)tableView:(UITableView *)tableView editActionsForRowAtIndexPath:(NSIndexPath *)indexPath; +- (nullable NSString *)tableView:(UITableView *)tableView titleForDeleteConfirmationButtonForRowAtIndexPath:(NSIndexPath *)indexPath; +- (nullable NSArray *)tableView:(UITableView *)tableView editActionsForRowAtIndexPath:(NSIndexPath *)indexPath; - (BOOL)tableView:(UITableView *)tableView shouldIndentWhileEditingRowAtIndexPath:(NSIndexPath *)indexPath; @@ -83,7 +85,9 @@ - (NSInteger)tableView:(UITableView *)tableView indentationLevelForRowAtIndexPath:(NSIndexPath *)indexPath; - (BOOL)tableView:(UITableView *)tableView shouldShowMenuForRowAtIndexPath:(NSIndexPath *)indexPath; -- (BOOL)tableView:(UITableView *)tableView canPerformAction:(SEL)action forRowAtIndexPath:(NSIndexPath *)indexPath withSender:(id)sender; -- (void)tableView:(UITableView *)tableView performAction:(SEL)action forRowAtIndexPath:(NSIndexPath *)indexPath withSender:(id)sender; +- (BOOL)tableView:(UITableView *)tableView canPerformAction:(SEL)action forRowAtIndexPath:(NSIndexPath *)indexPath withSender:(nullable id)sender; +- (void)tableView:(UITableView *)tableView performAction:(SEL)action forRowAtIndexPath:(NSIndexPath *)indexPath withSender:(nullable id)sender; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/ASTextNode.h b/AsyncDisplayKit/ASTextNode.h index e8d5b761..e7fdf85f 100644 --- a/AsyncDisplayKit/ASTextNode.h +++ b/AsyncDisplayKit/ASTextNode.h @@ -8,6 +8,8 @@ #import +NS_ASSUME_NONNULL_BEGIN + @protocol ASTextNodeDelegate; /** @@ -36,7 +38,7 @@ typedef NS_ENUM(NSUInteger, ASTextNodeHighlightStyle) { @discussion Defaults to nil, no text is shown. For inline image attachments, add an attribute of key NSAttachmentAttributeName, with a value of an NSTextAttachment. */ -@property (nonatomic, copy) NSAttributedString *attributedString; +@property (nullable, nonatomic, copy) NSAttributedString *attributedString; #pragma mark - Truncation @@ -75,14 +77,14 @@ typedef NS_ENUM(NSUInteger, ASTextNodeHighlightStyle) { */ @property (nonatomic, readonly, assign) NSUInteger lineCount; -@property (nonatomic, strong) NSArray *exclusionPaths; +@property (nonatomic, strong) NSArray *exclusionPaths; #pragma mark - Placeholders /** @abstract The placeholder color. */ -@property (nonatomic, strong) UIColor *placeholderColor; +@property (nullable, nonatomic, strong) UIColor *placeholderColor; /** @abstract Inset each line of the placeholder. @@ -118,7 +120,7 @@ typedef NS_ENUM(NSUInteger, ASTextNodeHighlightStyle) { a line break, the rects returned will be on opposite sides and different lines). The rects returned are in the coordinate system of the receiver. */ -- (NSArray *)rectsForTextRange:(NSRange)textRange; +- (NSArray *)rectsForTextRange:(NSRange)textRange; /** @abstract Returns an array of rects used for highlighting the characters in a given text range. @@ -129,7 +131,7 @@ typedef NS_ENUM(NSUInteger, ASTextNodeHighlightStyle) { are in the coordinate system of the receiver. This method is useful for visual coordination with a highlighted range of text. */ -- (NSArray *)highlightRectsForTextRange:(NSRange)textRange; +- (NSArray *)highlightRectsForTextRange:(NSRange)textRange; /** @abstract Returns a bounding rect for the given text range. @@ -153,7 +155,7 @@ typedef NS_ENUM(NSUInteger, ASTextNodeHighlightStyle) { /** @abstract The set of attribute names to consider links. Defaults to NSLinkAttributeName. */ -@property (nonatomic, copy) NSArray *linkAttributeNames; +@property (nonatomic, copy) NSArray *linkAttributeNames; /** @abstract Indicates whether the receiver has an entity at a given point. @@ -162,7 +164,7 @@ typedef NS_ENUM(NSUInteger, ASTextNodeHighlightStyle) { @param rangeOut The ultimate range of the found text. Can be NULL. @result YES if an entity exists at `point`; NO otherwise. */ -- (id)linkAttributeValueAtPoint:(CGPoint)point attributeName:(out NSString **)attributeNameOut range:(out NSRange *)rangeOut; +- (nullable id)linkAttributeValueAtPoint:(CGPoint)point attributeName:(out NSString * _Nullable * _Nullable)attributeNameOut range:(out NSRange * _Nullable)rangeOut; /** @abstract The style to use when highlighting text. @@ -253,3 +255,5 @@ typedef NS_ENUM(NSUInteger, ASTextNodeHighlightStyle) { - (BOOL)textNode:(ASTextNode *)textNode shouldLongPressLinkAttribute:(NSString *)attribute value:(id)value atPoint:(CGPoint)point; @end + +NS_ASSUME_NONNULL_END diff --git a/examples/Swift/Sample.xcodeproj/project.pbxproj b/examples/Swift/Sample.xcodeproj/project.pbxproj index 4a845e16..4aec090c 100644 --- a/examples/Swift/Sample.xcodeproj/project.pbxproj +++ b/examples/Swift/Sample.xcodeproj/project.pbxproj @@ -128,6 +128,8 @@ 050E7C6619D22E19004363C2 /* Project object */ = { isa = PBXProject; attributes = { + LastSwiftMigration = 0700; + LastSwiftUpdateCheck = 0700; LastUpgradeCheck = 0600; ORGANIZATIONNAME = Facebook; TargetAttributes = { diff --git a/examples/Swift/Sample/ViewController.swift b/examples/Swift/Sample/ViewController.swift index 9801a205..037e0965 100644 --- a/examples/Swift/Sample/ViewController.swift +++ b/examples/Swift/Sample/ViewController.swift @@ -27,7 +27,7 @@ class ViewController: UIViewController, ASTableViewDataSource, ASTableViewDelega self.tableView.asyncDelegate = self } - required init(coder aDecoder: NSCoder) { + required init?(coder aDecoder: NSCoder) { fatalError("storyboards are incompatible with truth and beauty") } From 262d65eea9a18e7728e282c6992911df55823ddd Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Wed, 16 Sep 2015 15:34:24 -0700 Subject: [PATCH 02/37] More updates --- AsyncDisplayKit/ASImageNode.h | 4 ++-- AsyncDisplayKit/ASMultiplexImageNode.h | 2 +- AsyncDisplayKitTests/ASDisplayNodeTests.m | 18 ------------------ .../ASLayoutSpecSnapshotTestsHelper.m | 2 +- 4 files changed, 4 insertions(+), 22 deletions(-) diff --git a/AsyncDisplayKit/ASImageNode.h b/AsyncDisplayKit/ASImageNode.h index 961da075..2afdcbda 100644 --- a/AsyncDisplayKit/ASImageNode.h +++ b/AsyncDisplayKit/ASImageNode.h @@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN * * @returns A transformed image. */ -typedef UIImage *(^asimagenode_modification_block_t)(UIImage *image); +typedef UIImage * _Nullable (^asimagenode_modification_block_t)(UIImage *image); /** @@ -86,7 +86,7 @@ typedef UIImage *(^asimagenode_modification_block_t)(UIImage *image); * @discussion Can be used to add image effects (such as rounding, adding * borders, or other pattern overlays) without extraneous display calls. */ -@property (nonatomic, readwrite, copy) asimagenode_modification_block_t imageModificationBlock; +@property (nullable, nonatomic, readwrite, copy) asimagenode_modification_block_t imageModificationBlock; /** * @abstract Marks the receiver as needing display and performs a block after diff --git a/AsyncDisplayKit/ASMultiplexImageNode.h b/AsyncDisplayKit/ASMultiplexImageNode.h index 4ee7c7f1..027d9b3d 100644 --- a/AsyncDisplayKit/ASMultiplexImageNode.h +++ b/AsyncDisplayKit/ASMultiplexImageNode.h @@ -50,7 +50,7 @@ typedef NS_ENUM(NSUInteger, ASMultiplexImageNodeErrorCode) { * @discussion If `cache` is nil, the receiver will not attempt to retrieve images from a cache before downloading them. * @returns An initialized ASMultiplexImageNode. */ -- (instancetype)initWithCache:(id)cache downloader:(id)downloader NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithCache:(nullable id)cache downloader:(nullable id)downloader NS_DESIGNATED_INITIALIZER; /** * @abstract The delegate, which must conform to the protocol. diff --git a/AsyncDisplayKitTests/ASDisplayNodeTests.m b/AsyncDisplayKitTests/ASDisplayNodeTests.m index 4ce0c49b..cd0b273f 100644 --- a/AsyncDisplayKitTests/ASDisplayNodeTests.m +++ b/AsyncDisplayKitTests/ASDisplayNodeTests.m @@ -1042,7 +1042,6 @@ static inline BOOL _CGPointEqualToPointWithEpsilon(CGPoint point1, CGPoint point - (void)testSubnodes { ASDisplayNode *parent = [[ASDisplayNode alloc] init]; - XCTAssertNoThrow([parent addSubnode:nil], @"Don't try to add nil, but we'll deal."); XCTAssertNoThrow([parent addSubnode:parent], @"Not good, test that we recover"); XCTAssertEqual(0u, parent.subnodes.count, @"We shouldn't have any subnodes"); } @@ -1456,15 +1455,9 @@ static inline BOOL _CGPointEqualToPointWithEpsilon(CGPoint point1, CGPoint point XCTAssertNodeSubnodeSubviewSublayerOrder(parent, loaded, isLayerBacked, @"c,a,b", @"Incorrect insertion below"); XCTAssertNodesHaveParent(parent, a, b, c); - // Check insertSubnode with no below - XCTAssertThrows([parent insertSubnode:b belowSubnode:nil], @"Can't insert below a nil"); // Check nothing was inserted XCTAssertNodeSubnodeSubviewSublayerOrder(parent, loaded, isLayerBacked, @"c,a,b", @"Incorrect insertion below"); - - XCTAssertThrows([parent insertSubnode:nil belowSubnode:nil], @"Can't insert a nil subnode"); - XCTAssertThrows([parent insertSubnode:nil belowSubnode:a], @"Can't insert a nil subnode"); - // Check inserting below when you're already in the array // (c,a,b) => (a,c,b) [parent insertSubnode:c belowSubnode:b]; @@ -1535,17 +1528,6 @@ static inline BOOL _CGPointEqualToPointWithEpsilon(CGPoint point1, CGPoint point [parent insertSubnode:c aboveSubnode:a]; XCTAssertNodeSubnodeSubviewSublayerOrder(parent, loaded, isLayerBacked, @"a,c,b", @"After insert c above a"); - // Check insertSubnode with invalid parameters throws and doesn't change anything - // (a,c,b) => (a,c,b) - XCTAssertThrows([parent insertSubnode:b aboveSubnode:nil], @"Can't insert below a nil"); - XCTAssertNodeSubnodeSubviewSublayerOrder(parent, loaded, isLayerBacked, @"a,c,b", @"Check no monkey business"); - - XCTAssertThrows([parent insertSubnode:nil aboveSubnode:nil], @"Can't insert a nil subnode"); - XCTAssertNodeSubnodeSubviewSublayerOrder(parent, loaded, isLayerBacked, @"a,c,b", @"Check no monkey business"); - - XCTAssertThrows([parent insertSubnode:nil aboveSubnode:a], @"Can't insert a nil subnode"); - XCTAssertNodeSubnodeSubviewSublayerOrder(parent, loaded, isLayerBacked, @"a,c,b", @"Check no monkey business"); - // Check inserting above when you're already in the array // (a,c,b) => (c,b,a) [parent insertSubnode:a aboveSubnode:b]; diff --git a/AsyncDisplayKitTests/ASLayoutSpecSnapshotTestsHelper.m b/AsyncDisplayKitTests/ASLayoutSpecSnapshotTestsHelper.m index 4cd9232f..92895d5a 100644 --- a/AsyncDisplayKitTests/ASLayoutSpecSnapshotTestsHelper.m +++ b/AsyncDisplayKitTests/ASLayoutSpecSnapshotTestsHelper.m @@ -57,7 +57,7 @@ layout.position = CGPointZero; layout = [ASLayout layoutWithLayoutableObject:self size:layout.size sublayouts:@[layout]]; _layoutUnderTest = [layout flattenedLayoutUsingPredicateBlock:^BOOL(ASLayout *evaluatedLayout) { - return [self.subnodes containsObject:evaluatedLayout.layoutableObject]; + return [self.subnodes containsObject:(ASDisplayNode *)evaluatedLayout.layoutableObject]; }]; self.frame = CGRectMake(0, 0, _layoutUnderTest.size.width, _layoutUnderTest.size.height); [self measure:_layoutUnderTest.size]; From 04690c0a4c8a6450b6e5e69f532588700da6a4d9 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Wed, 16 Sep 2015 15:36:52 -0700 Subject: [PATCH 03/37] Re-add nil tests --- AsyncDisplayKitTests/ASDisplayNodeTests.m | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/AsyncDisplayKitTests/ASDisplayNodeTests.m b/AsyncDisplayKitTests/ASDisplayNodeTests.m index cd0b273f..75adeee1 100644 --- a/AsyncDisplayKitTests/ASDisplayNodeTests.m +++ b/AsyncDisplayKitTests/ASDisplayNodeTests.m @@ -1042,6 +1042,8 @@ static inline BOOL _CGPointEqualToPointWithEpsilon(CGPoint point1, CGPoint point - (void)testSubnodes { ASDisplayNode *parent = [[ASDisplayNode alloc] init]; + ASDisplayNode *nilNode = nil; + XCTAssertNoThrow([parent addSubnode:nilNode], @"Don't try to add nil, but we'll deal."); XCTAssertNoThrow([parent addSubnode:parent], @"Not good, test that we recover"); XCTAssertEqual(0u, parent.subnodes.count, @"We shouldn't have any subnodes"); } @@ -1455,9 +1457,16 @@ static inline BOOL _CGPointEqualToPointWithEpsilon(CGPoint point1, CGPoint point XCTAssertNodeSubnodeSubviewSublayerOrder(parent, loaded, isLayerBacked, @"c,a,b", @"Incorrect insertion below"); XCTAssertNodesHaveParent(parent, a, b, c); + // Check insertSubnode with no below + ASDisplayNode *nilNode = nil; + XCTAssertThrows([parent insertSubnode:b belowSubnode:nilNode], @"Can't insert below a nil"); // Check nothing was inserted XCTAssertNodeSubnodeSubviewSublayerOrder(parent, loaded, isLayerBacked, @"c,a,b", @"Incorrect insertion below"); + + XCTAssertThrows([parent insertSubnode:nilNode belowSubnode:nilNode], @"Can't insert a nil subnode"); + XCTAssertThrows([parent insertSubnode:nilNode belowSubnode:a], @"Can't insert a nil subnode"); + // Check inserting below when you're already in the array // (c,a,b) => (a,c,b) [parent insertSubnode:c belowSubnode:b]; @@ -1528,6 +1537,18 @@ static inline BOOL _CGPointEqualToPointWithEpsilon(CGPoint point1, CGPoint point [parent insertSubnode:c aboveSubnode:a]; XCTAssertNodeSubnodeSubviewSublayerOrder(parent, loaded, isLayerBacked, @"a,c,b", @"After insert c above a"); + // Check insertSubnode with invalid parameters throws and doesn't change anything + // (a,c,b) => (a,c,b) + ASDisplayNode *nilNode = nil; + XCTAssertThrows([parent insertSubnode:b aboveSubnode:nilNode], @"Can't insert below a nil"); + XCTAssertNodeSubnodeSubviewSublayerOrder(parent, loaded, isLayerBacked, @"a,c,b", @"Check no monkey business"); + + XCTAssertThrows([parent insertSubnode:nilNode aboveSubnode:nilNode], @"Can't insert a nil subnode"); + XCTAssertNodeSubnodeSubviewSublayerOrder(parent, loaded, isLayerBacked, @"a,c,b", @"Check no monkey business"); + + XCTAssertThrows([parent insertSubnode:nilNode aboveSubnode:a], @"Can't insert a nil subnode"); + XCTAssertNodeSubnodeSubviewSublayerOrder(parent, loaded, isLayerBacked, @"a,c,b", @"Check no monkey business"); + // Check inserting above when you're already in the array // (a,c,b) => (c,b,a) [parent insertSubnode:a aboveSubnode:b]; From 30ed0bd64ae09754ca3cc57491aef2742cdbaac2 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Wed, 16 Sep 2015 15:39:06 -0700 Subject: [PATCH 04/37] Restore old ASCollectionNode init --- AsyncDisplayKit/ASCollectionNode.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AsyncDisplayKit/ASCollectionNode.m b/AsyncDisplayKit/ASCollectionNode.m index 29332897..315992a4 100644 --- a/AsyncDisplayKit/ASCollectionNode.m +++ b/AsyncDisplayKit/ASCollectionNode.m @@ -13,7 +13,8 @@ - (instancetype)init { ASDISPLAYNODE_NOT_DESIGNATED_INITIALIZER(); - self = [self initWithCollectionViewLayout:[UICollectionViewFlowLayout new]]; + UICollectionViewLayout *nilLayout = nil; + self = [self initWithCollectionViewLayout:nilLayout]; // Will throw an exception for lacking a UICV Layout. return nil; } From a7240bac275aee897f1ed7f9ec62380c7b3053b3 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Wed, 16 Sep 2015 15:41:56 -0700 Subject: [PATCH 05/37] More objective-C cleanup --- AsyncDisplayKit/ASCellNode.h | 2 +- AsyncDisplayKit/ASCollectionNode.h | 2 +- AsyncDisplayKit/ASDisplayNode.h | 6 +++--- AsyncDisplayKit/ASDisplayNodeExtras.h | 2 +- AsyncDisplayKit/ASEditableTextNode.h | 2 +- AsyncDisplayKit/ASScrollNode.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AsyncDisplayKit/ASCellNode.h b/AsyncDisplayKit/ASCellNode.h index 380eddbe..32e24be6 100644 --- a/AsyncDisplayKit/ASCellNode.h +++ b/AsyncDisplayKit/ASCellNode.h @@ -45,4 +45,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END \ No newline at end of file +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/ASCollectionNode.h b/AsyncDisplayKit/ASCollectionNode.h index 46301402..8292280a 100644 --- a/AsyncDisplayKit/ASCollectionNode.h +++ b/AsyncDisplayKit/ASCollectionNode.h @@ -22,4 +22,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END \ No newline at end of file +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/ASDisplayNode.h b/AsyncDisplayKit/ASDisplayNode.h index 0cfdae93..7412a497 100644 --- a/AsyncDisplayKit/ASDisplayNode.h +++ b/AsyncDisplayKit/ASDisplayNode.h @@ -585,7 +585,7 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); @property (atomic, assign) CGFloat contentsScale; // default=1.0f. See @contentsScaleForDisplay for more info @property (atomic, assign) CATransform3D transform; // default=CATransform3DIdentity @property (atomic, assign) CATransform3D subnodeTransform; // default=CATransform3DIdentity -@property (atomic, copy, nullable) NSString *name; // default=nil. Use this to tag your layers in the server-recurse-description / pca or for your own purposes +@property (atomic, copy, nullable) NSString *name; // default=nil. Use this to tag your layers in the server-recurse-description / pca or for your own purposes /** * @abstract The node view's background color. @@ -593,9 +593,9 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); * @discussion In contrast to UIView, setting a transparent color will not set opaque = NO. * This only affects nodes that implement +drawRect like ASTextNode. */ -@property (atomic, retain, nullable) UIColor *backgroundColor; // default=nil +@property (atomic, retain, nullable) UIColor *backgroundColor; // default=nil -@property (atomic, retain, null_resettable) UIColor *tintColor; // default=Blue +@property (atomic, retain, null_resettable) UIColor *tintColor; // default=Blue - (void)tintColorDidChange; // Notifies the node when the tintColor has changed. /** diff --git a/AsyncDisplayKit/ASDisplayNodeExtras.h b/AsyncDisplayKit/ASDisplayNodeExtras.h index 521dce25..060cadcc 100644 --- a/AsyncDisplayKit/ASDisplayNodeExtras.h +++ b/AsyncDisplayKit/ASDisplayNodeExtras.h @@ -72,4 +72,4 @@ extern void ASDisplayNodeEnableHierarchyNotifications(ASDisplayNode *node); ASDISPLAYNODE_EXTERN_C_END -NS_ASSUME_NONNULL_END \ No newline at end of file +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/ASEditableTextNode.h b/AsyncDisplayKit/ASEditableTextNode.h index 232fd8ec..6c4b4582 100644 --- a/AsyncDisplayKit/ASEditableTextNode.h +++ b/AsyncDisplayKit/ASEditableTextNode.h @@ -138,4 +138,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END \ No newline at end of file +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/ASScrollNode.h b/AsyncDisplayKit/ASScrollNode.h index de6c5755..32733ffe 100644 --- a/AsyncDisplayKit/ASScrollNode.h +++ b/AsyncDisplayKit/ASScrollNode.h @@ -24,4 +24,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END \ No newline at end of file +NS_ASSUME_NONNULL_END From e4dc823c0dfa63c45a6aa8bebfc68cf3bbadeeec Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Wed, 16 Sep 2015 16:21:07 -0700 Subject: [PATCH 06/37] hitTest:withEvent: return value should be nullable --- AsyncDisplayKit/ASControlNode+Subclasses.h | 2 +- AsyncDisplayKit/ASDisplayNode+Subclasses.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AsyncDisplayKit/ASControlNode+Subclasses.h b/AsyncDisplayKit/ASControlNode+Subclasses.h index 90c5f68e..085eb9bb 100644 --- a/AsyncDisplayKit/ASControlNode+Subclasses.h +++ b/AsyncDisplayKit/ASControlNode+Subclasses.h @@ -63,4 +63,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END \ No newline at end of file +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/ASDisplayNode+Subclasses.h b/AsyncDisplayKit/ASDisplayNode+Subclasses.h index 5814376d..3ecd08e1 100644 --- a/AsyncDisplayKit/ASDisplayNode+Subclasses.h +++ b/AsyncDisplayKit/ASDisplayNode+Subclasses.h @@ -361,7 +361,7 @@ NS_ASSUME_NONNULL_BEGIN * 1) allows sending events to plain UIViews that don't have attached nodes, * 2) hitTest: is never called before the views are created. */ -- (UIView *)hitTest:(CGPoint)point withEvent:(nullable UIEvent *)event; +- (nullable UIView *)hitTest:(CGPoint)point withEvent:(nullable UIEvent *)event; /** @name Observing node-related changes */ From 6bcd245c6db43865d24fbb2808a7704d72c9a26d Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Wed, 16 Sep 2015 17:03:33 -0700 Subject: [PATCH 07/37] Bump the .travis.yml OS X image requirement for Xcode 7 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 35dc2d00..4d09065e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: objective-c +osx_image: xcode7 before_install: - brew update - brew reinstall xctool From 717df1cfd2681c0660d802e40f2d4625b7c5f614 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Thu, 17 Sep 2015 11:39:59 -0700 Subject: [PATCH 08/37] Merge latest master and update Layout headers --- AsyncDisplayKit/ASViewController.h | 5 ++++- AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.h | 13 ++++++++----- AsyncDisplayKit/Layout/ASCenterLayoutSpec.h | 4 ++++ AsyncDisplayKit/Layout/ASDimension.h | 2 ++ AsyncDisplayKit/Layout/ASInsetLayoutSpec.h | 6 +++++- AsyncDisplayKit/Layout/ASLayout.h | 10 +++++++--- AsyncDisplayKit/Layout/ASLayoutOptions.h | 7 ++++++- AsyncDisplayKit/Layout/ASLayoutSpec.h | 13 +++++++++---- AsyncDisplayKit/Layout/ASLayoutable.h | 4 ++++ AsyncDisplayKit/Layout/ASOverlayLayoutSpec.h | 8 ++++++-- AsyncDisplayKit/Layout/ASRatioLayoutSpec.h | 4 ++++ AsyncDisplayKit/Layout/ASRelativeSize.h | 2 ++ AsyncDisplayKit/Layout/ASStackLayoutSpec.h | 5 ++++- AsyncDisplayKit/Layout/ASStackLayoutable.h | 4 ++++ AsyncDisplayKit/Layout/ASStaticLayoutSpec.h | 6 +++++- AsyncDisplayKit/Layout/ASStaticLayoutable.h | 4 ++++ 16 files changed, 78 insertions(+), 19 deletions(-) diff --git a/AsyncDisplayKit/ASViewController.h b/AsyncDisplayKit/ASViewController.h index e3b18661..aca6626f 100644 --- a/AsyncDisplayKit/ASViewController.h +++ b/AsyncDisplayKit/ASViewController.h @@ -9,11 +9,14 @@ #import #import +NS_ASSUME_NONNULL_BEGIN + @interface ASViewController : UIViewController @property (nonatomic, strong, readonly) ASDisplayNode *node; -//TODO Use nonnull annotation late on. Travis doesn't recognize it (yet). - (instancetype)initWithNode:(ASDisplayNode *)node; @end + +NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.h b/AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.h index cab51ea8..9f04490c 100644 --- a/AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.h +++ b/AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.h @@ -10,18 +10,21 @@ #import +NS_ASSUME_NONNULL_BEGIN + /** Lays out a single layoutable child, then lays out a background layoutable instance behind it stretched to its size. */ @interface ASBackgroundLayoutSpec : ASLayoutSpec -@property (nonatomic, strong) id background; +@property (nullable, nonatomic, strong) id background; /** - @param child A child that is laid out to determine the size of this spec. If this is nil, then this method - returns nil. - @param background A layoutable object that is laid out behind the child. May be nil, in which case the background is omitted. + @param child A child that is laid out to determine the size of this spec. + @param background A layoutable object that is laid out behind the child. If this is nil, the background is omitted. */ -+ (instancetype)backgroundLayoutSpecWithChild:(id)child background:(id)background; ++ (instancetype)backgroundLayoutSpecWithChild:(id)child background:(nullable id)background; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Layout/ASCenterLayoutSpec.h b/AsyncDisplayKit/Layout/ASCenterLayoutSpec.h index 37ba24e7..f8413d27 100644 --- a/AsyncDisplayKit/Layout/ASCenterLayoutSpec.h +++ b/AsyncDisplayKit/Layout/ASCenterLayoutSpec.h @@ -34,6 +34,8 @@ typedef NS_OPTIONS(NSUInteger, ASCenterLayoutSpecSizingOptions) { ASCenterLayoutSpecSizingOptionMinimumXY = ASCenterLayoutSpecSizingOptionMinimumX | ASCenterLayoutSpecSizingOptionMinimumY, }; +NS_ASSUME_NONNULL_BEGIN + /** Lays out a single layoutable child and position it so that it is centered into the layout bounds. */ @interface ASCenterLayoutSpec : ASLayoutSpec @@ -54,3 +56,5 @@ typedef NS_OPTIONS(NSUInteger, ASCenterLayoutSpecSizingOptions) { child:(id)child; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Layout/ASDimension.h b/AsyncDisplayKit/Layout/ASDimension.h index 590f9486..c96b2155 100644 --- a/AsyncDisplayKit/Layout/ASDimension.h +++ b/AsyncDisplayKit/Layout/ASDimension.h @@ -35,6 +35,7 @@ typedef struct { extern ASRelativeDimension const ASRelativeDimensionUnconstrained; ASDISPLAYNODE_EXTERN_C_BEGIN +NS_ASSUME_NONNULL_BEGIN #pragma mark ASRelativeDimension @@ -70,4 +71,5 @@ extern BOOL ASSizeRangeEqualToSizeRange(ASSizeRange lhs, ASSizeRange rhs); extern NSString *NSStringFromASSizeRange(ASSizeRange sizeRange); +NS_ASSUME_NONNULL_END ASDISPLAYNODE_EXTERN_C_END diff --git a/AsyncDisplayKit/Layout/ASInsetLayoutSpec.h b/AsyncDisplayKit/Layout/ASInsetLayoutSpec.h index ab0a6f10..aa320e94 100644 --- a/AsyncDisplayKit/Layout/ASInsetLayoutSpec.h +++ b/AsyncDisplayKit/Layout/ASInsetLayoutSpec.h @@ -10,6 +10,8 @@ #import +NS_ASSUME_NONNULL_BEGIN + /** A layout spec that wraps another layoutable child, applying insets around it. @@ -33,8 +35,10 @@ /** @param insets The amount of space to inset on each side. - @param child The wrapped child to inset. If nil, this method returns nil. + @param child The wrapped child to inset. */ + (instancetype)insetLayoutSpecWithInsets:(UIEdgeInsets)insets child:(id)child; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Layout/ASLayout.h b/AsyncDisplayKit/Layout/ASLayout.h index 71892b59..4619269d 100644 --- a/AsyncDisplayKit/Layout/ASLayout.h +++ b/AsyncDisplayKit/Layout/ASLayout.h @@ -12,6 +12,8 @@ #import #import +NS_ASSUME_NONNULL_BEGIN + extern CGPoint const CGPointNull; extern BOOL CGPointIsNull(CGPoint point); @@ -30,7 +32,7 @@ extern BOOL CGPointIsNull(CGPoint point); /** * Array of ASLayouts. Each must have a valid non-null position. */ -@property (nonatomic, readonly) NSArray *sublayouts; +@property (nonatomic, readonly) NSArray *sublayouts; /** * Initializer. @@ -46,7 +48,7 @@ extern BOOL CGPointIsNull(CGPoint point); + (instancetype)layoutWithLayoutableObject:(id)layoutableObject size:(CGSize)size position:(CGPoint)position - sublayouts:(NSArray *)sublayouts; + sublayouts:(nullable NSArray *)sublayouts; /** * Convenience initializer that has CGPointNull position. @@ -62,7 +64,7 @@ extern BOOL CGPointIsNull(CGPoint point); */ + (instancetype)layoutWithLayoutableObject:(id)layoutableObject size:(CGSize)size - sublayouts:(NSArray *)sublayouts; + sublayouts:(nullable NSArray *)sublayouts; /** * Convenience that has CGPointNull position and no sublayouts. @@ -89,3 +91,5 @@ extern BOOL CGPointIsNull(CGPoint point); - (ASLayout *)flattenedLayoutUsingPredicateBlock:(BOOL (^)(ASLayout *evaluatedLayout))predicateBlock; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Layout/ASLayoutOptions.h b/AsyncDisplayKit/Layout/ASLayoutOptions.h index 7b9800ff..799f3e6b 100644 --- a/AsyncDisplayKit/Layout/ASLayoutOptions.h +++ b/AsyncDisplayKit/Layout/ASLayoutOptions.h @@ -11,6 +11,8 @@ #import #import +NS_ASSUME_NONNULL_BEGIN + @protocol ASLayoutable; /** @@ -52,7 +54,7 @@ * * @return a new instance of ASLayoutOptions */ -- (instancetype)initWithLayoutable:(id)layoutable; +- (instancetype)initWithLayoutable:(id)layoutable NS_DESIGNATED_INITIALIZER; /** * Copies the values of layoutOptions into self. This is useful when placing a layoutable inside of another. Consider @@ -83,3 +85,6 @@ @property (nonatomic, readwrite) CGPoint layoutPosition; @end + +NS_ASSUME_NONNULL_END + diff --git a/AsyncDisplayKit/Layout/ASLayoutSpec.h b/AsyncDisplayKit/Layout/ASLayoutSpec.h index 2dd00198..15dda10c 100644 --- a/AsyncDisplayKit/Layout/ASLayoutSpec.h +++ b/AsyncDisplayKit/Layout/ASLayoutSpec.h @@ -10,6 +10,8 @@ #import +NS_ASSUME_NONNULL_BEGIN + /** A layout spec is an immutable object that describes a layout, loosely inspired by React. */ @interface ASLayoutSpec : NSObject @@ -69,7 +71,7 @@ * For good measure, in these layout specs it probably makes sense to define * setChild: and setChild:forIdentifier: methods to do something appropriate or to assert. */ -- (void)setChildren:(NSArray *)children; +- (void)setChildren:(NSArray> *)children; /** * Get child methods @@ -83,16 +85,19 @@ */ /** Returns the child added to this layout spec using the default identifier. */ -- (id)child; +- (nullable id)child; /** * Returns the child added to this layout spec using the given identifier. * * @param identifier An identifier associated withe the child. */ -- (id)childForIdentifier:(NSString *)identifier; +- (nullable id)childForIdentifier:(NSString *)identifier; /** Returns all children added to this layout spec. */ -- (NSArray *)children; +- (NSArray> *)children; @end + +NS_ASSUME_NONNULL_END + diff --git a/AsyncDisplayKit/Layout/ASLayoutable.h b/AsyncDisplayKit/Layout/ASLayoutable.h index 7e0e950d..4653e38d 100644 --- a/AsyncDisplayKit/Layout/ASLayoutable.h +++ b/AsyncDisplayKit/Layout/ASLayoutable.h @@ -19,6 +19,8 @@ @class ASLayout; @class ASLayoutSpec; +NS_ASSUME_NONNULL_BEGIN + /** * The ASLayoutable protocol declares a method for measuring the layout of an object. A layout * is defined by an ASLayout return value, and must specify 1) the size (but not position) of the @@ -107,3 +109,5 @@ @property (nonatomic, assign) CGPoint layoutPosition; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Layout/ASOverlayLayoutSpec.h b/AsyncDisplayKit/Layout/ASOverlayLayoutSpec.h index 05e53d92..6e1c321b 100644 --- a/AsyncDisplayKit/Layout/ASOverlayLayoutSpec.h +++ b/AsyncDisplayKit/Layout/ASOverlayLayoutSpec.h @@ -10,13 +10,17 @@ #import +NS_ASSUME_NONNULL_BEGIN + /** This layout spec lays out a single layoutable child and then overlays a layoutable object on top of it streched to its size */ @interface ASOverlayLayoutSpec : ASLayoutSpec -@property (nonatomic, strong) id overlay; +@property (nullable, nonatomic, strong) id overlay; -+ (instancetype)overlayLayoutSpecWithChild:(id)child overlay:(id)overlay; ++ (instancetype)overlayLayoutSpecWithChild:(id)child overlay:(nullable id)overlay; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Layout/ASRatioLayoutSpec.h b/AsyncDisplayKit/Layout/ASRatioLayoutSpec.h index 2affa56a..f9109829 100644 --- a/AsyncDisplayKit/Layout/ASRatioLayoutSpec.h +++ b/AsyncDisplayKit/Layout/ASRatioLayoutSpec.h @@ -11,6 +11,8 @@ #import #import +NS_ASSUME_NONNULL_BEGIN + /** Ratio layout spec For when the content should respect a certain inherent ratio but can be scaled (think photos or videos) @@ -36,3 +38,5 @@ + (instancetype)ratioLayoutSpecWithRatio:(CGFloat)ratio child:(id)child; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Layout/ASRelativeSize.h b/AsyncDisplayKit/Layout/ASRelativeSize.h index 9522d43d..db5d662a 100644 --- a/AsyncDisplayKit/Layout/ASRelativeSize.h +++ b/AsyncDisplayKit/Layout/ASRelativeSize.h @@ -33,6 +33,7 @@ typedef struct { extern ASRelativeSizeRange const ASRelativeSizeRangeUnconstrained; ASDISPLAYNODE_EXTERN_C_BEGIN +NS_ASSUME_NONNULL_BEGIN #pragma mark - #pragma mark ASRelativeSize @@ -70,4 +71,5 @@ extern BOOL ASRelativeSizeRangeEqualToRelativeSizeRange(ASRelativeSizeRange lhs, extern ASSizeRange ASRelativeSizeRangeResolve(ASRelativeSizeRange relativeSizeRange, CGSize parentSize); +NS_ASSUME_NONNULL_END ASDISPLAYNODE_EXTERN_C_END diff --git a/AsyncDisplayKit/Layout/ASStackLayoutSpec.h b/AsyncDisplayKit/Layout/ASStackLayoutSpec.h index dd331f14..d6aa54b1 100644 --- a/AsyncDisplayKit/Layout/ASStackLayoutSpec.h +++ b/AsyncDisplayKit/Layout/ASStackLayoutSpec.h @@ -11,6 +11,7 @@ #import #import +NS_ASSUME_NONNULL_BEGIN /** A simple layout spec that stacks a list of children vertically or horizontally. @@ -55,6 +56,8 @@ @param alignItems Orientation of the children along the cross axis @param children ASLayoutable children to be positioned. */ -+ (instancetype)stackLayoutSpecWithDirection:(ASStackLayoutDirection)direction spacing:(CGFloat)spacing justifyContent:(ASStackLayoutJustifyContent)justifyContent alignItems:(ASStackLayoutAlignItems)alignItems children:(NSArray *)children; ++ (instancetype)stackLayoutSpecWithDirection:(ASStackLayoutDirection)direction spacing:(CGFloat)spacing justifyContent:(ASStackLayoutJustifyContent)justifyContent alignItems:(ASStackLayoutAlignItems)alignItems children:(NSArray> *)children; @end + +NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/AsyncDisplayKit/Layout/ASStackLayoutable.h b/AsyncDisplayKit/Layout/ASStackLayoutable.h index 3ebc9304..9044a275 100644 --- a/AsyncDisplayKit/Layout/ASStackLayoutable.h +++ b/AsyncDisplayKit/Layout/ASStackLayoutable.h @@ -11,6 +11,8 @@ #import #import +NS_ASSUME_NONNULL_BEGIN + /** * Layout options that can be defined for an ASLayoutable being added to a ASStackLayoutSpec. */ @@ -64,3 +66,5 @@ @property (nonatomic, readwrite) CGFloat descender; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Layout/ASStaticLayoutSpec.h b/AsyncDisplayKit/Layout/ASStaticLayoutSpec.h index 8bd3f3d9..44da4adf 100644 --- a/AsyncDisplayKit/Layout/ASStaticLayoutSpec.h +++ b/AsyncDisplayKit/Layout/ASStaticLayoutSpec.h @@ -11,6 +11,8 @@ #import #import +NS_ASSUME_NONNULL_BEGIN + /** * A layout spec that positions children at fixed positions. * @@ -21,6 +23,8 @@ /** @param children Children to be positioned at fixed positions, each conforms to ASStaticLayoutable */ -+ (instancetype)staticLayoutSpecWithChildren:(NSArray *)children; ++ (instancetype)staticLayoutSpecWithChildren:(NSArray> *)children; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Layout/ASStaticLayoutable.h b/AsyncDisplayKit/Layout/ASStaticLayoutable.h index e0325cfc..8e5f6e62 100644 --- a/AsyncDisplayKit/Layout/ASStaticLayoutable.h +++ b/AsyncDisplayKit/Layout/ASStaticLayoutable.h @@ -10,6 +10,8 @@ #import +NS_ASSUME_NONNULL_BEGIN + /** * Layout options that can be defined for an ASLayoutable being added to a ASStaticLayoutSpec. */ @@ -24,3 +26,5 @@ @property (nonatomic, assign) CGPoint layoutPosition; @end + +NS_ASSUME_NONNULL_END From 309ecca444a2cfe34106b064ab9cb1ca5b5d9235 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Thu, 17 Sep 2015 11:42:38 -0700 Subject: [PATCH 09/37] In ASLayoutOptions, make initWithLayoutable: take a nullable argument --- AsyncDisplayKit/Layout/ASLayoutOptions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AsyncDisplayKit/Layout/ASLayoutOptions.h b/AsyncDisplayKit/Layout/ASLayoutOptions.h index 799f3e6b..bda890cc 100644 --- a/AsyncDisplayKit/Layout/ASLayoutOptions.h +++ b/AsyncDisplayKit/Layout/ASLayoutOptions.h @@ -54,7 +54,7 @@ NS_ASSUME_NONNULL_BEGIN * * @return a new instance of ASLayoutOptions */ -- (instancetype)initWithLayoutable:(id)layoutable NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithLayoutable:(nullable id)layoutable NS_DESIGNATED_INITIALIZER; /** * Copies the values of layoutOptions into self. This is useful when placing a layoutable inside of another. Consider From c010ddad3bf8fe11baf52f44f08c4e6d62827ff0 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Thu, 17 Sep 2015 13:30:28 -0700 Subject: [PATCH 10/37] Update all the files in the Details group --- .../Details/ASAbstractLayoutController.h | 4 +++ .../Details/ASBasicImageDownloader.h | 3 ++ AsyncDisplayKit/Details/ASBatchContext.h | 4 +++ .../ASCollectionViewLayoutController.h | 4 +++ AsyncDisplayKit/Details/ASDataController.h | 28 +++++++++++-------- .../Details/ASDealloc2MainObject.h | 3 ++ .../Details/ASFlowLayoutController.h | 7 ++++- .../Details/ASHighlightOverlayLayer.h | 9 ++++-- AsyncDisplayKit/Details/ASImageProtocols.h | 19 +++++++------ AsyncDisplayKit/Details/ASIndexPath.h | 5 ++++ AsyncDisplayKit/Details/ASLayoutController.h | 17 +++++++---- .../ASMutableAttributedStringBuilder.h | 9 ++++-- AsyncDisplayKit/Details/ASRangeController.h | 13 +++++---- AsyncDisplayKit/Details/ASRangeHandler.h | 4 +++ .../Details/ASRangeHandlerPreload.h | 4 +++ .../Details/ASRangeHandlerRender.h | 4 +++ AsyncDisplayKit/Details/ASScrollDirection.h | 4 +++ .../Details/ASTextNodeCoreTextAdditions.h | 3 ++ AsyncDisplayKit/Details/ASTextNodeRenderer.h | 11 +++++--- AsyncDisplayKit/Details/ASTextNodeShadower.h | 3 ++ .../Details/ASTextNodeTextKitHelpers.h | 7 +++-- .../Details/ASTextNodeWordKerner.h | 3 ++ .../Details/CGRect+ASConvenience.h | 4 +++ ...MutableAttributedString+TextKitAdditions.h | 3 ++ .../UICollectionViewLayout+ASConvenience.h | 4 +++ .../Details/UIView+ASConvenience.h | 18 +++++++----- 26 files changed, 146 insertions(+), 51 deletions(-) diff --git a/AsyncDisplayKit/Details/ASAbstractLayoutController.h b/AsyncDisplayKit/Details/ASAbstractLayoutController.h index 45b92ece..f0cb3bb2 100644 --- a/AsyncDisplayKit/Details/ASAbstractLayoutController.h +++ b/AsyncDisplayKit/Details/ASAbstractLayoutController.h @@ -9,6 +9,8 @@ #import #import +NS_ASSUME_NONNULL_BEGIN + @interface ASAbstractLayoutController : NSObject - (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType; @@ -18,3 +20,5 @@ @property (nonatomic, assign) ASRangeTuningParameters tuningParameters ASDISPLAYNODE_DEPRECATED; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/ASBasicImageDownloader.h b/AsyncDisplayKit/Details/ASBasicImageDownloader.h index 2d962962..765a08e9 100644 --- a/AsyncDisplayKit/Details/ASBasicImageDownloader.h +++ b/AsyncDisplayKit/Details/ASBasicImageDownloader.h @@ -8,6 +8,7 @@ #import +NS_ASSUME_NONNULL_BEGIN /** * @abstract Simple NSURLSession-based image downloader. @@ -15,3 +16,5 @@ @interface ASBasicImageDownloader : NSObject @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/ASBatchContext.h b/AsyncDisplayKit/Details/ASBatchContext.h index 94c42293..452582f9 100644 --- a/AsyncDisplayKit/Details/ASBatchContext.h +++ b/AsyncDisplayKit/Details/ASBatchContext.h @@ -8,6 +8,8 @@ #import +NS_ASSUME_NONNULL_BEGIN + /** * @abstract A context object to notify when batch fetches are finished or cancelled. */ @@ -58,3 +60,5 @@ - (void)beginBatchFetching; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/ASCollectionViewLayoutController.h b/AsyncDisplayKit/Details/ASCollectionViewLayoutController.h index 9aa25db0..632ba46b 100644 --- a/AsyncDisplayKit/Details/ASCollectionViewLayoutController.h +++ b/AsyncDisplayKit/Details/ASCollectionViewLayoutController.h @@ -9,6 +9,8 @@ #import #import +NS_ASSUME_NONNULL_BEGIN + @class ASCollectionView; @interface ASCollectionViewLayoutController : ASAbstractLayoutController @@ -16,3 +18,5 @@ - (instancetype)initWithCollectionView:(ASCollectionView *)collectionView; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/ASDataController.h b/AsyncDisplayKit/Details/ASDataController.h index 68e586da..6399f9a8 100644 --- a/AsyncDisplayKit/Details/ASDataController.h +++ b/AsyncDisplayKit/Details/ASDataController.h @@ -11,6 +11,8 @@ #import #import "ASFlowLayoutController.h" +NS_ASSUME_NONNULL_BEGIN + @class ASCellNode; @class ASDataController; @@ -66,22 +68,22 @@ typedef NSUInteger ASDataControllerAnimationOptions; Called for batch update. */ - (void)dataControllerBeginUpdates:(ASDataController *)dataController; -- (void)dataController:(ASDataController *)dataController endUpdatesAnimated:(BOOL)animated completion:(void (^)(BOOL))completion; +- (void)dataController:(ASDataController *)dataController endUpdatesAnimated:(BOOL)animated completion:(void (^ _Nullable)(BOOL))completion; /** Called for insertion of elements. */ -- (void)dataController:(ASDataController *)dataController didInsertNodes:(NSArray *)nodes atIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; +- (void)dataController:(ASDataController *)dataController didInsertNodes:(NSArray *)nodes atIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; /** Called for deletion of elements. */ -- (void)dataController:(ASDataController *)dataController didDeleteNodes:(NSArray *)nodes atIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; +- (void)dataController:(ASDataController *)dataController didDeleteNodes:(NSArray *)nodes atIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; /** Called for insertion of sections. */ -- (void)dataController:(ASDataController *)dataController didInsertSections:(NSArray *)sections atIndexSet:(NSIndexSet *)indexSet withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; +- (void)dataController:(ASDataController *)dataController didInsertSections:(NSArray *> *)sections atIndexSet:(NSIndexSet *)indexSet withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; /** Called for deletion of sections. @@ -139,7 +141,7 @@ typedef NSUInteger ASDataControllerAnimationOptions; - (void)endUpdates; -- (void)endUpdatesAnimated:(BOOL)animated completion:(void (^)(BOOL))completion; +- (void)endUpdatesAnimated:(BOOL)animated completion:(void (^ _Nullable)(BOOL))completion; - (void)insertSections:(NSIndexSet *)sections withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; @@ -149,11 +151,11 @@ typedef NSUInteger ASDataControllerAnimationOptions; - (void)moveSection:(NSInteger)section toSection:(NSInteger)newSection withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; -- (void)insertRowsAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; +- (void)insertRowsAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; -- (void)deleteRowsAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; +- (void)deleteRowsAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; -- (void)reloadRowsAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; +- (void)reloadRowsAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; /** * Re-measures all loaded nodes. Used to respond to a change in size of the containing view @@ -163,7 +165,7 @@ typedef NSUInteger ASDataControllerAnimationOptions; - (void)moveRowAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; -- (void)reloadDataWithAnimationOptions:(ASDataControllerAnimationOptions)animationOptions completion:(void (^)())completion; +- (void)reloadDataWithAnimationOptions:(ASDataControllerAnimationOptions)animationOptions completion:(void (^ _Nullable)())completion; /** @name Data Querying */ @@ -171,10 +173,12 @@ typedef NSUInteger ASDataControllerAnimationOptions; - (NSUInteger)numberOfRowsInSection:(NSUInteger)section; -- (ASCellNode *)nodeAtIndexPath:(NSIndexPath *)indexPath; +- (nullable ASCellNode *)nodeAtIndexPath:(NSIndexPath *)indexPath; -- (NSArray *)nodesAtIndexPaths:(NSArray *)indexPaths; +- (NSArray *)nodesAtIndexPaths:(NSArray *)indexPaths; -- (NSArray *)completedNodes; // This provides efficient access to the entire _completedNodes multidimensional array. +- (NSArray *> *)completedNodes; // This provides efficient access to the entire _completedNodes multidimensional array. @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/ASDealloc2MainObject.h b/AsyncDisplayKit/Details/ASDealloc2MainObject.h index 06c298a5..88c08ba9 100644 --- a/AsyncDisplayKit/Details/ASDealloc2MainObject.h +++ b/AsyncDisplayKit/Details/ASDealloc2MainObject.h @@ -8,6 +8,7 @@ #import +NS_ASSUME_NONNULL_BEGIN /** * _OBJC_SUPPORTED_INLINE_REFCNT_WITH_DEALLOC2MAIN permits classes to implement their own reference counting and enforce @@ -19,3 +20,5 @@ - (BOOL)_isDeallocating; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/ASFlowLayoutController.h b/AsyncDisplayKit/Details/ASFlowLayoutController.h index 9b61a37b..a0845ed2 100644 --- a/AsyncDisplayKit/Details/ASFlowLayoutController.h +++ b/AsyncDisplayKit/Details/ASFlowLayoutController.h @@ -9,6 +9,9 @@ #import #import +NS_ASSUME_NONNULL_BEGIN + +@class ASCellNode; typedef NS_ENUM(NSUInteger, ASFlowLayoutDirection) { ASFlowLayoutDirectionVertical, @@ -17,7 +20,7 @@ typedef NS_ENUM(NSUInteger, ASFlowLayoutDirection) { @protocol ASFlowLayoutControllerDataSource -- (NSArray *)completedNodes; // This provides access to ASDataController's _completedNodes multidimensional array. +- (NSArray *> *)completedNodes; // This provides access to ASDataController's _completedNodes multidimensional array. @end @@ -33,3 +36,5 @@ typedef NS_ENUM(NSUInteger, ASFlowLayoutDirection) { - (instancetype)initWithScrollOption:(ASFlowLayoutDirection)layoutDirection; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/ASHighlightOverlayLayer.h b/AsyncDisplayKit/Details/ASHighlightOverlayLayer.h index 6b7c236f..736ff087 100644 --- a/AsyncDisplayKit/Details/ASHighlightOverlayLayer.h +++ b/AsyncDisplayKit/Details/ASHighlightOverlayLayer.h @@ -8,6 +8,7 @@ #import +NS_ASSUME_NONNULL_BEGIN @interface ASHighlightOverlayLayer : CALayer @@ -19,16 +20,16 @@ @param rects Array containing CGRects wrapped in NSValue. @param targetLayer The layer that the rects are relative to. The rects will be translated to the receiver's coordinate space when rendering. */ -- (id)initWithRects:(NSArray *)rects targetLayer:(id)targetLayer; +- (id)initWithRects:(NSArray *)rects targetLayer:(nullable CALayer *)targetLayer; /** @summary Initializes with CGRects for the highlighting, in the receiver's coordinate space. @param rects Array containing CGRects wrapped in NSValue. */ -- (id)initWithRects:(NSArray *)rects; +- (id)initWithRects:(NSArray *)rects; -@property (atomic, strong) __attribute__((NSObject)) CGColorRef highlightColor; +@property (nullable, atomic, strong) __attribute__((NSObject)) CGColorRef highlightColor; @property (atomic, weak) CALayer *targetLayer; @end @@ -42,3 +43,5 @@ @property (nonatomic, assign, setter=as_setAllowsHighlightDrawing:) BOOL as_allowsHighlightDrawing; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/ASImageProtocols.h b/AsyncDisplayKit/Details/ASImageProtocols.h index 38465a2d..f0720d51 100644 --- a/AsyncDisplayKit/Details/ASImageProtocols.h +++ b/AsyncDisplayKit/Details/ASImageProtocols.h @@ -9,6 +9,7 @@ #import #import +NS_ASSUME_NONNULL_BEGIN @protocol ASImageCacheProtocol @@ -23,9 +24,9 @@ @discussion If `URL` is nil, `completion` will be invoked immediately with a nil image. This method should not block the calling thread as it is likely to be called from the main thread. */ -- (void)fetchCachedImageWithURL:(NSURL *)URL - callbackQueue:(dispatch_queue_t)callbackQueue - completion:(void (^)(CGImageRef imageFromCache))completion; +- (void)fetchCachedImageWithURL:(nullable NSURL *)URL + callbackQueue:(nullable dispatch_queue_t)callbackQueue + completion:(void (^)(CGImageRef _Nullable imageFromCache))completion; @end @@ -48,10 +49,10 @@ @result An opaque identifier to be used in canceling the download, via `cancelImageDownloadForIdentifier:`. You must retain the identifier if you wish to use it later. */ -- (id)downloadImageWithURL:(NSURL *)URL - callbackQueue:(dispatch_queue_t)callbackQueue - downloadProgressBlock:(void (^)(CGFloat progress))downloadProgressBlock - completion:(void (^)(CGImageRef image, NSError *error))completion; +- (id)downloadImageWithURL:(nullable NSURL *)URL + callbackQueue:(nullable dispatch_queue_t)callbackQueue + downloadProgressBlock:(void (^ _Nullable)(CGFloat progress))downloadProgressBlock + completion:(void (^ _Nullable)(CGImageRef image, NSError *error))completion; /** @abstract Cancels an image download. @@ -59,6 +60,8 @@ `downloadImageWithURL:callbackQueue:downloadProgressBlock:completion:`. @discussion This method has no effect if `downloadIdentifier` is nil. */ -- (void)cancelImageDownloadForIdentifier:(id)downloadIdentifier; +- (void)cancelImageDownloadForIdentifier:(nullable id)downloadIdentifier; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/ASIndexPath.h b/AsyncDisplayKit/Details/ASIndexPath.h index a6eb514a..fde2b240 100644 --- a/AsyncDisplayKit/Details/ASIndexPath.h +++ b/AsyncDisplayKit/Details/ASIndexPath.h @@ -19,8 +19,11 @@ typedef struct { ASIndexPath end; } ASIndexPathRange; +NS_ASSUME_NONNULL_BEGIN + ASDISPLAYNODE_EXTERN_C_BEGIN + extern ASIndexPath ASIndexPathMake(NSInteger section, NSInteger row); extern BOOL ASIndexPathEqualToIndexPath(ASIndexPath first, ASIndexPath second); @@ -41,3 +44,5 @@ ASDISPLAYNODE_EXTERN_C_END - (ASIndexPath)ASIndexPathValue; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/ASLayoutController.h b/AsyncDisplayKit/Details/ASLayoutController.h index b45efd87..70f6bd80 100644 --- a/AsyncDisplayKit/Details/ASLayoutController.h +++ b/AsyncDisplayKit/Details/ASLayoutController.h @@ -12,6 +12,9 @@ #import #import +NS_ASSUME_NONNULL_BEGIN + +@class ASCellNode; typedef struct { CGFloat leadingBufferScreenfuls; @@ -27,26 +30,28 @@ typedef struct { */ - (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType; -- (BOOL)shouldUpdateForVisibleIndexPaths:(NSArray *)indexPaths viewportSize:(CGSize)viewportSize rangeType:(ASLayoutRangeType)rangeType; +- (BOOL)shouldUpdateForVisibleIndexPaths:(NSArray *)indexPaths viewportSize:(CGSize)viewportSize rangeType:(ASLayoutRangeType)rangeType; - (NSSet *)indexPathsForScrolling:(ASScrollDirection)scrollDirection viewportSize:(CGSize)viewportSize rangeType:(ASLayoutRangeType)rangeType; @property (nonatomic, assign) ASRangeTuningParameters tuningParameters ASDISPLAYNODE_DEPRECATED; -- (BOOL)shouldUpdateForVisibleIndexPath:(NSArray *)indexPath viewportSize:(CGSize)viewportSize ASDISPLAYNODE_DEPRECATED; +- (BOOL)shouldUpdateForVisibleIndexPath:(NSIndexPath *)indexPath viewportSize:(CGSize)viewportSize ASDISPLAYNODE_DEPRECATED; - (NSSet *)indexPathsForScrolling:(ASScrollDirection)scrollDirection viewportSize:(CGSize)viewportSize ASDISPLAYNODE_DEPRECATED; @optional -- (void)insertNodesAtIndexPaths:(NSArray *)indexPaths withSizes:(NSArray *)nodeSizes; +- (void)insertNodesAtIndexPaths:(NSArray *)indexPaths withSizes:(NSArray *)nodeSizes; -- (void)deleteNodesAtIndexPaths:(NSArray *)indexPaths; +- (void)deleteNodesAtIndexPaths:(NSArray *)indexPaths; -- (void)insertSections:(NSArray *)sections atIndexSet:(NSIndexSet *)indexSet; +- (void)insertSections:(NSArray*> *)sections atIndexSet:(NSIndexSet *)indexSet; - (void)deleteSectionsAtIndexSet:(NSIndexSet *)indexSet; -- (void)setVisibleNodeIndexPaths:(NSArray *)indexPaths; +- (void)setVisibleNodeIndexPaths:(NSArray *)indexPaths; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/ASMutableAttributedStringBuilder.h b/AsyncDisplayKit/Details/ASMutableAttributedStringBuilder.h index 99d7c9ad..4df67ada 100644 --- a/AsyncDisplayKit/Details/ASMutableAttributedStringBuilder.h +++ b/AsyncDisplayKit/Details/ASMutableAttributedStringBuilder.h @@ -8,6 +8,7 @@ #import +NS_ASSUME_NONNULL_BEGIN /* * Use this class to compose new attributed strings. You may use the normal @@ -38,14 +39,14 @@ */ @interface ASMutableAttributedStringBuilder : NSMutableAttributedString -- (instancetype)initWithString:(NSString *)str attributes:(NSDictionary *)attrs; +- (instancetype)initWithString:(NSString *)str attributes:(nullable NSDictionary *)attrs; - (instancetype)initWithAttributedString:(NSAttributedString *)attrStr; - (void)replaceCharactersInRange:(NSRange)range withString:(NSString *)str; -- (void)setAttributes:(NSDictionary *)attrs range:(NSRange)range; +- (void)setAttributes:(nullable NSDictionary *)attrs range:(NSRange)range; - (void)addAttribute:(NSString *)name value:(id)value range:(NSRange)range; -- (void)addAttributes:(NSDictionary *)attrs range:(NSRange)range; +- (void)addAttributes:(NSDictionary *)attrs range:(NSRange)range; - (void)removeAttribute:(NSString *)name range:(NSRange)range; - (void)replaceCharactersInRange:(NSRange)range withAttributedString:(NSAttributedString *)attrString; @@ -57,3 +58,5 @@ - (NSMutableAttributedString *)composedAttributedString; @end + +NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/AsyncDisplayKit/Details/ASRangeController.h b/AsyncDisplayKit/Details/ASRangeController.h index 9d5bbe57..aaf67689 100644 --- a/AsyncDisplayKit/Details/ASRangeController.h +++ b/AsyncDisplayKit/Details/ASRangeController.h @@ -13,6 +13,7 @@ #import #import +NS_ASSUME_NONNULL_BEGIN @protocol ASRangeControllerDelegate; @@ -65,7 +66,7 @@ * * @returns an array of index paths corresponding to the nodes currently visible onscreen (i.e., the visible range). */ -- (NSArray *)rangeControllerVisibleNodeIndexPaths:(ASRangeController *)rangeController; +- (NSArray *)rangeControllerVisibleNodeIndexPaths:(ASRangeController *)rangeController; /** * @param rangeController Sender. @@ -88,7 +89,7 @@ * @param animated NO if all animations are disabled. YES otherwise. * @param completion Completion block. */ -- (void)rangeController:(ASRangeController * )rangeController endUpdatesAnimated:(BOOL)animated completion:(void (^)(BOOL))completion; +- (void)rangeController:(ASRangeController * )rangeController endUpdatesAnimated:(BOOL)animated completion:(void (^ _Nullable)(BOOL))completion; /** * Fetch nodes at specific index paths. @@ -97,7 +98,7 @@ * * @param indexPaths Index paths. */ -- (NSArray *)rangeController:(ASRangeController *)rangeController nodesAtIndexPaths:(NSArray *)indexPaths; +- (NSArray *)rangeController:(ASRangeController *)rangeController nodesAtIndexPaths:(NSArray *)indexPaths; /** * Called for nodes insertion. @@ -110,7 +111,7 @@ * * @param animationOptions Animation options. See ASDataControllerAnimationOptions. */ -- (void)rangeController:(ASRangeController *)rangeController didInsertNodes:(NSArray *)nodes atIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; +- (void)rangeController:(ASRangeController *)rangeController didInsertNodes:(NSArray *)nodes atIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; /** * Called for nodes deletion. @@ -123,7 +124,7 @@ * * @param animationOptions Animation options. See ASDataControllerAnimationOptions. */ -- (void)rangeController:(ASRangeController *)rangeController didDeleteNodes:(NSArray *)nodes atIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; +- (void)rangeController:(ASRangeController *)rangeController didDeleteNodes:(NSArray *)nodes atIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; /** * Called for section insertion. @@ -148,3 +149,5 @@ - (void)rangeController:(ASRangeController *)rangeController didDeleteSectionsAtIndexSet:(NSIndexSet *)indexSet withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions; @end + +NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/AsyncDisplayKit/Details/ASRangeHandler.h b/AsyncDisplayKit/Details/ASRangeHandler.h index 22a7c564..136736f4 100644 --- a/AsyncDisplayKit/Details/ASRangeHandler.h +++ b/AsyncDisplayKit/Details/ASRangeHandler.h @@ -10,6 +10,8 @@ #import +NS_ASSUME_NONNULL_BEGIN + @class ASDisplayNode; @protocol ASRangeHandler @@ -20,3 +22,5 @@ - (void)node:(ASDisplayNode *)node exitedRangeOfType:(ASLayoutRangeType)rangeType; @end + +NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/AsyncDisplayKit/Details/ASRangeHandlerPreload.h b/AsyncDisplayKit/Details/ASRangeHandlerPreload.h index 7dc01138..eb7c34f9 100644 --- a/AsyncDisplayKit/Details/ASRangeHandlerPreload.h +++ b/AsyncDisplayKit/Details/ASRangeHandlerPreload.h @@ -10,6 +10,10 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface ASRangeHandlerPreload : NSObject @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/ASRangeHandlerRender.h b/AsyncDisplayKit/Details/ASRangeHandlerRender.h index b064cb6a..8b00982b 100644 --- a/AsyncDisplayKit/Details/ASRangeHandlerRender.h +++ b/AsyncDisplayKit/Details/ASRangeHandlerRender.h @@ -10,6 +10,10 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface ASRangeHandlerRender : NSObject @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/ASScrollDirection.h b/AsyncDisplayKit/Details/ASScrollDirection.h index a46295cf..2d75703d 100644 --- a/AsyncDisplayKit/Details/ASScrollDirection.h +++ b/AsyncDisplayKit/Details/ASScrollDirection.h @@ -10,6 +10,8 @@ #import "ASBaseDefines.h" +NS_ASSUME_NONNULL_BEGIN + typedef NS_OPTIONS(NSInteger, ASScrollDirection) { ASScrollDirectionNone = 0, ASScrollDirectionRight = 1 << 0, @@ -32,3 +34,5 @@ BOOL ASScrollDirectionContainsUp(ASScrollDirection scrollDirection); BOOL ASScrollDirectionContainsDown(ASScrollDirection scrollDirection); ASDISPLAYNODE_EXTERN_C_END + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/ASTextNodeCoreTextAdditions.h b/AsyncDisplayKit/Details/ASTextNodeCoreTextAdditions.h index ce74957e..d16aa902 100644 --- a/AsyncDisplayKit/Details/ASTextNodeCoreTextAdditions.h +++ b/AsyncDisplayKit/Details/ASTextNodeCoreTextAdditions.h @@ -11,6 +11,7 @@ #import +NS_ASSUME_NONNULL_BEGIN ASDISPLAYNODE_EXTERN_C_BEGIN /** @@ -81,3 +82,5 @@ ASDISPLAYNODE_EXTERN_C_END + (instancetype)paragraphStyleWithCTParagraphStyle:(CTParagraphStyleRef)coreTextParagraphStyle; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/ASTextNodeRenderer.h b/AsyncDisplayKit/Details/ASTextNodeRenderer.h index 3b80bb16..dd5804e2 100644 --- a/AsyncDisplayKit/Details/ASTextNodeRenderer.h +++ b/AsyncDisplayKit/Details/ASTextNodeRenderer.h @@ -8,6 +8,7 @@ #import +NS_ASSUME_NONNULL_BEGIN typedef void (^as_renderer_index_block_t)(NSUInteger characterIndex, CGRect glyphBoundingRect, @@ -46,10 +47,10 @@ typedef NS_ENUM(NSUInteger, ASTextNodeRendererMeasureOption) { @interface ASTextNodeRenderer : NSObject - (instancetype)initWithAttributedString:(NSAttributedString *)attributedString - truncationString:(NSAttributedString *)truncationString + truncationString:(nullable NSAttributedString *)truncationString truncationMode:(NSLineBreakMode)truncationMode maximumLineCount:(NSUInteger)maximumLineCount - exclusionPaths:(NSArray *)exclusionPaths + exclusionPaths:(nullable NSArray *)exclusionPaths constrainedSize:(CGSize)constrainedSize; /* * Designated Initializer @@ -59,7 +60,7 @@ typedef NS_ENUM(NSUInteger, ASTextNodeRendererMeasureOption) { * so feel free */ - (instancetype)initWithAttributedString:(NSAttributedString *)attributedString - truncationString:(NSAttributedString *)truncationString + truncationString:(nullable NSAttributedString *)truncationString truncationMode:(NSLineBreakMode)truncationMode maximumLineCount:(NSUInteger)maximumLineCount constrainedSize:(CGSize)constrainedSize; @@ -129,7 +130,7 @@ typedef NS_ENUM(NSUInteger, ASTextNodeRendererMeasureOption) { * * Triggers initialization of textkit components, truncation, and sizing. */ -- (NSArray *)rectsForTextRange:(NSRange)textRange +- (NSArray *)rectsForTextRange:(NSRange)textRange measureOption:(ASTextNodeRendererMeasureOption)measureOption; /* @@ -186,3 +187,5 @@ typedef NS_ENUM(NSUInteger, ASTextNodeRendererMeasureOption) { - (NSUInteger)lineCount; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/ASTextNodeShadower.h b/AsyncDisplayKit/Details/ASTextNodeShadower.h index 59744897..3b0adca3 100644 --- a/AsyncDisplayKit/Details/ASTextNodeShadower.h +++ b/AsyncDisplayKit/Details/ASTextNodeShadower.h @@ -9,6 +9,7 @@ #import #import +NS_ASSUME_NONNULL_BEGIN /** * @abstract Negates/inverts a UIEdgeInsets. @@ -67,3 +68,5 @@ static inline UIEdgeInsets ASDNEdgeInsetsInvert(UIEdgeInsets insets) - (void)setShadowInContext:(CGContextRef)context; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/ASTextNodeTextKitHelpers.h b/AsyncDisplayKit/Details/ASTextNodeTextKitHelpers.h index 22fc9efb..d51dab0f 100644 --- a/AsyncDisplayKit/Details/ASTextNodeTextKitHelpers.h +++ b/AsyncDisplayKit/Details/ASTextNodeTextKitHelpers.h @@ -11,6 +11,7 @@ #import #import +NS_ASSUME_NONNULL_BEGIN @interface ASTextKitComponents : NSObject @@ -21,7 +22,7 @@ @return An `ASTextKitComponents` containing the created components. The text view component will be nil. @discussion The returned components will be hooked up together, so they are ready for use as a system upon return. */ -+ (ASTextKitComponents *)componentsWithAttributedSeedString:(NSAttributedString *)attributedSeedString ++ (ASTextKitComponents *)componentsWithAttributedSeedString:(nullable NSAttributedString *)attributedSeedString textContainerSize:(CGSize)textContainerSize; /** @@ -35,6 +36,8 @@ @property (nonatomic, strong, readonly) NSTextStorage *textStorage; @property (nonatomic, strong, readonly) NSTextContainer *textContainer; @property (nonatomic, strong, readonly) NSLayoutManager *layoutManager; -@property (nonatomic, strong) UITextView *textView; +@property (nullable, nonatomic, strong) UITextView *textView; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/ASTextNodeWordKerner.h b/AsyncDisplayKit/Details/ASTextNodeWordKerner.h index 1be6390c..a98654cf 100644 --- a/AsyncDisplayKit/Details/ASTextNodeWordKerner.h +++ b/AsyncDisplayKit/Details/ASTextNodeWordKerner.h @@ -9,6 +9,7 @@ #import #import +NS_ASSUME_NONNULL_BEGIN /** @abstract This class acts as the NSLayoutManagerDelegate for ASTextNode. @@ -28,3 +29,5 @@ */ @end + +NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/AsyncDisplayKit/Details/CGRect+ASConvenience.h b/AsyncDisplayKit/Details/CGRect+ASConvenience.h index a9cc714a..9743eb49 100644 --- a/AsyncDisplayKit/Details/CGRect+ASConvenience.h +++ b/AsyncDisplayKit/Details/CGRect+ASConvenience.h @@ -10,9 +10,13 @@ #import "ASBaseDefines.h" +NS_ASSUME_NONNULL_BEGIN + ASDISPLAYNODE_EXTERN_C_BEGIN CGRect asdk_CGRectExpandHorizontally(CGRect rect, CGFloat negativeMultiplier, CGFloat positiveMultiplier); CGRect asdk_CGRectExpandVertically(CGRect rect, CGFloat negativeMultiplier, CGFloat positiveMultiplier); ASDISPLAYNODE_EXTERN_C_END + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Details/NSMutableAttributedString+TextKitAdditions.h b/AsyncDisplayKit/Details/NSMutableAttributedString+TextKitAdditions.h index 8810ba35..cd2dd1eb 100644 --- a/AsyncDisplayKit/Details/NSMutableAttributedString+TextKitAdditions.h +++ b/AsyncDisplayKit/Details/NSMutableAttributedString+TextKitAdditions.h @@ -8,6 +8,7 @@ #import +NS_ASSUME_NONNULL_BEGIN @interface NSMutableAttributedString (TextKitAdditions) @@ -20,3 +21,5 @@ - (void)attributeTextInRange:(NSRange)range withTextKitParagraphStyle:(NSParagraphStyle *)paragraphStyle; @end + +NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/AsyncDisplayKit/Details/UICollectionViewLayout+ASConvenience.h b/AsyncDisplayKit/Details/UICollectionViewLayout+ASConvenience.h index 1853be6f..4710cbdf 100644 --- a/AsyncDisplayKit/Details/UICollectionViewLayout+ASConvenience.h +++ b/AsyncDisplayKit/Details/UICollectionViewLayout+ASConvenience.h @@ -8,8 +8,12 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface UICollectionViewLayout (ASConvenience) - (BOOL)asdk_isFlowLayout; @end + +NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/AsyncDisplayKit/Details/UIView+ASConvenience.h b/AsyncDisplayKit/Details/UIView+ASConvenience.h index d1f00324..dfd59167 100644 --- a/AsyncDisplayKit/Details/UIView+ASConvenience.h +++ b/AsyncDisplayKit/Details/UIView+ASConvenience.h @@ -8,6 +8,8 @@ #import +NS_ASSUME_NONNULL_BEGIN + /** These are the properties we support from CALayer (implemented in the pending state) @@ -18,7 +20,7 @@ @property (nonatomic, assign) CGPoint position; @property (nonatomic, assign) CGFloat zPosition; @property (nonatomic, assign) CGPoint anchorPoint; -@property (nonatomic, retain) id contents; +@property (nullable, nonatomic, retain) id contents; @property (nonatomic, assign) CGFloat cornerRadius; @property (nonatomic, assign) CGFloat contentsScale; @property (nonatomic, assign) CATransform3D transform; @@ -30,9 +32,9 @@ @property (nonatomic, assign) CGFloat shadowRadius; @property (nonatomic, assign) CGFloat borderWidth; @property (nonatomic, assign, getter = isOpaque) BOOL opaque; -@property (nonatomic, retain) __attribute__((NSObject)) CGColorRef borderColor; -@property (nonatomic, copy) NSString *asyncdisplaykit_name; -@property (nonatomic, retain) __attribute__((NSObject)) CGColorRef backgroundColor; +@property (nullable, nonatomic, retain) __attribute__((NSObject)) CGColorRef borderColor; +@property (nullable, nonatomic, copy) NSString *asyncdisplaykit_name; +@property (nullable, nonatomic, retain) __attribute__((NSObject)) CGColorRef backgroundColor; @property (nonatomic, assign) BOOL allowsEdgeAntialiasing; @property (nonatomic, assign) unsigned int edgeAntialiasingMask; @@ -50,7 +52,7 @@ @property (nonatomic, getter=isHidden) BOOL hidden; @property (nonatomic, assign) BOOL autoresizesSubviews; @property (nonatomic, assign) UIViewAutoresizing autoresizingMask; -@property (nonatomic, retain) UIColor *tintColor; +@property (nonatomic, retain, null_resettable) UIColor *tintColor; @property (nonatomic, assign) CGFloat alpha; @property (nonatomic, assign) CGRect bounds; @property (nonatomic, assign) UIViewContentMode contentMode; @@ -76,10 +78,12 @@ */ // Accessibility identification support -@property (nonatomic, copy) NSString *accessibilityIdentifier; +@property (nullable, nonatomic, copy) NSString *accessibilityIdentifier; @end @interface CALayer (ASDisplayNodeLayer) -@property (atomic, copy) NSString *asyncdisplaykit_name; +@property (nullable, atomic, copy) NSString *asyncdisplaykit_name; @end + +NS_ASSUME_NONNULL_END From 38706d0962a84a16c28badc5bcbf33245c9e434d Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Thu, 17 Sep 2015 14:22:29 -0700 Subject: [PATCH 11/37] Fix nullability in ASImageDownloaderProtocol completion handler --- AsyncDisplayKit/Details/ASImageProtocols.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AsyncDisplayKit/Details/ASImageProtocols.h b/AsyncDisplayKit/Details/ASImageProtocols.h index f0720d51..2235dafe 100644 --- a/AsyncDisplayKit/Details/ASImageProtocols.h +++ b/AsyncDisplayKit/Details/ASImageProtocols.h @@ -52,7 +52,7 @@ NS_ASSUME_NONNULL_BEGIN - (id)downloadImageWithURL:(nullable NSURL *)URL callbackQueue:(nullable dispatch_queue_t)callbackQueue downloadProgressBlock:(void (^ _Nullable)(CGFloat progress))downloadProgressBlock - completion:(void (^ _Nullable)(CGImageRef image, NSError *error))completion; + completion:(void (^ _Nullable)(CGImageRef _Nullable image, NSError * _Nullable error))completion; /** @abstract Cancels an image download. From ba9a742999f5d5baeae5df0768bd738c233cc588 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Thu, 17 Sep 2015 14:48:42 -0700 Subject: [PATCH 12/37] Fix nullability of ASImageDownloaderProtocol to conform to ASBasicImageDownloader behavior --- AsyncDisplayKit/Details/ASImageProtocols.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/AsyncDisplayKit/Details/ASImageProtocols.h b/AsyncDisplayKit/Details/ASImageProtocols.h index 2235dafe..8a235083 100644 --- a/AsyncDisplayKit/Details/ASImageProtocols.h +++ b/AsyncDisplayKit/Details/ASImageProtocols.h @@ -43,13 +43,11 @@ NS_ASSUME_NONNULL_BEGIN @param completion The block to be invoked when the download has completed, or has failed. @param image The image that was downloaded, if the image could be successfully downloaded; nil otherwise. @param error An error describing why the download of `URL` failed, if the download failed; nil otherwise. - @discussion If `URL` is nil, `completion` will be invoked immediately with a nil image and an error describing why the - download failed. This method is likely to be called on the main thread, so any custom implementations should make - sure to background any expensive download operations. + @discussion This method is likely to be called on the main thread, so any custom implementations should make sure to background any expensive download operations. @result An opaque identifier to be used in canceling the download, via `cancelImageDownloadForIdentifier:`. You must retain the identifier if you wish to use it later. */ -- (id)downloadImageWithURL:(nullable NSURL *)URL +- (id)downloadImageWithURL:(NSURL *)URL callbackQueue:(nullable dispatch_queue_t)callbackQueue downloadProgressBlock:(void (^ _Nullable)(CGFloat progress))downloadProgressBlock completion:(void (^ _Nullable)(CGImageRef _Nullable image, NSError * _Nullable error))completion; From fd3a90a3ed40a8d49d41bc83cb214d548bf62c5c Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Thu, 17 Sep 2015 14:56:39 -0700 Subject: [PATCH 13/37] Make image download token optional --- AsyncDisplayKit/Details/ASImageProtocols.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AsyncDisplayKit/Details/ASImageProtocols.h b/AsyncDisplayKit/Details/ASImageProtocols.h index 8a235083..ba04eaaa 100644 --- a/AsyncDisplayKit/Details/ASImageProtocols.h +++ b/AsyncDisplayKit/Details/ASImageProtocols.h @@ -47,7 +47,7 @@ NS_ASSUME_NONNULL_BEGIN @result An opaque identifier to be used in canceling the download, via `cancelImageDownloadForIdentifier:`. You must retain the identifier if you wish to use it later. */ -- (id)downloadImageWithURL:(NSURL *)URL +- (nullable id)downloadImageWithURL:(NSURL *)URL callbackQueue:(nullable dispatch_queue_t)callbackQueue downloadProgressBlock:(void (^ _Nullable)(CGFloat progress))downloadProgressBlock completion:(void (^ _Nullable)(CGImageRef _Nullable image, NSError * _Nullable error))completion; From f20a0d4bc0ffdc906340b4128b5a807e1c1e2a5c Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Thu, 17 Sep 2015 19:56:21 -0700 Subject: [PATCH 14/37] Add some nullables in ASTextNode --- AsyncDisplayKit/ASTextNode.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AsyncDisplayKit/ASTextNode.h b/AsyncDisplayKit/ASTextNode.h index e7fdf85f..72b28cf2 100644 --- a/AsyncDisplayKit/ASTextNode.h +++ b/AsyncDisplayKit/ASTextNode.h @@ -46,14 +46,14 @@ typedef NS_ENUM(NSUInteger, ASTextNodeHighlightStyle) { @abstract The attributedString to use when the text must be truncated. @discussion Defaults to a localized ellipsis character. */ -@property (nonatomic, copy) NSAttributedString *truncationAttributedString; +@property (nullable, nonatomic, copy) NSAttributedString *truncationAttributedString; /** @summary The second attributed string appended for truncation. @discussion This string will be highlighted on touches. @default nil */ -@property (nonatomic, copy) NSAttributedString *additionalTruncationMessage; +@property (nullable, nonatomic, copy) NSAttributedString *additionalTruncationMessage; /** @abstract Determines how the text is truncated to fit within the receiver's maximum size. @@ -77,7 +77,7 @@ typedef NS_ENUM(NSUInteger, ASTextNodeHighlightStyle) { */ @property (nonatomic, readonly, assign) NSUInteger lineCount; -@property (nonatomic, strong) NSArray *exclusionPaths; +@property (nullable, nonatomic, strong) NSArray *exclusionPaths; #pragma mark - Placeholders From f37a88d2e40b9e783494aedc1677fa639d9ed62c Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Fri, 18 Sep 2015 23:32:52 -0700 Subject: [PATCH 15/37] Give a prefix to make ASImageIdentifier typealias --- AsyncDisplayKit/ASMultiplexImageNode.h | 27 +++++++++++++------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/AsyncDisplayKit/ASMultiplexImageNode.h b/AsyncDisplayKit/ASMultiplexImageNode.h index 027d9b3d..d395d962 100644 --- a/AsyncDisplayKit/ASMultiplexImageNode.h +++ b/AsyncDisplayKit/ASMultiplexImageNode.h @@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN @protocol ASMultiplexImageNodeDelegate; @protocol ASMultiplexImageNodeDataSource; -typedef __kindof NSObject * ImageIdentifier; +typedef __kindof NSObject * ASImageIdentifier; extern NSString *const ASMultiplexImageNodeErrorDomain; @@ -38,8 +38,7 @@ typedef NS_ENUM(NSUInteger, ASMultiplexImageNodeErrorCode) { * @abstract ASMultiplexImageNode is an image node that can load and display multiple versions of an image. For * example, it can display a low-resolution version of an image while the high-resolution version is loading. * - * @discussion ASMultiplexImageNode begins loading images when its property is set. For each image - * identifier, the data source can either return a UIImage directly, or a URL the image node should load. + * @discussion ASMultiplexImageNode begins loading images when its for more information on the image loading process. */ -@property (nonatomic, readwrite, copy) NSArray *imageIdentifiers; +@property (nonatomic, readwrite, copy) NSArray *imageIdentifiers; /** - * @abstract Notify the receiver that its data source has new UIImages or NSURLs available for . + * @abstract Notify the receiver SSAAthat its data source has new UIImages or NSURLs available for . * * @discussion If a higher-quality image than is currently displayed is now available, it will be loaded. */ @@ -94,12 +93,12 @@ typedef NS_ENUM(NSUInteger, ASMultiplexImageNodeErrorCode) { * * @discussion This value may differ from if the image hasn't yet been displayed. */ -@property (nullable, nonatomic, readonly) ImageIdentifier loadedImageIdentifier; +@property (nullable, nonatomic, readonly) ASImageIdentifier loadedImageIdentifier; /** * @abstract The identifier for the image that the receiver is currently displaying, or nil. */ -@property (nullable, nonatomic, readonly) ImageIdentifier displayedImageIdentifier; +@property (nullable, nonatomic, readonly) ASImageIdentifier displayedImageIdentifier; @end @@ -127,7 +126,7 @@ typedef NS_ENUM(NSUInteger, ASMultiplexImageNodeErrorCode) { */ - (void)multiplexImageNode:(ASMultiplexImageNode *)imageNode didUpdateDownloadProgress:(CGFloat)downloadProgress - forImageWithIdentifier:(ImageIdentifier)imageIdentifier; + forImageWithIdentifier:(ASImageIdentifier)imageIdentifier; /** * @abstract Notification that the image node's download has finished. @@ -136,7 +135,7 @@ typedef NS_ENUM(NSUInteger, ASMultiplexImageNodeErrorCode) { * @param error The error that occurred while downloading, if one occurred; nil otherwise. */ - (void)multiplexImageNode:(ASMultiplexImageNode *)imageNode -didFinishDownloadingImageWithIdentifier:(ImageIdentifier)imageIdentifier +didFinishDownloadingImageWithIdentifier:(ASImageIdentifier)imageIdentifier error:(nullable NSError *)error; /** @@ -151,9 +150,9 @@ didFinishDownloadingImageWithIdentifier:(ImageIdentifier)imageIdentifier */ - (void)multiplexImageNode:(ASMultiplexImageNode *)imageNode didUpdateImage:(nullable UIImage *)image - withIdentifier:(nullable ImageIdentifier)imageIdentifier + withIdentifier:(nullable ASImageIdentifier)imageIdentifier fromImage:(nullable UIImage *)previousImage - withIdentifier:(nullable ImageIdentifier)previousImageIdentifier; + withIdentifier:(nullable ASImageIdentifier)previousImageIdentifier; /** * @abstract Notification that the image node displayed a new image. @@ -164,7 +163,7 @@ didFinishDownloadingImageWithIdentifier:(ImageIdentifier)imageIdentifier */ - (void)multiplexImageNode:(ASMultiplexImageNode *)imageNode didDisplayUpdatedImage:(nullable UIImage *)image - withIdentifier:(nullable ImageIdentifier)imageIdentifier; + withIdentifier:(nullable ASImageIdentifier)imageIdentifier; /** * @abstract Notification that the image node finished displaying an image. @@ -192,7 +191,7 @@ didFinishDownloadingImageWithIdentifier:(ImageIdentifier)imageIdentifier * URL to the image via -multiplexImageNode:URLForImageIdentifier:. * @returns A UIImage corresponding to `imageIdentifier`, or nil if none is available. */ -- (nullable UIImage *)multiplexImageNode:(ASMultiplexImageNode *)imageNode imageForImageIdentifier:(ImageIdentifier)imageIdentifier; +- (nullable UIImage *)multiplexImageNode:(ASMultiplexImageNode *)imageNode imageForImageIdentifier:(ASImageIdentifier)imageIdentifier; /** * @abstract An image URL for the specified identifier. @@ -203,7 +202,7 @@ didFinishDownloadingImageWithIdentifier:(ImageIdentifier)imageIdentifier * multiplexImageNode:imageForImageIdentifier:]> instead. * @returns An NSURL for the image identified by `imageIdentifier`, or nil if none is available. */ -- (nullable NSURL *)multiplexImageNode:(ASMultiplexImageNode *)imageNode URLForImageIdentifier:(ImageIdentifier)imageIdentifier; +- (nullable NSURL *)multiplexImageNode:(ASMultiplexImageNode *)imageNode URLForImageIdentifier:(ASImageIdentifier)imageIdentifier; @end From ffbf84f13b54a44dbd0b7ef64e3450901648794d Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Sat, 19 Sep 2015 11:05:01 -0700 Subject: [PATCH 16/37] Point travis at 9.0 SDK --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4d09065e..60531d5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: objective-c osx_image: xcode7 +xcode_sdk: + - iphonesimulator9.0 before_install: - brew update - brew reinstall xctool From dc5650d6fa62a6378471b862c439a0ef0f9a2f0d Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Sat, 19 Sep 2015 11:14:22 -0700 Subject: [PATCH 17/37] Revert "Point travis at 9.0 SDK" This reverts commit ffbf84f13b54a44dbd0b7ef64e3450901648794d. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 60531d5a..4d09065e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ language: objective-c osx_image: xcode7 -xcode_sdk: - - iphonesimulator9.0 before_install: - brew update - brew reinstall xctool From 70c5582af7c6ff41c7fdf82567c588c99ff0c0dc Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Sat, 19 Sep 2015 11:14:45 -0700 Subject: [PATCH 18/37] Bump SDK in build.sh --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 55980eb7..2c0bc6da 100755 --- a/build.sh +++ b/build.sh @@ -1,8 +1,8 @@ #!/bin/bash # **** Update me when new Xcode versions are released! **** -PLATFORM="platform=iOS Simulator,OS=8.1,name=iPhone 6" -SDK="iphonesimulator8.1" +PLATFORM="platform=iOS Simulator,OS=9.0,name=iPhone 6" +SDK="iphonesimulator9.0" # It is pitch black. From 441a0e6928b8f55453936118422ff6768e71ab9d Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Sun, 20 Sep 2015 22:32:04 -0700 Subject: [PATCH 19/37] Update types for drawParameters --- AsyncDisplayKit/ASDisplayNode+Subclasses.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AsyncDisplayKit/ASDisplayNode+Subclasses.h b/AsyncDisplayKit/ASDisplayNode+Subclasses.h index 3ecd08e1..7f94e3f2 100644 --- a/AsyncDisplayKit/ASDisplayNode+Subclasses.h +++ b/AsyncDisplayKit/ASDisplayNode+Subclasses.h @@ -193,7 +193,7 @@ NS_ASSUME_NONNULL_BEGIN * @note Called on the display queue and/or main queue (MUST BE THREAD SAFE) */ + (void)drawRect:(CGRect)bounds - withParameters:(id)parameters + withParameters:(nullable id)parameters isCancelled:(asdisplaynode_iscancelled_block_t)isCancelledBlock isRasterizing:(BOOL)isRasterizing; @@ -210,7 +210,7 @@ NS_ASSUME_NONNULL_BEGIN * * @note Called on the display queue and/or main queue (MUST BE THREAD SAFE) */ -+ (nullable UIImage *)displayWithParameters:(id)parameters ++ (nullable UIImage *)displayWithParameters:(nullable id)parameters isCancelled:(asdisplaynode_iscancelled_block_t)isCancelledBlock; /** @@ -220,7 +220,7 @@ NS_ASSUME_NONNULL_BEGIN * * @note Called on the main thread only */ -- (NSObject *)drawParametersForAsyncLayer:(_ASDisplayLayer *)layer; +- (nullable id)drawParametersForAsyncLayer:(_ASDisplayLayer *)layer; /** * @abstract Indicates that the receiver is about to display. From 73af8f1c8b382c5911dcb5af9deeb68a27ef3497 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Sat, 26 Sep 2015 18:05:12 -0700 Subject: [PATCH 20/37] Simplify ASImageIdentifier definition --- AsyncDisplayKit/ASMultiplexImageNode.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AsyncDisplayKit/ASMultiplexImageNode.h b/AsyncDisplayKit/ASMultiplexImageNode.h index d395d962..9c280768 100644 --- a/AsyncDisplayKit/ASMultiplexImageNode.h +++ b/AsyncDisplayKit/ASMultiplexImageNode.h @@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN @protocol ASMultiplexImageNodeDelegate; @protocol ASMultiplexImageNodeDataSource; -typedef __kindof NSObject * ASImageIdentifier; +typedef id ASImageIdentifier; extern NSString *const ASMultiplexImageNodeErrorDomain; From ee970d412b70ca1681cb1a981f84d130905c5796 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Mon, 5 Oct 2015 13:48:09 -0700 Subject: [PATCH 21/37] Annotate ASCollectionViewProtocols.h --- AsyncDisplayKit/ASCollectionViewProtocols.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/AsyncDisplayKit/ASCollectionViewProtocols.h b/AsyncDisplayKit/ASCollectionViewProtocols.h index 0f0b5ed7..5c4bcf96 100644 --- a/AsyncDisplayKit/ASCollectionViewProtocols.h +++ b/AsyncDisplayKit/ASCollectionViewProtocols.h @@ -6,6 +6,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ +NS_ASSUME_NONNULL_BEGIN + /** * This is a subset of UICollectionViewDataSource. * @@ -50,7 +52,9 @@ - (void)collectionView:(UICollectionView *)collectionView didDeselectItemAtIndexPath:(NSIndexPath *)indexPath; - (BOOL)collectionView:(UICollectionView *)collectionView shouldShowMenuForItemAtIndexPath:(NSIndexPath *)indexPath; -- (BOOL)collectionView:(UICollectionView *)collectionView canPerformAction:(SEL)action forItemAtIndexPath:(NSIndexPath *)indexPath withSender:(id)sender; -- (void)collectionView:(UICollectionView *)collectionView performAction:(SEL)action forItemAtIndexPath:(NSIndexPath *)indexPath withSender:(id)sender; +- (BOOL)collectionView:(UICollectionView *)collectionView canPerformAction:(SEL)action forItemAtIndexPath:(NSIndexPath *)indexPath withSender:(nullable id)sender; +- (void)collectionView:(UICollectionView *)collectionView performAction:(SEL)action forItemAtIndexPath:(NSIndexPath *)indexPath withSender:(nullable id)sender; @end + +NS_ASSUME_NONNULL_END From fb0341215f34d0b49e1346a690a9510f2c820d2b Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Tue, 13 Oct 2015 21:27:18 -0700 Subject: [PATCH 22/37] Fix nullability in MultiplexImageNodeDataSource --- AsyncDisplayKit/ASMultiplexImageNode.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AsyncDisplayKit/ASMultiplexImageNode.h b/AsyncDisplayKit/ASMultiplexImageNode.h index 2178893f..31e22763 100644 --- a/AsyncDisplayKit/ASMultiplexImageNode.h +++ b/AsyncDisplayKit/ASMultiplexImageNode.h @@ -225,7 +225,7 @@ didFinishDownloadingImageWithIdentifier:(ASImageIdentifier)imageIdentifier * @note This method may be called from any thread. * @return A PHAsset corresponding to `assetLocalIdentifier`, or nil if none is available. */ -- (PHAsset *)multiplexImageNode:(ASMultiplexImageNode *)imageNode assetForLocalIdentifier:(NSString *)assetLocalIdentifier; +- (nullable PHAsset *)multiplexImageNode:(ASMultiplexImageNode *)imageNode assetForLocalIdentifier:(NSString *)assetLocalIdentifier; @end From 0e90d0556f0d9e9fe3e08147f8d4ed54e5841fe2 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Wed, 28 Oct 2015 21:15:14 -0700 Subject: [PATCH 23/37] Fix UIView+ASConvenience.h merge --- AsyncDisplayKit/Details/UIView+ASConvenience.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AsyncDisplayKit/Details/UIView+ASConvenience.h b/AsyncDisplayKit/Details/UIView+ASConvenience.h index 43b8a1a7..4557d9b8 100644 --- a/AsyncDisplayKit/Details/UIView+ASConvenience.h +++ b/AsyncDisplayKit/Details/UIView+ASConvenience.h @@ -80,3 +80,5 @@ NS_ASSUME_NONNULL_BEGIN @property (nullable, nonatomic, copy) NSString *accessibilityIdentifier; @end + +NS_ASSUME_NONNULL_END From f2a095a4591e3ae455b7916e0d2f5f4c8defbeb0 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Wed, 28 Oct 2015 21:18:13 -0700 Subject: [PATCH 24/37] Fix test build by casting test image identifiers --- AsyncDisplayKitTests/ASMultiplexImageNodeTests.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AsyncDisplayKitTests/ASMultiplexImageNodeTests.m b/AsyncDisplayKitTests/ASMultiplexImageNodeTests.m index a08173d5..069b545d 100644 --- a/AsyncDisplayKitTests/ASMultiplexImageNodeTests.m +++ b/AsyncDisplayKitTests/ASMultiplexImageNodeTests.m @@ -278,7 +278,7 @@ static BOOL ASRunRunLoopUntilBlockIsTrue(BOOL (^block)()) return; // Bail if it's trying to load an identifier that's more than one step than what's loaded. - NSInteger nextImageIdentifier = [imageNode.loadedImageIdentifier integerValue] + 1; + NSInteger nextImageIdentifier = [(NSNumber *)imageNode.loadedImageIdentifier integerValue] + 1; if (requestedIdentifierValue != nextImageIdentifier) return; @@ -344,7 +344,7 @@ static BOOL ASRunRunLoopUntilBlockIsTrue(BOOL (^block)()) // Wait until the image is loaded. ASRunRunLoopUntilBlockIsTrue(^BOOL{ - return [imageNode.loadedImageIdentifier isEqual:imageIdentifier]; + return [(id)imageNode.loadedImageIdentifier isEqual:imageIdentifier]; }); // Verify the delegation. From 82c1549d8f1dbaa0ac9ea8653a3476059bb99d24 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Thu, 29 Oct 2015 09:57:27 -0700 Subject: [PATCH 25/37] Fix nullability of ASDisplayNode.name --- AsyncDisplayKit/ASDisplayNode.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AsyncDisplayKit/ASDisplayNode.h b/AsyncDisplayKit/ASDisplayNode.h index 12acd996..09d57a50 100644 --- a/AsyncDisplayKit/ASDisplayNode.h +++ b/AsyncDisplayKit/ASDisplayNode.h @@ -113,7 +113,7 @@ typedef void (^ASDisplayNodeDidLoadBlock)(ASDisplayNode *node); /** * @abstract The name of this node, which will be displayed in `description`. The default value is nil. */ -@property (atomic, copy) NSString *name; +@property (nullable, atomic, copy) NSString *name; /** * @abstract Returns whether the node is synchronous. From bfe3040f5745f2cc718e166835f51d2312164b46 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Mon, 9 Nov 2015 10:10:37 -0800 Subject: [PATCH 26/37] Update nullability in ASCellNode.h --- AsyncDisplayKit/ASCellNode.h | 8 ++++---- AsyncDisplayKit/ASCellNode.m | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/AsyncDisplayKit/ASCellNode.h b/AsyncDisplayKit/ASCellNode.h index c7a5e604..c42b1a08 100644 --- a/AsyncDisplayKit/ASCellNode.h +++ b/AsyncDisplayKit/ASCellNode.h @@ -87,10 +87,10 @@ typedef NSUInteger ASCellNodeAnimation; * ASCellNode must forward touch events in order for UITableView and UICollectionView tap handling to work. Overriding * these methods (e.g. for highlighting) requires the super method be called. */ -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; -- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; -- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; -- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; +- (void)touchesBegan:(NSSet *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; +- (void)touchesMoved:(NSSet *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; +- (void)touchesEnded:(NSSet *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; +- (void)touchesCancelled:(NSSet *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; /** * Marks the node as needing layout. Convenience for use whether the view / layer is loaded or not. Safe to call from a background thread. diff --git a/AsyncDisplayKit/ASCellNode.m b/AsyncDisplayKit/ASCellNode.m index a56e9f35..3881aff9 100644 --- a/AsyncDisplayKit/ASCellNode.m +++ b/AsyncDisplayKit/ASCellNode.m @@ -113,7 +113,8 @@ static const CGFloat kFontSize = 18.0f; { if (!(self = [super init])) return nil; - + + _text = @""; _textNode = [[ASTextNode alloc] init]; [self addSubnode:_textNode]; From 057e98380e18a2c0fb781e6b58ef6d55f433ec65 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Fri, 13 Nov 2015 12:02:09 -0800 Subject: [PATCH 27/37] Add NSObjectProtocol requirement to ASImageIdentifier --- AsyncDisplayKit/ASMultiplexImageNode.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AsyncDisplayKit/ASMultiplexImageNode.h b/AsyncDisplayKit/ASMultiplexImageNode.h index b6c6e97b..25e463b2 100644 --- a/AsyncDisplayKit/ASMultiplexImageNode.h +++ b/AsyncDisplayKit/ASMultiplexImageNode.h @@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN @protocol ASMultiplexImageNodeDelegate; @protocol ASMultiplexImageNodeDataSource; -typedef id ASImageIdentifier; +typedef id ASImageIdentifier; extern NSString *const ASMultiplexImageNodeErrorDomain; From 7922895b60f6d07cc167c22a2e341a91ef298c84 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Fri, 13 Nov 2015 12:11:24 -0800 Subject: [PATCH 28/37] (Re?)add type annotations on touchesBegan:withEvent: et al --- AsyncDisplayKit/ASCellNode.h | 8 ++++---- AsyncDisplayKit/ASDisplayNode+Subclasses.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AsyncDisplayKit/ASCellNode.h b/AsyncDisplayKit/ASCellNode.h index 04c0b71e..4877824d 100644 --- a/AsyncDisplayKit/ASCellNode.h +++ b/AsyncDisplayKit/ASCellNode.h @@ -78,10 +78,10 @@ typedef NSUInteger ASCellNodeAnimation; * ASCellNode must forward touch events in order for UITableView and UICollectionView tap handling to work. Overriding * these methods (e.g. for highlighting) requires the super method be called. */ -- (void)touchesBegan:(NSSet *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; -- (void)touchesMoved:(NSSet *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; -- (void)touchesEnded:(NSSet *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; -- (void)touchesCancelled:(NSSet *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; +- (void)touchesBegan:(NSSet *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; +- (void)touchesMoved:(NSSet *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; +- (void)touchesEnded:(NSSet *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; +- (void)touchesCancelled:(NSSet *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; /** * Marks the node as needing layout. Convenience for use whether the view / layer is loaded or not. diff --git a/AsyncDisplayKit/ASDisplayNode+Subclasses.h b/AsyncDisplayKit/ASDisplayNode+Subclasses.h index b1b2ac10..0a8e4be5 100644 --- a/AsyncDisplayKit/ASDisplayNode+Subclasses.h +++ b/AsyncDisplayKit/ASDisplayNode+Subclasses.h @@ -307,7 +307,7 @@ NS_ASSUME_NONNULL_BEGIN * @param touches A set of UITouch instances. * @param event A UIEvent associated with the touch. */ -- (void)touchesBegan:(NSSet *)touches withEvent:(nullable UIEvent *)event; +- (void)touchesBegan:(NSSet *)touches withEvent:(nullable UIEvent *)event; /** * @abstract Tells the node when touches moved in its view. @@ -315,7 +315,7 @@ NS_ASSUME_NONNULL_BEGIN * @param touches A set of UITouch instances. * @param event A UIEvent associated with the touch. */ -- (void)touchesMoved:(NSSet *)touches withEvent:(nullable UIEvent *)event; +- (void)touchesMoved:(NSSet *)touches withEvent:(nullable UIEvent *)event; /** * @abstract Tells the node when touches ended in its view. @@ -323,7 +323,7 @@ NS_ASSUME_NONNULL_BEGIN * @param touches A set of UITouch instances. * @param event A UIEvent associated with the touch. */ -- (void)touchesEnded:(NSSet *)touches withEvent:(nullable UIEvent *)event; +- (void)touchesEnded:(NSSet *)touches withEvent:(nullable UIEvent *)event; /** * @abstract Tells the node when touches was cancelled in its view. @@ -331,7 +331,7 @@ NS_ASSUME_NONNULL_BEGIN * @param touches A set of UITouch instances. * @param event A UIEvent associated with the touch. */ -- (void)touchesCancelled:(NSSet *)touches withEvent:(nullable UIEvent *)event; +- (void)touchesCancelled:(NSSet *)touches withEvent:(nullable UIEvent *)event; /** @name Managing Gesture Recognizers */ From ab326fc683ddf478d5d5b262671f9bb520045050 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Fri, 13 Nov 2015 12:17:17 -0800 Subject: [PATCH 29/37] touchesCancelled:withEvent: has a nullable touches argument in UIKit for some reason --- AsyncDisplayKit/ASCellNode.h | 2 +- AsyncDisplayKit/ASDisplayNode+Subclasses.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AsyncDisplayKit/ASCellNode.h b/AsyncDisplayKit/ASCellNode.h index 4877824d..54138de0 100644 --- a/AsyncDisplayKit/ASCellNode.h +++ b/AsyncDisplayKit/ASCellNode.h @@ -81,7 +81,7 @@ typedef NSUInteger ASCellNodeAnimation; - (void)touchesBegan:(NSSet *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; - (void)touchesMoved:(NSSet *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; - (void)touchesEnded:(NSSet *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; -- (void)touchesCancelled:(NSSet *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; +- (void)touchesCancelled:(nullable NSSet *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER; /** * Marks the node as needing layout. Convenience for use whether the view / layer is loaded or not. diff --git a/AsyncDisplayKit/ASDisplayNode+Subclasses.h b/AsyncDisplayKit/ASDisplayNode+Subclasses.h index 0a8e4be5..e52a37bf 100644 --- a/AsyncDisplayKit/ASDisplayNode+Subclasses.h +++ b/AsyncDisplayKit/ASDisplayNode+Subclasses.h @@ -331,7 +331,7 @@ NS_ASSUME_NONNULL_BEGIN * @param touches A set of UITouch instances. * @param event A UIEvent associated with the touch. */ -- (void)touchesCancelled:(NSSet *)touches withEvent:(nullable UIEvent *)event; +- (void)touchesCancelled:(nullable NSSet *)touches withEvent:(nullable UIEvent *)event; /** @name Managing Gesture Recognizers */ From 628bb7eb3add06d5d12050a18b27e44a5bbfb76f Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Tue, 24 Nov 2015 16:43:40 -0800 Subject: [PATCH 30/37] Revert minor deletion --- AsyncDisplayKit/Details/ASLayoutController.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AsyncDisplayKit/Details/ASLayoutController.h b/AsyncDisplayKit/Details/ASLayoutController.h index a52f24fe..22e4b12a 100644 --- a/AsyncDisplayKit/Details/ASLayoutController.h +++ b/AsyncDisplayKit/Details/ASLayoutController.h @@ -14,6 +14,8 @@ NS_ASSUME_NONNULL_BEGIN +@class ASCellNode; + typedef struct { CGFloat leadingBufferScreenfuls; CGFloat trailingBufferScreenfuls; From 8e75c594c730c0cb1b7bf226ab6f11003c71886b Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Tue, 1 Dec 2015 16:48:55 -0800 Subject: [PATCH 31/37] Add some more annotations --- AsyncDisplayKit/ASDisplayNodeExtras.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AsyncDisplayKit/ASDisplayNodeExtras.h b/AsyncDisplayKit/ASDisplayNodeExtras.h index 3cc9abb0..b387b374 100644 --- a/AsyncDisplayKit/ASDisplayNodeExtras.h +++ b/AsyncDisplayKit/ASDisplayNodeExtras.h @@ -37,17 +37,17 @@ extern ASDisplayNode *ASDisplayNodeUltimateParentOfNode(ASDisplayNode *node); In the event that a node's backing layer is not created yet, the function will only walk the direct subnodes instead of forcing the layer heirarchy to be created. */ -extern void ASDisplayNodePerformBlockOnEveryNode(CALayer *layer, ASDisplayNode *node, void(^block)(ASDisplayNode *node)); +extern void ASDisplayNodePerformBlockOnEveryNode(CALayer * _Nullable layer, ASDisplayNode * _Nullable node, void(^block)(ASDisplayNode *node)); /** Given a display node, traverses up the layer tree hierarchy, returning the first display node that passes block. */ -extern id ASDisplayNodeFind(ASDisplayNode * _Nullable node, BOOL (^block)(ASDisplayNode *node)); +extern id _Nullable ASDisplayNodeFind(ASDisplayNode * _Nullable node, BOOL (^block)(ASDisplayNode *node)); /** Given a display node, traverses up the layer tree hierarchy, returning the first display node of kind class. */ -extern id ASDisplayNodeFindClass(ASDisplayNode *start, Class c); +extern id _Nullable ASDisplayNodeFindClass(ASDisplayNode *start, Class c); /** * Given two nodes, finds their most immediate common parent. Used for geometry conversion methods. From 1fd65c2f254f1f7d60833f1fbf8fa3d7267e8f1d Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Tue, 1 Dec 2015 21:57:45 -0800 Subject: [PATCH 32/37] Annotate ASAsciiArtBoxCreator.h --- AsyncDisplayKit/Layout/ASAsciiArtBoxCreator.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/AsyncDisplayKit/Layout/ASAsciiArtBoxCreator.h b/AsyncDisplayKit/Layout/ASAsciiArtBoxCreator.h index 15d825a5..18a925a7 100644 --- a/AsyncDisplayKit/Layout/ASAsciiArtBoxCreator.h +++ b/AsyncDisplayKit/Layout/ASAsciiArtBoxCreator.h @@ -10,6 +10,8 @@ #import +NS_ASSUME_NONNULL_BEGIN + @protocol ASLayoutableAsciiArtProtocol /** * Returns an ascii-art representation of this object and its children. @@ -41,7 +43,7 @@ * | ASTextNode ASTextNode ASTextNode | * ---------------------------------------- */ -+ (NSString *)horizontalBoxStringForChildren:(NSArray *)children parent:(NSString *)parent; ++ (NSString *)horizontalBoxStringForChildren:(NSArray *)children parent:(NSString *)parent; /** * Renders an ascii art box with the children aligned vertically. @@ -52,8 +54,8 @@ * | ASTextNode | * --------------------- */ -+ (NSString *)verticalBoxStringForChildren:(NSArray *)children parent:(NSString *)parent; ++ (NSString *)verticalBoxStringForChildren:(NSArray *)children parent:(NSString *)parent; @end - +NS_ASSUME_NONNULL_END From e202b18db9ac7d01640a16a573e0cb6c681c6ec4 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Sun, 13 Dec 2015 10:07:14 -0800 Subject: [PATCH 33/37] Annotate some new stuff --- AsyncDisplayKit/ASMapNode.h | 8 ++++++-- AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/AsyncDisplayKit/ASMapNode.h b/AsyncDisplayKit/ASMapNode.h index e5fcbd49..eb450b1c 100644 --- a/AsyncDisplayKit/ASMapNode.h +++ b/AsyncDisplayKit/ASMapNode.h @@ -9,6 +9,8 @@ #import #import +NS_ASSUME_NONNULL_BEGIN + @interface ASMapNode : ASImageNode - (instancetype)initWithCoordinate:(CLLocationCoordinate2D)coordinate NS_DESIGNATED_INITIALIZER; @@ -16,7 +18,7 @@ /** This is the MKMapView that is the live map part of ASMapNode. This will be nil if .liveMap = NO. Note, MKMapView is *not* thread-safe. */ -@property (nonatomic, readonly) MKMapView *mapView; +@property (nullable, nonatomic, readonly) MKMapView *mapView; /** Set this to YES to turn the snapshot into an interactive MKMapView and vice versa. Defaults to NO. @@ -38,6 +40,8 @@ * @discussion This method set the annotations of the static map view and also to the live map view. Passing an empty array clears the map of any annotations. * @param annotations An array of objects that conform to the MKAnnotation protocol */ -- (void)setAnnotations:(NSArray *)annotations; +- (void)setAnnotations:(NSArray> *)annotations; @end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h b/AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h index 58cc12c3..dcc2ea26 100644 --- a/AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h +++ b/AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h @@ -19,6 +19,8 @@ #import "ASThread.h" #import "ASLayoutOptions.h" +NS_ASSUME_NONNULL_BEGIN + /** Hierarchy state is propogated from nodes to all of their children when certain behaviors are required from the subtree. Examples include rasterization and external driving of the .interfaceState property. @@ -101,9 +103,11 @@ typedef NS_OPTIONS(NSUInteger, ASHierarchyState) @end @interface UIView (ASDisplayNodeInternal) -@property (nonatomic, assign, readwrite) ASDisplayNode *asyncdisplaykit_node; +@property (nullable, nonatomic, assign, readwrite) ASDisplayNode *asyncdisplaykit_node; @end @interface CALayer (ASDisplayNodeInternal) -@property (nonatomic, assign, readwrite) ASDisplayNode *asyncdisplaykit_node; +@property (nullable, nonatomic, assign, readwrite) ASDisplayNode *asyncdisplaykit_node; @end + +NS_ASSUME_NONNULL_END From c6fa897dc2826bad6f32c5ecc6ad1f0c5afc84df Mon Sep 17 00:00:00 2001 From: Scott Goodson Date: Fri, 25 Dec 2015 15:35:52 -0800 Subject: [PATCH 34/37] Add nullability annotations to newer APIs that lacked it from the original PR. --- AsyncDisplayKit-Prefix.gcda | Bin 656 -> 656 bytes AsyncDisplayKit/ASDisplayNode.h | 2 +- AsyncDisplayKit/ASTableView.h | 8 +++----- AsyncDisplayKit/ASViewController.m | 6 ++++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AsyncDisplayKit-Prefix.gcda b/AsyncDisplayKit-Prefix.gcda index 7564c6c3f5969754bf6ba6879ed2be0be65a12ff..83c74d3faa7677539da52471bcce34199dab999b 100644 GIT binary patch literal 656 zcmb`E%}T^D6on`Ltwix3T)EbbGo!;e;G#HP3`miQZWIYIy-tgv8IrWncknG-&s(_h z8Ql9E-n4<4ML`7v=iW3V-#v%&SWJ#Pr)RBtkxjpGZ5?&;5Kx-&sY#T*1!J$cfg>h) zsd5`+@h~-0{D@QxgGc|AU?*Fy_=64X%^VFP*Cs7MmeTZgo~F{mUIy}o<|r%7Q+JDb{T8;3aFr1 zn6YSLa?=lJoi?KEf=j6cw@Qy_mxWwUT0E2ztl;LYWB=M}e&@B#!rWKZ}{ uMt6Po7d}pk5J&d0tfG3e+3U`K@Xv(=uB!|#tebI&WexR7-oFlhnDGsPqqmj- literal 656 zcmYdHNlw=?GB9a6bMz1c0|TQ1kN|-u_8Tg)Ksr9k&)Cp0IJhJ+Iom0*I5j6TFEt>) zII|=(KQA@KC$TcWw8T6)KewQ?B-J&@+sGKI7F`Wc$_Oe2(G*;enjBnGnUfmiZ3wa; zvnn+xF)uw8Xs2UAK@N~&6ao=IEck5i2Yw(OALV0cngn%(TYiyeNop=`a|66B9D^Zt z0rfhjqy&SE69y7YK-{({PDlVq1N|3VVjLfDXjYb*Tmm#R)FM89`ma9&q;>0v!!;ay%$Vh<7){e4r2fK<0}9305FBTf4Rg6gCu_Z; +@protocol ASTableViewDelegate @end ->>>>>>> master + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKit/ASViewController.m b/AsyncDisplayKit/ASViewController.m index 519ac4b3..96797855 100644 --- a/AsyncDisplayKit/ASViewController.m +++ b/AsyncDisplayKit/ASViewController.m @@ -18,12 +18,14 @@ - (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - return [self initWithNode:nil]; + ASDisplayNodeAssert(NO, @"ASViewController requires using -initWithNode:"); + return [self initWithNode:[[ASDisplayNode alloc] init]]; } - (instancetype)initWithCoder:(NSCoder *)aDecoder { - return [self initWithNode:nil]; + ASDisplayNodeAssert(NO, @"ASViewController requires using -initWithNode:"); + return [self initWithNode:[[ASDisplayNode alloc] init]]; } - (instancetype)initWithNode:(ASDisplayNode *)node From 89f9fc551f4c05eda9c1581af547373e31dfdf62 Mon Sep 17 00:00:00 2001 From: Scott Goodson Date: Fri, 25 Dec 2015 15:59:46 -0800 Subject: [PATCH 35/37] Update Travis build server to use Xcode 7.2. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 520f2f76..fd3259eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode7 +osx_image: xcode7.2 before_install: - brew update - brew reinstall xctool From a2cf2a88e63a56ccf77b0b236ec3fbfd35aa4d38 Mon Sep 17 00:00:00 2001 From: Scott Goodson Date: Fri, 25 Dec 2015 19:22:00 -0800 Subject: [PATCH 36/37] Overhaul header files / includes to eliminate circular references that Xcode 7 is angry about. --- AsyncDisplayKit/ASButtonNode.h | 3 ++- AsyncDisplayKit/ASButtonNode.mm | 5 +++-- AsyncDisplayKit/ASCollectionView.mm | 1 - AsyncDisplayKit/ASControlNode+Subclasses.h | 2 +- AsyncDisplayKit/ASDisplayNode.mm | 4 +++- AsyncDisplayKit/ASMapNode.h | 2 +- AsyncDisplayKit/ASMapNode.mm | 2 ++ AsyncDisplayKit/ASPagerNode.m | 3 +-- AsyncDisplayKit/ASTableNode.h | 2 +- AsyncDisplayKit/ASTableNode.m | 2 ++ AsyncDisplayKit/ASTableView.mm | 2 -- AsyncDisplayKit/ASTableViewInternal.h | 2 +- AsyncDisplayKit/AsyncDisplayKit.h | 2 -- .../Details/ASCollectionViewFlowLayoutInspector.m | 1 - AsyncDisplayKit/Details/ASDataController+Subclasses.h | 7 ++++++- AsyncDisplayKit/Details/ASDataController.h | 10 +++++++--- AsyncDisplayKit/Details/ASRangeController.h | 1 - AsyncDisplayKit/Details/CGRect+ASConvenience.h | 1 + AsyncDisplayKit/Layout/ASLayoutOptions.h | 3 ++- AsyncDisplayKit/Layout/ASLayoutSpec.mm | 3 +-- AsyncDisplayKit/Layout/ASStackLayoutSpec.mm | 3 --- AsyncDisplayKit/Layout/ASStaticLayoutSpec.mm | 1 - .../Private/ASBasicImageDownloaderInternal.h | 3 --- AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm | 4 ++++ .../Private/ASDisplayNode+FrameworkPrivate.h | 3 +-- AsyncDisplayKit/Private/ASDisplayNodeInternal.h | 6 ++++-- AsyncDisplayKit/Private/ASStackPositionedLayout.h | 1 - AsyncDisplayKit/Private/_ASHierarchyChangeSet.h | 4 +++- 28 files changed, 46 insertions(+), 37 deletions(-) diff --git a/AsyncDisplayKit/ASButtonNode.h b/AsyncDisplayKit/ASButtonNode.h index 57b7caf1..81564962 100644 --- a/AsyncDisplayKit/ASButtonNode.h +++ b/AsyncDisplayKit/ASButtonNode.h @@ -6,7 +6,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import +#import +#import typedef enum : NSUInteger { ASButtonStateNormal, diff --git a/AsyncDisplayKit/ASButtonNode.mm b/AsyncDisplayKit/ASButtonNode.mm index 196216a6..0d400441 100644 --- a/AsyncDisplayKit/ASButtonNode.mm +++ b/AsyncDisplayKit/ASButtonNode.mm @@ -7,8 +7,9 @@ */ #import "ASButtonNode.h" - -#import +#import "ASStackLayoutSpec.h" +#import "ASThread.h" +#import "ASDisplayNode+Subclasses.h" @interface ASButtonNode () { diff --git a/AsyncDisplayKit/ASCollectionView.mm b/AsyncDisplayKit/ASCollectionView.mm index c044919b..8686ce6c 100644 --- a/AsyncDisplayKit/ASCollectionView.mm +++ b/AsyncDisplayKit/ASCollectionView.mm @@ -9,7 +9,6 @@ #import "ASAssert.h" #import "ASBatchFetching.h" #import "ASDelegateProxy.h" -#import "ASCollectionView.h" #import "ASCollectionNode.h" #import "ASCollectionDataController.h" #import "ASCollectionViewLayoutController.h" diff --git a/AsyncDisplayKit/ASControlNode+Subclasses.h b/AsyncDisplayKit/ASControlNode+Subclasses.h index 085eb9bb..107de031 100644 --- a/AsyncDisplayKit/ASControlNode+Subclasses.h +++ b/AsyncDisplayKit/ASControlNode+Subclasses.h @@ -6,7 +6,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import +#import "ASControlNode.h" NS_ASSUME_NONNULL_BEGIN diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm index 52f38cda..19c972f7 100644 --- a/AsyncDisplayKit/ASDisplayNode.mm +++ b/AsyncDisplayKit/ASDisplayNode.mm @@ -6,7 +6,6 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "ASDisplayNode.h" #import "ASDisplayNodeInternal.h" #import "ASDisplayNode+Subclasses.h" #import "ASDisplayNode+FrameworkPrivate.h" @@ -49,6 +48,9 @@ #define TIME_SCOPED(outVar) #endif +@interface ASDisplayNode () <_ASDisplayLayerDelegate> +@end + @implementation ASDisplayNode // these dynamic properties all defined in ASLayoutOptionsPrivate.m diff --git a/AsyncDisplayKit/ASMapNode.h b/AsyncDisplayKit/ASMapNode.h index e0083506..0a8b0ebb 100644 --- a/AsyncDisplayKit/ASMapNode.h +++ b/AsyncDisplayKit/ASMapNode.h @@ -6,7 +6,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/AsyncDisplayKit/ASMapNode.mm b/AsyncDisplayKit/ASMapNode.mm index 480360a1..ce4f3fc8 100644 --- a/AsyncDisplayKit/ASMapNode.mm +++ b/AsyncDisplayKit/ASMapNode.mm @@ -7,6 +7,8 @@ */ #import "ASMapNode.h" +#import +#import #import #import #import diff --git a/AsyncDisplayKit/ASPagerNode.m b/AsyncDisplayKit/ASPagerNode.m index d4537d0a..b8a52f73 100644 --- a/AsyncDisplayKit/ASPagerNode.m +++ b/AsyncDisplayKit/ASPagerNode.m @@ -8,8 +8,7 @@ #import "ASPagerNode.h" #import "ASDelegateProxy.h" - -#import +#import "ASDisplayNode+Subclasses.h" @interface ASPagerNode () { UICollectionViewFlowLayout *_flowLayout; diff --git a/AsyncDisplayKit/ASTableNode.h b/AsyncDisplayKit/ASTableNode.h index 9ab36470..13d5c88f 100644 --- a/AsyncDisplayKit/ASTableNode.h +++ b/AsyncDisplayKit/ASTableNode.h @@ -6,7 +6,7 @@ // Copyright © 2015 Facebook. All rights reserved. // -#import +#import /** * ASTableNode is a node based class that wraps an ASTableView. It can be used diff --git a/AsyncDisplayKit/ASTableNode.m b/AsyncDisplayKit/ASTableNode.m index f45f742d..2917b73c 100644 --- a/AsyncDisplayKit/ASTableNode.m +++ b/AsyncDisplayKit/ASTableNode.m @@ -6,7 +6,9 @@ // Copyright © 2015 Facebook. All rights reserved. // +#import "ASFlowLayoutController.h" #import "ASTableNode.h" +#import "ASDisplayNode+Subclasses.h" @interface _ASTablePendingState : NSObject @property (weak, nonatomic) id delegate; diff --git a/AsyncDisplayKit/ASTableView.mm b/AsyncDisplayKit/ASTableView.mm index a5e65178..b2f6457f 100644 --- a/AsyncDisplayKit/ASTableView.mm +++ b/AsyncDisplayKit/ASTableView.mm @@ -6,9 +6,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "ASTableView.h" #import "ASTableViewInternal.h" -#import "ASTableNode.h" #import "ASAssert.h" #import "ASBatchFetching.h" diff --git a/AsyncDisplayKit/ASTableViewInternal.h b/AsyncDisplayKit/ASTableViewInternal.h index af940837..8d43beaf 100644 --- a/AsyncDisplayKit/ASTableViewInternal.h +++ b/AsyncDisplayKit/ASTableViewInternal.h @@ -6,7 +6,7 @@ // Copyright (c) 2015 Facebook. All rights reserved. // -#import "ASTableView.h" +#import "ASTableNode.h" @class ASDataController; diff --git a/AsyncDisplayKit/AsyncDisplayKit.h b/AsyncDisplayKit/AsyncDisplayKit.h index 0cb9a32f..b854d756 100644 --- a/AsyncDisplayKit/AsyncDisplayKit.h +++ b/AsyncDisplayKit/AsyncDisplayKit.h @@ -52,8 +52,6 @@ #import #import #import -#import -#import #import #import #import diff --git a/AsyncDisplayKit/Details/ASCollectionViewFlowLayoutInspector.m b/AsyncDisplayKit/Details/ASCollectionViewFlowLayoutInspector.m index f98afbb9..61687308 100644 --- a/AsyncDisplayKit/Details/ASCollectionViewFlowLayoutInspector.m +++ b/AsyncDisplayKit/Details/ASCollectionViewFlowLayoutInspector.m @@ -9,7 +9,6 @@ #import #import "ASCollectionViewFlowLayoutInspector.h" - #import "ASCollectionView.h" #import "ASAssert.h" #import "ASEqualityHelpers.h" diff --git a/AsyncDisplayKit/Details/ASDataController+Subclasses.h b/AsyncDisplayKit/Details/ASDataController+Subclasses.h index 23c28e9a..32d78791 100644 --- a/AsyncDisplayKit/Details/ASDataController+Subclasses.h +++ b/AsyncDisplayKit/Details/ASDataController+Subclasses.h @@ -6,7 +6,10 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "ASDataController.h" +#ifndef ASDataControllerSubclasses_Included +#define ASDataControllerSubclasses_Included + +//#import "ASDataController.h" @interface ASDataController (Subclasses) @@ -157,3 +160,5 @@ - (void)willMoveSection:(NSInteger)section toSection:(NSInteger)newSection; @end + +#endif diff --git a/AsyncDisplayKit/Details/ASDataController.h b/AsyncDisplayKit/Details/ASDataController.h index 8b27d7e2..5710b22b 100644 --- a/AsyncDisplayKit/Details/ASDataController.h +++ b/AsyncDisplayKit/Details/ASDataController.h @@ -6,19 +6,21 @@ * of patent rights can be found in the PATENTS file in the same directory. */ +#ifndef ASDataController_Included +#define ASDataController_Included + #import #import #import -#import "ASFlowLayoutController.h" +#import NS_ASSUME_NONNULL_BEGIN @class ASCellNode; @class ASDataController; -FOUNDATION_EXPORT NSString * const ASDataControllerRowNodeKind; - typedef NSUInteger ASDataControllerAnimationOptions; +FOUNDATION_EXPORT NSString * const ASDataControllerRowNodeKind; /** Data source for data controller @@ -192,3 +194,5 @@ typedef NSUInteger ASDataControllerAnimationOptions; @end NS_ASSUME_NONNULL_END + +#endif diff --git a/AsyncDisplayKit/Details/ASRangeController.h b/AsyncDisplayKit/Details/ASRangeController.h index 6e35cd41..3e8e00a5 100644 --- a/AsyncDisplayKit/Details/ASRangeController.h +++ b/AsyncDisplayKit/Details/ASRangeController.h @@ -10,7 +10,6 @@ #import #import -#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/AsyncDisplayKit/Details/CGRect+ASConvenience.h b/AsyncDisplayKit/Details/CGRect+ASConvenience.h index 9743eb49..a60b46be 100644 --- a/AsyncDisplayKit/Details/CGRect+ASConvenience.h +++ b/AsyncDisplayKit/Details/CGRect+ASConvenience.h @@ -6,6 +6,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ +#import #import #import "ASBaseDefines.h" diff --git a/AsyncDisplayKit/Layout/ASLayoutOptions.h b/AsyncDisplayKit/Layout/ASLayoutOptions.h index bda890cc..88036d1b 100644 --- a/AsyncDisplayKit/Layout/ASLayoutOptions.h +++ b/AsyncDisplayKit/Layout/ASLayoutOptions.h @@ -9,7 +9,8 @@ */ #import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/AsyncDisplayKit/Layout/ASLayoutSpec.mm b/AsyncDisplayKit/Layout/ASLayoutSpec.mm index 376c606e..dfe40084 100644 --- a/AsyncDisplayKit/Layout/ASLayoutSpec.mm +++ b/AsyncDisplayKit/Layout/ASLayoutSpec.mm @@ -8,7 +8,7 @@ * */ -#import "ASLayoutSpec.h" +#import "ASLayoutOptionsPrivate.h" #import "ASAssert.h" #import "ASBaseDefines.h" @@ -16,7 +16,6 @@ #import "ASInternalHelpers.h" #import "ASLayout.h" #import "ASLayoutOptions.h" -#import "ASLayoutOptionsPrivate.h" #import "ASThread.h" #import diff --git a/AsyncDisplayKit/Layout/ASStackLayoutSpec.mm b/AsyncDisplayKit/Layout/ASStackLayoutSpec.mm index facbbb1e..76539bf5 100644 --- a/AsyncDisplayKit/Layout/ASStackLayoutSpec.mm +++ b/AsyncDisplayKit/Layout/ASStackLayoutSpec.mm @@ -8,8 +8,6 @@ * */ -#import "ASStackLayoutSpec.h" - #import #import @@ -19,7 +17,6 @@ #import "ASLayoutSpecUtilities.h" #import "ASStackBaselinePositionedLayout.h" #import "ASStackLayoutSpecUtilities.h" -#import "ASStackPositionedLayout.h" #import "ASStackUnpositionedLayout.h" #import "ASThread.h" diff --git a/AsyncDisplayKit/Layout/ASStaticLayoutSpec.mm b/AsyncDisplayKit/Layout/ASStaticLayoutSpec.mm index ae957559..2d0edba4 100644 --- a/AsyncDisplayKit/Layout/ASStaticLayoutSpec.mm +++ b/AsyncDisplayKit/Layout/ASStaticLayoutSpec.mm @@ -14,7 +14,6 @@ #import "ASLayoutOptions.h" #import "ASInternalHelpers.h" #import "ASLayout.h" -#import "ASStaticLayoutable.h" @implementation ASStaticLayoutSpec diff --git a/AsyncDisplayKit/Private/ASBasicImageDownloaderInternal.h b/AsyncDisplayKit/Private/ASBasicImageDownloaderInternal.h index b6751a5d..210fe397 100644 --- a/AsyncDisplayKit/Private/ASBasicImageDownloaderInternal.h +++ b/AsyncDisplayKit/Private/ASBasicImageDownloaderInternal.h @@ -6,9 +6,6 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "ASThread.h" - - @interface ASBasicImageDownloaderContext : NSObject + (ASBasicImageDownloaderContext *)contextForURL:(NSURL *)URL; diff --git a/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm b/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm index b0cabb67..2566d0e2 100644 --- a/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm +++ b/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm @@ -8,10 +8,14 @@ #import "_ASCoreAnimationExtras.h" #import "_ASAsyncTransaction.h" +#import "_ASDisplayLayer.h" #import "ASAssert.h" #import "ASDisplayNodeInternal.h" #import "ASDisplayNode+FrameworkPrivate.h" +@interface ASDisplayNode () <_ASDisplayLayerDelegate> +@end + @implementation ASDisplayNode (AsyncDisplay) /** diff --git a/AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h b/AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h index 126cd869..0c016d00 100644 --- a/AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h +++ b/AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h @@ -11,7 +11,6 @@ // These methods must never be called or overridden by other classes. // -#import "_ASDisplayLayer.h" #import "_AS-objc-internal.h" #import "ASDisplayNodeExtraIvars.h" #import "ASDisplayNode.h" @@ -52,7 +51,7 @@ typedef NS_OPTIONS(NSUInteger, ASHierarchyState) ASHierarchyStateTransitioningSupernodes = 1 << 2 }; -@interface ASDisplayNode () <_ASDisplayLayerDelegate> +@interface ASDisplayNode () { @protected ASInterfaceState _interfaceState; diff --git a/AsyncDisplayKit/Private/ASDisplayNodeInternal.h b/AsyncDisplayKit/Private/ASDisplayNodeInternal.h index c4c9d2ab..ca5a7ee1 100644 --- a/AsyncDisplayKit/Private/ASDisplayNodeInternal.h +++ b/AsyncDisplayKit/Private/ASDisplayNodeInternal.h @@ -11,7 +11,6 @@ // These methods must never be called or overridden by other classes. // -#import "_ASDisplayLayer.h" #import "_AS-objc-internal.h" #import "ASDisplayNodeExtraIvars.h" #import "ASDisplayNode.h" @@ -19,6 +18,9 @@ #import "ASThread.h" #import "ASLayoutOptions.h" +@protocol _ASDisplayLayerDelegate; +@class _ASDisplayLayer; + BOOL ASDisplayNodeSubclassOverridesSelector(Class subclass, SEL selector); void ASDisplayNodeRespectThreadAffinityOfNode(ASDisplayNode *node, void (^block)()); @@ -39,7 +41,7 @@ typedef NS_OPTIONS(NSUInteger, ASDisplayNodeMethodOverrides) #define TIME_DISPLAYNODE_OPS (DEBUG || PROFILE) -@interface ASDisplayNode () <_ASDisplayLayerDelegate> +@interface ASDisplayNode () { @protected // Protects access to _view, _layer, _pendingViewState, _subnodes, _supernode, and other properties which are accessed from multiple threads. diff --git a/AsyncDisplayKit/Private/ASStackPositionedLayout.h b/AsyncDisplayKit/Private/ASStackPositionedLayout.h index 211bda5b..2ff9e526 100644 --- a/AsyncDisplayKit/Private/ASStackPositionedLayout.h +++ b/AsyncDisplayKit/Private/ASStackPositionedLayout.h @@ -10,7 +10,6 @@ #import "ASLayout.h" #import "ASDimension.h" -#import "ASStackLayoutSpec.h" #import "ASStackUnpositionedLayout.h" /** Represents a set of laid out and positioned stack layout children. */ diff --git a/AsyncDisplayKit/Private/_ASHierarchyChangeSet.h b/AsyncDisplayKit/Private/_ASHierarchyChangeSet.h index b1f39cbf..a2547ff0 100644 --- a/AsyncDisplayKit/Private/_ASHierarchyChangeSet.h +++ b/AsyncDisplayKit/Private/_ASHierarchyChangeSet.h @@ -7,7 +7,9 @@ // #import -#import "ASDataController.h" +#import + +typedef NSUInteger ASDataControllerAnimationOptions; typedef NS_ENUM(NSInteger, _ASHierarchyChangeType) { _ASHierarchyChangeTypeReload, From 7b0c82b0acde57ec33cc1ecf9a0175f40c58f4e9 Mon Sep 17 00:00:00 2001 From: Scott Goodson Date: Fri, 25 Dec 2015 19:34:45 -0800 Subject: [PATCH 37/37] Update to use iOS 9.2 simulator for testing, as Xcode 7.2 Travis apparently lacks 9.0. --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 935a0a9b..d2f19504 100755 --- a/build.sh +++ b/build.sh @@ -1,8 +1,8 @@ #!/bin/bash # **** Update me when new Xcode versions are released! **** -PLATFORM="platform=iOS Simulator,OS=9.0,name=iPhone 6" -SDK="iphonesimulator9.0" +PLATFORM="platform=iOS Simulator,OS=9.2,name=iPhone 6" +SDK="iphonesimulator9.2" # It is pitch black.