12 Commits

Author SHA1 Message Date
Peter
11db9b6a7b Merge commit 'a568d02c333ac1ffef5dae971964363afec20cd3'
# Conflicts:
#	AsyncDisplayKit/ASDisplayNode.h
#	AsyncDisplayKit/ASDisplayNode.mm
#	AsyncDisplayKit/Private/ASInternalHelpers.m
#	AsyncDisplayKitTests/ASDisplayNodeTests.m
2016-11-17 11:51:43 +03:00
Peter
824de23a0d Merge commit '5b8e0ef220b304006b9590a5d7acd7a9f12d95b9'
# Conflicts:
#	AsyncDisplayKit/ASImageNode.mm
2016-10-18 13:29:32 +02:00
Peter
ad50b40210 no message 2016-09-05 23:21:49 +03:00
Adlai Holler
5c42bb4e2f Add tests to confirm CALayer behaviors (#2184) 2016-09-02 15:10:15 -07:00
Adlai Holler
ea4d88e053 Skip ASTextNodePerformanceTests in Test Action (#2173) 2016-08-31 16:10:27 -07:00
Kiel Gillard
6a15ab6130 * Tidy the header imports, forward declaring classes and protocols where appropriate to avoid import cycles and using the framework/system header notation for imports occuring in .h files.
* Perhaps controversially, decomposing ASRangeControllerUpdateRangeProtocol+Beta.h such that the categories on various classes are defined in the classes themselves since that's where the implementation of those categories is provided.
* Updating unit tests and import other headers the tests took for granted. The tests could probably import the umbrella header and not have to worry about this.
* Updating the "Life without Cocoapods" sample to build and run dependent on ASDK as a static library.
* Added a "Life With Frameworks" sample app to build and run dependent on ASDK as a framework, proving the framework targets work.
2016-07-07 15:12:19 +10:00
Levi McCallum
ca2fb0bc74 Update FBSnapshotTestCase and generate @3x images 2016-06-08 13:33:03 -07:00
Scott Goodson
8703920d55 [Xcode Project] Add new file to the framework target. Update to recommended build settings to resolve 1 of 1 warnings. 2016-03-08 22:58:27 -08:00
Scott Goodson
ffeb514802 Disable "intrument program flow" to fix error spew after running tests. Enable Xcode 7 UI for code coverage. 2015-12-26 13:35:48 -08:00
Scott Goodson
3416450f11 Adding ASButtonNode. Simple but flexible, add features as desired! 2015-10-31 15:12:05 -07:00
Roy Marmelstein
caf306123c Removed unnecessary bridging header 2015-10-04 11:00:03 +02:00
Nadine Salter
6cfb347355 Shared schemes. 2014-10-15 10:52:13 -07:00