Xcode 6.3 support

Space-X · Apr 8, 2015 · 527a622 · 527a622
1 parent 6d8d7ae
commit 527a622
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/AsyncDisplayKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/AsyncDisplayKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git 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
@@ -22,7 +22,6 @@ @implementation ReceiverController
 @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
@@ -834,9 +834,9 @@ - (ASDisplayNode *)_getDeepSubnodeForRoot:(ASDisplayNode *)root withIndices:(NSA
 }
 
 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
@@ -128,7 +128,7 @@ - (void)testTruncationConservesOriginalHeight
   [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
@@ -7,7 +7,7 @@ DEPENDENCIES:
   - OCMock (~> 2.2)
 
 SPEC CHECKSUMS:
-  FBSnapshotTestCase: e2914fbaabccea1dcc773d6a16b1c24540642488
-  OCMock: 6db79185520e24f9f299548f2b8b07e41d881bd5
+  FBSnapshotTestCase: 26f32d8fa9eb30e9f09712ecfb097808bc79b898
+  OCMock: a6a7dc0e3997fb9f35d99f72528698ebf60d64f2
 
 COCOAPODS: 0.35.0