Skip to content

Commit 21bdbbe

Browse files
appleguyappleguy
committed
Merge pull request facebookarchive#665 from jflinter/jack-build-phase-cleanup
Clean up Cocoa Touch framework target
2 parents 43b03e7 + b84c371 commit 21bdbbe

10 files changed

Lines changed: 370 additions & 392 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
DS_Store
1+
.DS_Store
22

33
*.pbxuser
44
*.perspective

‎AsyncDisplayKit.xcodeproj/project.pbxproj‎

Lines changed: 345 additions & 387 deletions
Large diffs are not rendered by default.

‎AsyncDisplayKit/AsyncDisplayKit.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
#import <AsyncDisplayKit/ASControlNode+Subclasses.h>
5050
#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
5151
#import <AsyncDisplayKit/ASDisplayNodeExtraIvars.h>
52+
#import <AsyncDisplayKit/ASEqualityHelpers.h>
5253
#import <AsyncDisplayKit/ASHighlightOverlayLayer.h>
5354
#import <AsyncDisplayKit/ASIndexPath.h>
5455
#import <AsyncDisplayKit/ASLayoutOptions.h>
@@ -57,13 +58,14 @@
5758
#import <AsyncDisplayKit/ASRangeHandler.h>
5859
#import <AsyncDisplayKit/ASRangeHandlerPreload.h>
5960
#import <AsyncDisplayKit/ASRangeHandlerRender.h>
60-
//#import <AsyncDisplayKit/ASStackUnpositionedLayout.h>
6161
#import <AsyncDisplayKit/ASTextNodeCoreTextAdditions.h>
6262
#import <AsyncDisplayKit/ASTextNodeRenderer.h>
6363
#import <AsyncDisplayKit/ASTextNodeShadower.h>
6464
#import <AsyncDisplayKit/ASTextNodeTextKitHelpers.h>
6565
#import <AsyncDisplayKit/ASTextNodeTypes.h>
6666
#import <AsyncDisplayKit/ASTextNodeWordKerner.h>
6767
#import <AsyncDisplayKit/ASThread.h>
68+
#import <AsyncDisplayKit/CGRect+ASConvenience.h>
6869
#import <AsyncDisplayKit/NSMutableAttributedString+TextKitAdditions.h>
70+
#import <AsyncDisplayKit/UICollectionViewLayout+ASConvenience.h>
6971
#import <AsyncDisplayKit/UIView+ASConvenience.h>

AsyncDisplayKit/Details/ASBatchFetching.h renamed to AsyncDisplayKit/Private/ASBatchFetching.h

File renamed without changes.

AsyncDisplayKit/Details/ASBatchFetching.m renamed to AsyncDisplayKit/Private/ASBatchFetching.m

File renamed without changes.

AsyncDisplayKit/Details/ASMultidimensionalArrayUtils.h renamed to AsyncDisplayKit/Private/ASMultidimensionalArrayUtils.h

File renamed without changes.

AsyncDisplayKit/Details/ASMultidimensionalArrayUtils.mm renamed to AsyncDisplayKit/Private/ASMultidimensionalArrayUtils.mm

File renamed without changes.

‎AsyncDisplayKit/module.modulemap‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
framework module AsyncDisplayKit {
2+
umbrella header "AsyncDisplayKit.h"
3+
4+
export *
5+
module * {
6+
export *
7+
}
8+
9+
explicit module ASControlNode_Subclasses {
10+
header "ASControlNode+Subclasses.h"
11+
export *
12+
}
13+
14+
explicit module ASDisplayNode_Subclasses {
15+
header "ASDisplayNode+Subclasses.h"
16+
export *
17+
}
18+
19+
}

‎AsyncDisplayKitTests/ASBasicImageDownloaderContextTests.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
* of patent rights can be found in the PATENTS file in the same directory.
77
*/
88

9-
#import <AsyncDisplayKit/ASBasicImageDownloaderInternal.h>
109
#import <AsyncDisplayKit/ASBasicImageDownloader.h>
10+
#import "ASBasicImageDownloaderInternal.h"
1111

1212
#import <OCMock/OCMock.h>
1313

‎AsyncDisplayKitTests/ASSnapshotTestCase.mm‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
*/
88

99
#import "ASSnapshotTestCase.h"
10-
11-
#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
10+
#import "ASDisplayNodeInternal.h"
1211

1312
@implementation ASSnapshotTestCase
1413

0 commit comments

Comments
 (0)