Peter a085123ec1 Merge commit '565da7d4935740d12fc204aa061faf093831da1e' ...

# Conflicts:
#	AsyncDisplayKit.xcodeproj/project.pbxproj
#	AsyncDisplayKit.xcodeproj/xcshareddata/xcschemes/AsyncDisplayKit.xcscheme
#	Source/ASDisplayNode.mm
#	Source/ASEditableTextNode.h
#	Source/ASImageNode.mm
#	Source/ASMapNode.h
#	Source/ASMapNode.mm
#	Source/Base/ASAssert.m
#	Source/Details/ASPhotosFrameworkImageRequest.h
#	Source/Details/ASPhotosFrameworkImageRequest.m
#	Source/Layout/ASLayoutElement.mm

2018-10-08 22:42:45 +03:00

..

Common

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

en.lproj

Shuffle & Cleanup Stuff (#3080)

2017-02-26 18:14:13 -08:00

ReferenceImages_64

Remove double scaling of lineHeightMultiple & paragraphSpacing attributes in ASTextKitFontSizeAdjuster (#1056)

2018-08-15 11:08:32 -07:00

ReferenceImages_iOS_10

Remove double scaling of lineHeightMultiple & paragraphSpacing attributes in ASTextKitFontSizeAdjuster (#1056)

2018-08-15 11:08:32 -07:00

TestHost

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

TestResources

Shuffle & Cleanup Stuff (#3080)

2017-02-26 18:14:13 -08:00

ArrayDiffingTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASAbsoluteLayoutSpecSnapshotTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASBackgroundLayoutSpecSnapshotTests.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASBasicImageDownloaderContextTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASBasicImageDownloaderTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASBatchFetchingTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASBridgedPropertiesTests.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASCALayerTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASCenterLayoutSpecSnapshotTests.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASCollectionModernDataSourceTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASCollectionsTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASCollectionViewFlowLayoutInspectorTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASCollectionViewTests.mm

Remove necessity to use view to access rangeController in ASTableNode, ASCollectionNode (#1103)

2018-09-19 07:51:46 -07:00

ASConfigurationTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASControlNodeTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASCornerLayoutSpecSnapshotTests.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASDimensionTests.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASDispatchTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASDisplayLayerTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASDisplayNodeAppearanceTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASDisplayNodeExtrasTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASDisplayNodeImplicitHierarchyTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASDisplayNodeLayoutTests.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASDisplayNodeSnapshotTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASDisplayNodeTests.mm

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

2018-10-08 22:42:45 +03:00

ASDisplayNodeTestsHelper.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASDisplayNodeTestsHelper.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASDisplayViewAccessibilityTests.mm

Refactored accessibleElements to accessibilityElements (#1069)

2018-08-24 20:41:27 +02:00

ASEditableTextNodeTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASImageNodeSnapshotTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASInsetLayoutSpecSnapshotTests.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASIntegerMapTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASLayoutElementStyleTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASLayoutEngineTests.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASLayoutFlatteningTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASLayoutSpecSnapshotTestsHelper.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASLayoutSpecSnapshotTestsHelper.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASLayoutSpecTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASLayoutTestNode.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASLayoutTestNode.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASMultiplexImageNodeTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASMutableAttributedStringBuilderTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASNavigationControllerTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASNetworkImageNodeTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASOverlayLayoutSpecSnapshotTests.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASPagerNodeTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASPerformanceTestContext.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASPerformanceTestContext.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASPhotosFrameworkImageRequestTests.m

Guard photo library with macro for tests (#1147)

2018-09-28 09:14:52 -07:00

ASRatioLayoutSpecSnapshotTests.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASRecursiveUnfairLockTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASRelativeLayoutSpecSnapshotTests.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASRunLoopQueueTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASScrollNodeTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASSnapshotTestCase.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASSnapshotTestCase.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASStackLayoutSpecSnapshotTests.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASTabBarControllerTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASTableViewTests.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASTableViewThrashTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASTextKitCoreTextAdditionsTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASTextKitFontSizeAdjusterTests.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASTextKitTests.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASTextKitTruncationTests.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASTextNode2SnapshotTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASTextNodePerformanceTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASTextNodeSnapshotTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASTextNodeTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASTextNodeWordKernerTests.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASTLayoutFixture.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASTLayoutFixture.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASTraitCollectionTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASUICollectionViewTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASVideoNodeTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASViewControllerTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASWeakMapTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASWeakSetTests.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASWrapperSpecSnapshotTests.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

AsyncDisplayKitTests-Info.plist

Shuffle & Cleanup Stuff (#3080)

2017-02-26 18:14:13 -08:00

AsyncDisplayKitTests-Prefix.pch

Shuffle & Cleanup Stuff (#3080)

2017-02-26 18:14:13 -08:00