From abf8d5b9aabf8655d03aa24975e082449ab4d7f3 Mon Sep 17 00:00:00 2001 From: Hannah Troisi Date: Sat, 16 Jul 2016 10:46:55 -0700 Subject: [PATCH] [Infer] change atomic properties to nonatomic (#1932) --- AsyncDisplayKit/ASCellNode.h | 2 +- AsyncDisplayKit/ASDisplayNode.h | 66 +++++++++---------- AsyncDisplayKit/ASImageNode.h | 8 +-- AsyncDisplayKit/ASNetworkImageNode.h | 6 +- AsyncDisplayKit/ASTextNode.h | 8 +-- AsyncDisplayKit/ASVideoNode.h | 14 ++-- AsyncDisplayKit/ASVideoPlayerNode.h | 6 +- AsyncDisplayKit/Details/ASDataController.mm | 2 +- .../Details/ASHighlightOverlayLayer.h | 4 +- .../Transactions/_ASAsyncTransaction.mm | 2 +- .../Details/UIView+ASConvenience.h | 20 +++--- AsyncDisplayKit/Details/_ASDisplayLayer.h | 6 +- .../ASImageNode+AnimatedImagePrivate.h | 2 +- AsyncDisplayKitTests/ASDisplayNodeTests.m | 14 ++-- AsyncDisplayKitTests/ASTableViewTests.m | 10 +-- AsyncDisplayKitTests/ASVideoNodeTests.m | 10 +-- 16 files changed, 90 insertions(+), 90 deletions(-) diff --git a/AsyncDisplayKit/ASCellNode.h b/AsyncDisplayKit/ASCellNode.h index 5aba8ec1b3..50cdcbab9f 100644 --- a/AsyncDisplayKit/ASCellNode.h +++ b/AsyncDisplayKit/ASCellNode.h @@ -77,7 +77,7 @@ typedef NS_ENUM(NSUInteger, ASCellNodeVisibilityEvent) { /* * ASTableView uses these properties when configuring UITableViewCells that host ASCellNodes. */ -//@property (atomic, retain) UIColor *backgroundColor; +//@property (nonatomic, retain) UIColor *backgroundColor; @property (nonatomic) UITableViewCellSelectionStyle selectionStyle; /** diff --git a/AsyncDisplayKit/ASDisplayNode.h b/AsyncDisplayKit/ASDisplayNode.h index 47e03d09a7..005d9e2203 100644 --- a/AsyncDisplayKit/ASDisplayNode.h +++ b/AsyncDisplayKit/ASDisplayNode.h @@ -165,7 +165,7 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract The name of this node, which will be displayed in `description`. The default value is nil. */ -@property (nullable, atomic, copy) NSString *name; +@property (nullable, nonatomic, copy) NSString *name; /** * @abstract Returns whether the node is synchronous. @@ -193,7 +193,7 @@ NS_ASSUME_NONNULL_BEGIN * * @return YES if a view is loaded, or if layerBacked is YES and layer is not nil; NO otherwise. */ -@property (atomic, readonly, assign, getter=isNodeLoaded) BOOL nodeLoaded; +@property (nonatomic, readonly, assign, getter=isNodeLoaded) BOOL nodeLoaded; /** * @abstract Returns whether the node rely on a layer instead of a view. @@ -303,7 +303,7 @@ NS_ASSUME_NONNULL_BEGIN * * @return The preferred frame size of this node */ -@property (atomic, assign, readwrite) CGSize preferredFrameSize; +@property (nonatomic, assign, readwrite) CGSize preferredFrameSize; /** @name Managing the nodes hierarchy */ @@ -646,27 +646,27 @@ NS_ASSUME_NONNULL_END */ - (void)setNeedsLayout; -@property (atomic, strong, nullable) id contents; // default=nil -@property (atomic, assign) BOOL clipsToBounds; // default==NO -@property (atomic, getter=isOpaque) BOOL opaque; // default==YES +@property (nonatomic, strong, nullable) id contents; // default=nil +@property (nonatomic, assign) BOOL clipsToBounds; // default==NO +@property (nonatomic, getter=isOpaque) BOOL opaque; // default==YES -@property (atomic, assign) BOOL allowsEdgeAntialiasing; -@property (atomic, assign) unsigned int edgeAntialiasingMask; // default==all values from CAEdgeAntialiasingMask +@property (nonatomic, assign) BOOL allowsEdgeAntialiasing; +@property (nonatomic, assign) unsigned int edgeAntialiasingMask; // default==all values from CAEdgeAntialiasingMask -@property (atomic, getter=isHidden) BOOL hidden; // default==NO -@property (atomic, assign) BOOL needsDisplayOnBoundsChange; // default==NO -@property (atomic, assign) BOOL autoresizesSubviews; // default==YES (undefined for layer-backed nodes) -@property (atomic, assign) UIViewAutoresizing autoresizingMask; // default==UIViewAutoresizingNone (undefined for layer-backed nodes) -@property (atomic, assign) CGFloat alpha; // default=1.0f -@property (atomic, assign) CGRect bounds; // default=CGRectZero -@property (atomic, assign) CGRect frame; // default=CGRectZero -@property (atomic, assign) CGPoint anchorPoint; // default={0.5, 0.5} -@property (atomic, assign) CGFloat zPosition; // default=0.0 -@property (atomic, assign) CGPoint position; // default=CGPointZero -@property (atomic, assign) CGFloat cornerRadius; // default=0.0 -@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 (nonatomic, getter=isHidden) BOOL hidden; // default==NO +@property (nonatomic, assign) BOOL needsDisplayOnBoundsChange; // default==NO +@property (nonatomic, assign) BOOL autoresizesSubviews; // default==YES (undefined for layer-backed nodes) +@property (nonatomic, assign) UIViewAutoresizing autoresizingMask; // default==UIViewAutoresizingNone (undefined for layer-backed nodes) +@property (nonatomic, assign) CGFloat alpha; // default=1.0f +@property (nonatomic, assign) CGRect bounds; // default=CGRectZero +@property (nonatomic, assign) CGRect frame; // default=CGRectZero +@property (nonatomic, assign) CGPoint anchorPoint; // default={0.5, 0.5} +@property (nonatomic, assign) CGFloat zPosition; // default=0.0 +@property (nonatomic, assign) CGPoint position; // default=CGPointZero +@property (nonatomic, assign) CGFloat cornerRadius; // default=0.0 +@property (nonatomic, assign) CGFloat contentsScale; // default=1.0f. See @contentsScaleForDisplay for more info +@property (nonatomic, assign) CATransform3D transform; // default=CATransform3DIdentity +@property (nonatomic, assign) CATransform3D subnodeTransform; // default=CATransform3DIdentity /** * @abstract The node view's background color. @@ -674,9 +674,9 @@ NS_ASSUME_NONNULL_END * @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, strong, nullable) UIColor *backgroundColor; // default=nil +@property (nonatomic, strong, nullable) UIColor *backgroundColor; // default=nil -@property (atomic, strong, null_resettable) UIColor *tintColor; // default=Blue +@property (nonatomic, strong, null_resettable) UIColor *tintColor; // default=Blue - (void)tintColorDidChange; // Notifies the node when the tintColor has changed. /** @@ -687,18 +687,18 @@ NS_ASSUME_NONNULL_END * Thus, UIViewContentModeRedraw is not allowed; use needsDisplayOnBoundsChange = YES instead, and pick an appropriate * contentMode for your content while it's being re-rendered. */ -@property (atomic, assign) UIViewContentMode contentMode; // default=UIViewContentModeScaleToFill +@property (nonatomic, assign) UIViewContentMode contentMode; // default=UIViewContentModeScaleToFill -@property (atomic, assign, getter=isUserInteractionEnabled) BOOL userInteractionEnabled; // default=YES (NO for layer-backed nodes) +@property (nonatomic, assign, getter=isUserInteractionEnabled) BOOL userInteractionEnabled; // default=YES (NO for layer-backed nodes) #if TARGET_OS_IOS -@property (atomic, assign, getter=isExclusiveTouch) BOOL exclusiveTouch; // default=NO +@property (nonatomic, assign, getter=isExclusiveTouch) BOOL exclusiveTouch; // default=NO #endif -@property (atomic, assign, nullable) CGColorRef shadowColor; // default=opaque rgb black -@property (atomic, assign) CGFloat shadowOpacity; // default=0.0 -@property (atomic, assign) CGSize shadowOffset; // default=(0, -3) -@property (atomic, assign) CGFloat shadowRadius; // default=3 -@property (atomic, assign) CGFloat borderWidth; // default=0 -@property (atomic, assign, nullable) CGColorRef borderColor; // default=opaque rgb black +@property (nonatomic, assign, nullable) CGColorRef shadowColor; // default=opaque rgb black +@property (nonatomic, assign) CGFloat shadowOpacity; // default=0.0 +@property (nonatomic, assign) CGSize shadowOffset; // default=(0, -3) +@property (nonatomic, assign) CGFloat shadowRadius; // default=3 +@property (nonatomic, assign) CGFloat borderWidth; // default=0 +@property (nonatomic, assign, nullable) CGColorRef borderColor; // default=opaque rgb black // UIResponder methods // By default these fall through to the underlying view, but can be overridden. diff --git a/AsyncDisplayKit/ASImageNode.h b/AsyncDisplayKit/ASImageNode.h index ef603cfdf1..70fd576fbf 100644 --- a/AsyncDisplayKit/ASImageNode.h +++ b/AsyncDisplayKit/ASImageNode.h @@ -37,7 +37,7 @@ typedef UIImage * _Nullable (^asimagenode_modification_block_t)(UIImage *image); * the layer's contentsCenter property. Non-stretchable images work too, of * course. */ -@property (nullable, atomic, strong) UIImage *image; +@property (nullable, nonatomic, strong) UIImage *image; /** @abstract The placeholder color. @@ -133,7 +133,7 @@ typedef UIImage * _Nullable (^asimagenode_modification_block_t)(UIImage *image); * @discussion Set this to an object which conforms to ASAnimatedImageProtocol * to have the ASImageNode playback an animated image. */ -@property (nullable, atomic, strong) id animatedImage; +@property (nullable, nonatomic, strong) id animatedImage; /** * @abstract Pause the playback of an animated image. @@ -141,7 +141,7 @@ typedef UIImage * _Nullable (^asimagenode_modification_block_t)(UIImage *image); * @discussion Set to YES to pause playback of an animated image and NO to resume * playback. */ -@property (atomic, assign) BOOL animatedImagePaused; +@property (nonatomic, assign) BOOL animatedImagePaused; /** * @abstract The runloop mode used to animate the image. @@ -150,7 +150,7 @@ typedef UIImage * _Nullable (^asimagenode_modification_block_t)(UIImage *image); * Setting NSDefaultRunLoopMode will cause animation to pause while scrolling (if the ASImageNode is * in a scroll view), which may improve scroll performance in some use cases. */ -@property (atomic, strong) NSString *animatedImageRunLoopMode; +@property (nonatomic, strong) NSString *animatedImageRunLoopMode; @end diff --git a/AsyncDisplayKit/ASNetworkImageNode.h b/AsyncDisplayKit/ASNetworkImageNode.h index 1998d984bb..c0d2a3e6d9 100644 --- a/AsyncDisplayKit/ASNetworkImageNode.h +++ b/AsyncDisplayKit/ASNetworkImageNode.h @@ -47,19 +47,19 @@ NS_ASSUME_NONNULL_BEGIN /** * The delegate, which must conform to the protocol. */ -@property (nullable, atomic, weak, readwrite) id delegate; +@property (nullable, nonatomic, weak, readwrite) id delegate; /** * A placeholder image to display while the URL is loading. */ -@property (nullable, atomic, strong, readwrite) UIImage *defaultImage; +@property (nullable, nonatomic, 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 (nullable, atomic, strong, readwrite) NSURL *URL; +@property (nullable, nonatomic, strong, readwrite) NSURL *URL; /** * Download and display a new image. diff --git a/AsyncDisplayKit/ASTextNode.h b/AsyncDisplayKit/ASTextNode.h index 02eb204a33..b103957e8c 100644 --- a/AsyncDisplayKit/ASTextNode.h +++ b/AsyncDisplayKit/ASTextNode.h @@ -108,10 +108,10 @@ typedef NS_ENUM(NSUInteger, ASTextNodeHighlightStyle) { /** @abstract When you set these ASDisplayNode properties, they are composited into the bitmap instead of being applied by CA. - @property (atomic, assign) CGColorRef shadowColor; - @property (atomic, assign) CGFloat shadowOpacity; - @property (atomic, assign) CGSize shadowOffset; - @property (atomic, assign) CGFloat shadowRadius; + @property (nonatomic, assign) CGColorRef shadowColor; + @property (nonatomic, assign) CGFloat shadowOpacity; + @property (nonatomic, assign) CGSize shadowOffset; + @property (nonatomic, assign) CGFloat shadowRadius; */ /** diff --git a/AsyncDisplayKit/ASVideoNode.h b/AsyncDisplayKit/ASVideoNode.h index 00f90ce80f..103124b38d 100644 --- a/AsyncDisplayKit/ASVideoNode.h +++ b/AsyncDisplayKit/ASVideoNode.h @@ -40,12 +40,12 @@ NS_ASSUME_NONNULL_BEGIN - (void)pause; - (BOOL)isPlaying; -@property (nullable, atomic, strong, readwrite) AVAsset *asset; -@property (nullable, atomic, strong, readwrite) AVVideoComposition *videoComposition; -@property (nullable, atomic, strong, readwrite) AVAudioMix *audioMix; +@property (nullable, nonatomic, strong, readwrite) AVAsset *asset; +@property (nullable, nonatomic, strong, readwrite) AVVideoComposition *videoComposition; +@property (nullable, nonatomic, strong, readwrite) AVAudioMix *audioMix; -@property (nullable, atomic, strong, readonly) AVPlayer *player; -@property (nullable, atomic, strong, readonly) AVPlayerItem *currentItem; +@property (nullable, nonatomic, strong, readonly) AVPlayer *player; +@property (nullable, nonatomic, strong, readonly) AVPlayerItem *currentItem; /** @@ -63,9 +63,9 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, assign) int32_t periodicTimeObserverTimescale; //! Defaults to AVLayerVideoGravityResizeAspect -@property (atomic) NSString *gravity; +@property (nonatomic) NSString *gravity; -@property (nullable, atomic, weak, readwrite) id delegate; +@property (nullable, nonatomic, weak, readwrite) id delegate; @end diff --git a/AsyncDisplayKit/ASVideoPlayerNode.h b/AsyncDisplayKit/ASVideoPlayerNode.h index 60318ce938..0a7b36d324 100644 --- a/AsyncDisplayKit/ASVideoPlayerNode.h +++ b/AsyncDisplayKit/ASVideoPlayerNode.h @@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN @interface ASVideoPlayerNode : ASDisplayNode -@property (nullable, atomic, weak) id delegate; +@property (nullable, nonatomic, weak) id delegate; @property (nonatomic, assign, readonly) CMTime duration; @@ -49,12 +49,12 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, assign, readwrite) BOOL muted; @property (nonatomic, assign, readonly) ASVideoNodePlayerState playerState; @property (nonatomic, assign, readwrite) BOOL shouldAggressivelyRecoverFromStall; -@property (nullable, atomic, strong, readwrite) NSURL *placeholderImageURL; +@property (nullable, nonatomic, strong, readwrite) NSURL *placeholderImageURL; //! Defaults to 100 @property (nonatomic, assign) int32_t periodicTimeObserverTimescale; //! Defaults to AVLayerVideoGravityResizeAspect -@property (atomic) NSString *gravity; +@property (nonatomic) NSString *gravity; - (instancetype)initWithUrl:(NSURL*)url; - (instancetype)initWithAsset:(AVAsset*)asset; diff --git a/AsyncDisplayKit/Details/ASDataController.mm b/AsyncDisplayKit/Details/ASDataController.mm index f98c71f66d..76c8b723de 100644 --- a/AsyncDisplayKit/Details/ASDataController.mm +++ b/AsyncDisplayKit/Details/ASDataController.mm @@ -45,7 +45,7 @@ NSString * const ASDataControllerRowNodeKind = @"_ASDataControllerRowNodeKind"; BOOL _delegateDidDeleteSections; } -@property (atomic, assign) NSUInteger batchUpdateCounter; +@property (nonatomic, assign) NSUInteger batchUpdateCounter; @end diff --git a/AsyncDisplayKit/Details/ASHighlightOverlayLayer.h b/AsyncDisplayKit/Details/ASHighlightOverlayLayer.h index 6f80b2996b..34d31979ec 100644 --- a/AsyncDisplayKit/Details/ASHighlightOverlayLayer.h +++ b/AsyncDisplayKit/Details/ASHighlightOverlayLayer.h @@ -31,8 +31,8 @@ NS_ASSUME_NONNULL_BEGIN */ - (instancetype)initWithRects:(NSArray *)rects; -@property (nullable, atomic, strong) __attribute__((NSObject)) CGColorRef highlightColor; -@property (atomic, weak) CALayer *targetLayer; +@property (nullable, nonatomic, strong) __attribute__((NSObject)) CGColorRef highlightColor; +@property (nonatomic, weak) CALayer *targetLayer; @end diff --git a/AsyncDisplayKit/Details/Transactions/_ASAsyncTransaction.mm b/AsyncDisplayKit/Details/Transactions/_ASAsyncTransaction.mm index 5342e34f33..f869f5e108 100644 --- a/AsyncDisplayKit/Details/Transactions/_ASAsyncTransaction.mm +++ b/AsyncDisplayKit/Details/Transactions/_ASAsyncTransaction.mm @@ -20,7 +20,7 @@ NSInteger const ASDefaultTransactionPriority = 0; @interface ASDisplayNodeAsyncTransactionOperation : NSObject - (instancetype)initWithOperationCompletionBlock:(asyncdisplaykit_async_transaction_operation_completion_block_t)operationCompletionBlock; @property (nonatomic, copy) asyncdisplaykit_async_transaction_operation_completion_block_t operationCompletionBlock; -@property (atomic, strong) id value; // set on bg queue by the operation block +@property (nonatomic, strong) id value; // set on bg queue by the operation block @end @implementation ASDisplayNodeAsyncTransactionOperation diff --git a/AsyncDisplayKit/Details/UIView+ASConvenience.h b/AsyncDisplayKit/Details/UIView+ASConvenience.h index cb3e561414..ef0d10211c 100644 --- a/AsyncDisplayKit/Details/UIView+ASConvenience.h +++ b/AsyncDisplayKit/Details/UIView+ASConvenience.h @@ -67,16 +67,16 @@ NS_ASSUME_NONNULL_BEGIN We don't declare them here, so _ASPendingState does not complain about them being not implemented, as they are already on NSObject - @property (atomic, assign) BOOL isAccessibilityElement; - @property (atomic, copy) NSString *accessibilityLabel; - @property (atomic, copy) NSString *accessibilityHint; - @property (atomic, copy) NSString *accessibilityValue; - @property (atomic, assign) UIAccessibilityTraits accessibilityTraits; - @property (atomic, assign) CGRect accessibilityFrame; - @property (atomic, strong) NSString *accessibilityLanguage; - @property (atomic, assign) BOOL accessibilityElementsHidden; - @property (atomic, assign) BOOL accessibilityViewIsModal; - @property (atomic, assign) BOOL shouldGroupAccessibilityChildren; + @property (nonatomic, assign) BOOL isAccessibilityElement; + @property (nonatomic, copy) NSString *accessibilityLabel; + @property (nonatomic, copy) NSString *accessibilityHint; + @property (nonatomic, copy) NSString *accessibilityValue; + @property (nonatomic, assign) UIAccessibilityTraits accessibilityTraits; + @property (nonatomic, assign) CGRect accessibilityFrame; + @property (nonatomic, strong) NSString *accessibilityLanguage; + @property (nonatomic, assign) BOOL accessibilityElementsHidden; + @property (nonatomic, assign) BOOL accessibilityViewIsModal; + @property (nonatomic, assign) BOOL shouldGroupAccessibilityChildren; */ // Accessibility identification support diff --git a/AsyncDisplayKit/Details/_ASDisplayLayer.h b/AsyncDisplayKit/Details/_ASDisplayLayer.h index 6e8e81ebcc..1dde2e319d 100644 --- a/AsyncDisplayKit/Details/_ASDisplayLayer.h +++ b/AsyncDisplayKit/Details/_ASDisplayLayer.h @@ -24,7 +24,7 @@ typedef BOOL(^asdisplaynode_iscancelled_block_t)(void); @default YES (note that this might change for subclasses) */ -@property (atomic, assign) BOOL displaysAsynchronously; +@property (nonatomic, assign) BOOL displaysAsynchronously; /** @summary Cancels any pending async display. @@ -48,7 +48,7 @@ typedef BOOL(^asdisplaynode_iscancelled_block_t)(void); @desc The asyncDelegate will have the opportunity to override the methods related to async display. */ -@property (atomic, weak) id<_ASDisplayLayerDelegate> asyncDelegate; +@property (nonatomic, weak) id<_ASDisplayLayerDelegate> asyncDelegate; /** @summary Suspends both asynchronous and synchronous display of the receiver if YES. @@ -58,7 +58,7 @@ typedef BOOL(^asdisplaynode_iscancelled_block_t)(void); @default NO */ -@property (atomic, assign, getter=isDisplaySuspended) BOOL displaySuspended; +@property (nonatomic, assign, getter=isDisplaySuspended) BOOL displaySuspended; /** @summary Bypasses asynchronous rendering and performs a blocking display immediately on the current thread. diff --git a/AsyncDisplayKit/Private/ASImageNode+AnimatedImagePrivate.h b/AsyncDisplayKit/Private/ASImageNode+AnimatedImagePrivate.h index 95f352d2dc..6748f1af65 100644 --- a/AsyncDisplayKit/Private/ASImageNode+AnimatedImagePrivate.h +++ b/AsyncDisplayKit/Private/ASImageNode+AnimatedImagePrivate.h @@ -28,7 +28,7 @@ extern NSString *const ASAnimatedImageDefaultRunLoopMode; NSUInteger _playedLoops; } -@property (atomic, assign) CFTimeInterval lastDisplayLinkFire; +@property (nonatomic, assign) CFTimeInterval lastDisplayLinkFire; @end diff --git a/AsyncDisplayKitTests/ASDisplayNodeTests.m b/AsyncDisplayKitTests/ASDisplayNodeTests.m index 1d58b9ccc4..e1efbe7bbc 100644 --- a/AsyncDisplayKitTests/ASDisplayNodeTests.m +++ b/AsyncDisplayKitTests/ASDisplayNodeTests.m @@ -85,15 +85,15 @@ for (ASDisplayNode *n in @[ nodes ]) {\ @end @interface ASTestDisplayNode : ASDisplayNode -@property (atomic, copy) void (^willDeallocBlock)(ASTestDisplayNode *node); -@property (atomic, copy) CGSize(^calculateSizeBlock)(ASTestDisplayNode *node, CGSize size); -@property (atomic) BOOL hasFetchedData; +@property (nonatomic, copy) void (^willDeallocBlock)(ASTestDisplayNode *node); +@property (nonatomic, copy) CGSize(^calculateSizeBlock)(ASTestDisplayNode *node, CGSize size); +@property (nonatomic) BOOL hasFetchedData; -@property (atomic) BOOL displayRangeStateChangedToYES; -@property (atomic) BOOL displayRangeStateChangedToNO; +@property (nonatomic) BOOL displayRangeStateChangedToYES; +@property (nonatomic) BOOL displayRangeStateChangedToNO; -@property (atomic) BOOL loadStateChangedToYES; -@property (atomic) BOOL loadStateChangedToNO; +@property (nonatomic) BOOL loadStateChangedToYES; +@property (nonatomic) BOOL loadStateChangedToNO; @end @interface ASTestResponderNode : ASTestDisplayNode diff --git a/AsyncDisplayKitTests/ASTableViewTests.m b/AsyncDisplayKitTests/ASTableViewTests.m index af85fb78c1..2c282de139 100644 --- a/AsyncDisplayKitTests/ASTableViewTests.m +++ b/AsyncDisplayKitTests/ASTableViewTests.m @@ -22,7 +22,7 @@ #define NumberOfReloadIterations 50 @interface ASTestDataController : ASChangeSetDataController -@property (atomic) int numberOfAllNodesRelayouts; +@property (nonatomic) int numberOfAllNodesRelayouts; @end @implementation ASTestDataController @@ -36,7 +36,7 @@ @end @interface ASTestTableView : ASTableView -@property (atomic, copy) void (^willDeallocBlock)(ASTableView *tableView); +@property (nonatomic, copy) void (^willDeallocBlock)(ASTableView *tableView); @end @implementation ASTestTableView @@ -61,7 +61,7 @@ @end @interface ASTableViewTestDelegate : NSObject -@property (atomic, copy) void (^willDeallocBlock)(ASTableViewTestDelegate *delegate); +@property (nonatomic, copy) void (^willDeallocBlock)(ASTableViewTestDelegate *delegate); @end @implementation ASTableViewTestDelegate @@ -92,7 +92,7 @@ @interface ASTestTextCellNode : ASTextCellNode /** Calculated by counting how many times -layoutSpecThatFits: is called on the main thread. */ -@property (atomic) int numberOfLayoutsOnMainThread; +@property (nonatomic) int numberOfLayoutsOnMainThread; @end @implementation ASTestTextCellNode @@ -154,7 +154,7 @@ @end @interface ASTableViewTests : XCTestCase -@property (atomic, retain) ASTableView *testTableView; +@property (nonatomic, retain) ASTableView *testTableView; @end @implementation ASTableViewTests diff --git a/AsyncDisplayKitTests/ASVideoNodeTests.m b/AsyncDisplayKitTests/ASVideoNodeTests.m index f7c4a6b079..63960005d1 100644 --- a/AsyncDisplayKitTests/ASVideoNodeTests.m +++ b/AsyncDisplayKitTests/ASVideoNodeTests.m @@ -37,11 +37,11 @@ } -@property (atomic, readwrite) ASInterfaceState interfaceState; -@property (atomic, readonly) ASDisplayNode *spinner; -@property (atomic, readwrite) ASDisplayNode *playerNode; -@property (atomic, readwrite) AVPlayer *player; -@property (atomic, readwrite) BOOL shouldBePlaying; +@property (nonatomic, readwrite) ASInterfaceState interfaceState; +@property (nonatomic, readonly) ASDisplayNode *spinner; +@property (nonatomic, readwrite) ASDisplayNode *playerNode; +@property (nonatomic, readwrite) AVPlayer *player; +@property (nonatomic, readwrite) BOOL shouldBePlaying; - (void)setVideoPlaceholderImage:(UIImage *)image; - (void)prepareToPlayAsset:(AVAsset *)asset withKeys:(NSArray *)requestedKeys;