From 527a6228a984747c69c01cba1237ed05c4f21b71 Mon Sep 17 00:00:00 2001 From: Ryan Nystrom Date: Wed, 8 Apr 2015 16:35:10 -0700 Subject: [PATCH] Xcode 6.3 support --- .../project.xcworkspace/contents.xcworkspacedata | 7 +++++++ AsyncDisplayKit/ASScrollNode.m | 1 + AsyncDisplayKitTests/ASControlNodeTests.m | 1 - AsyncDisplayKitTests/ASDisplayNodeTests.m | 6 +++--- AsyncDisplayKitTests/ASTextNodeRendererTests.m | 2 +- Podfile.lock | 4 ++-- 6 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 AsyncDisplayKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/AsyncDisplayKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/AsyncDisplayKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000..235ea95fac --- /dev/null +++ b/AsyncDisplayKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/AsyncDisplayKit/ASScrollNode.m b/AsyncDisplayKit/ASScrollNode.m index a1a17006e9..3b19d126e2 100644 --- a/AsyncDisplayKit/ASScrollNode.m +++ b/AsyncDisplayKit/ASScrollNode.m @@ -9,6 +9,7 @@ #import "ASScrollNode.h" @implementation ASScrollNode +@dynamic view; - (instancetype)init { diff --git a/AsyncDisplayKitTests/ASControlNodeTests.m b/AsyncDisplayKitTests/ASControlNodeTests.m index 4ae1e4171e..969947c3ad 100644 --- a/AsyncDisplayKitTests/ASControlNodeTests.m +++ b/AsyncDisplayKitTests/ASControlNodeTests.m @@ -22,7 +22,6 @@ @end @interface ASActionController : ReceiverController -@property (nonatomic) NSInteger hits; @end @implementation ASActionController - (void)action { self.hits++; } diff --git a/AsyncDisplayKitTests/ASDisplayNodeTests.m b/AsyncDisplayKitTests/ASDisplayNodeTests.m index cbf8dfee23..b5b0d84644 100644 --- a/AsyncDisplayKitTests/ASDisplayNodeTests.m +++ b/AsyncDisplayKitTests/ASDisplayNodeTests.m @@ -834,9 +834,9 @@ static void _addTonsOfSubnodes(ASDisplayNode *parent, NSUInteger fanout, NSUInte } static inline BOOL _CGPointEqualToPointWithEpsilon(CGPoint point1, CGPoint point2, CGFloat epsilon) { - CGFloat absEpsilon = fabsf(epsilon); - BOOL xOK = fabsf(point1.x - point2.x) < absEpsilon; - BOOL yOK = fabsf(point1.y - point2.y) < absEpsilon; + CGFloat absEpsilon = fabs(epsilon); + BOOL xOK = fabs(point1.x - point2.x) < absEpsilon; + BOOL yOK = fabs(point1.y - point2.y) < absEpsilon; return xOK && yOK; } diff --git a/AsyncDisplayKitTests/ASTextNodeRendererTests.m b/AsyncDisplayKitTests/ASTextNodeRendererTests.m index 076e11b82f..fa210c12c1 100644 --- a/AsyncDisplayKitTests/ASTextNodeRendererTests.m +++ b/AsyncDisplayKitTests/ASTextNodeRendererTests.m @@ -128,7 +128,7 @@ [self setUpRenderer]; CGSize calculatedSizeWithTruncation = [_renderer size]; // Floating point equality - XCTAssertTrue(fabsf(calculatedSizeWithTruncation.height - calculatedSize.height) < .001, @"The height after truncation (%f) doesn't match the normal calculated height (%f)", calculatedSizeWithTruncation.height, calculatedSize.height); + XCTAssertTrue(fabs(calculatedSizeWithTruncation.height - calculatedSize.height) < .001, @"The height after truncation (%f) doesn't match the normal calculated height (%f)", calculatedSizeWithTruncation.height, calculatedSize.height); } - (void)testNoCrashOnTappingEmptyTextNode diff --git a/Podfile.lock b/Podfile.lock index 14f152df04..a661aebb57 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -7,7 +7,7 @@ DEPENDENCIES: - OCMock (~> 2.2) SPEC CHECKSUMS: - FBSnapshotTestCase: e2914fbaabccea1dcc773d6a16b1c24540642488 - OCMock: 6db79185520e24f9f299548f2b8b07e41d881bd5 + FBSnapshotTestCase: 26f32d8fa9eb30e9f09712ecfb097808bc79b898 + OCMock: a6a7dc0e3997fb9f35d99f72528698ebf60d64f2 COCOAPODS: 0.35.0