ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-24 07:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #421 from facebook/xcode-6-3

Browse Source 
Xcode 6.3 support
This commit is contained in:
Ryan Nystrom
2015-04-08 16:44:50 -07:00
parent 7eed85a7f0 527a6228a9
commit 24bb0926bc
6 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
AsyncDisplayKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata generated Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:AsyncDisplayKit.xcodeproj">
</FileRef>
</Workspace>

1
AsyncDisplayKit/ASScrollNode.m
View File

@@ -9,6 +9,7 @@
#import "ASScrollNode.h"
@implementation ASScrollNode
@dynamic view;
- (instancetype)init
{

1
AsyncDisplayKitTests/ASControlNodeTests.m
View File

@@ -22,7 +22,6 @@
@end
@interface ASActionController : ReceiverController
@property (nonatomic) NSInteger hits;
@end
@implementation ASActionController
- (void)action { self.hits++; }

6
AsyncDisplayKitTests/ASDisplayNodeTests.m
View File

@@ -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;
}

2
AsyncDisplayKitTests/ASTextNodeRendererTests.m
View File

@@ -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

4
Podfile.lock
View File

@@ -7,7 +7,7 @@ DEPENDENCIES:
- OCMock (~> 2.2)
SPEC CHECKSUMS:
FBSnapshotTestCase: e2914fbaabccea1dcc773d6a16b1c24540642488
OCMock: 6db79185520e24f9f299548f2b8b07e41d881bd5
FBSnapshotTestCase: 26f32d8fa9eb30e9f09712ecfb097808bc79b898
OCMock: a6a7dc0e3997fb9f35d99f72528698ebf60d64f2
COCOAPODS: 0.35.0