Merge pull request #665 from jflinter/jack-build-phase-cleanup

Clean up Cocoa Touch framework target

.gitignore

@@ -1,4 +1,4 @@
-DS_Store
+.DS_Store
 
 *.pbxuser
 *.perspective

AsyncDisplayKit/AsyncDisplayKit.h

@@ -49,6 +49,7 @@
 #import <AsyncDisplayKit/ASControlNode+Subclasses.h>
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
 #import <AsyncDisplayKit/ASDisplayNodeExtraIvars.h>
+#import <AsyncDisplayKit/ASEqualityHelpers.h>
 #import <AsyncDisplayKit/ASHighlightOverlayLayer.h>
 #import <AsyncDisplayKit/ASIndexPath.h>
 #import <AsyncDisplayKit/ASLayoutOptions.h>
@@ -57,7 +58,6 @@
 #import <AsyncDisplayKit/ASRangeHandler.h>
 #import <AsyncDisplayKit/ASRangeHandlerPreload.h>
 #import <AsyncDisplayKit/ASRangeHandlerRender.h>
-//#import <AsyncDisplayKit/ASStackUnpositionedLayout.h>
 #import <AsyncDisplayKit/ASTextNodeCoreTextAdditions.h>
 #import <AsyncDisplayKit/ASTextNodeRenderer.h>
 #import <AsyncDisplayKit/ASTextNodeShadower.h>
@@ -65,5 +65,7 @@
 #import <AsyncDisplayKit/ASTextNodeTypes.h>
 #import <AsyncDisplayKit/ASTextNodeWordKerner.h>
 #import <AsyncDisplayKit/ASThread.h>
+#import <AsyncDisplayKit/CGRect+ASConvenience.h>
 #import <AsyncDisplayKit/NSMutableAttributedString+TextKitAdditions.h>
+#import <AsyncDisplayKit/UICollectionViewLayout+ASConvenience.h>
 #import <AsyncDisplayKit/UIView+ASConvenience.h>

AsyncDisplayKit/module.modulemap

@@ -0,0 +1,19 @@
+framework module AsyncDisplayKit {
+  umbrella header "AsyncDisplayKit.h"
+  
+  export *
+  module * {
+    export *
+  }
+  
+  explicit module ASControlNode_Subclasses {
+    header "ASControlNode+Subclasses.h"
+    export *
+  }
+  
+  explicit module ASDisplayNode_Subclasses {
+    header "ASDisplayNode+Subclasses.h"
+    export *
+  }
+  
+}

AsyncDisplayKitTests/ASBasicImageDownloaderContextTests.m

@@ -6,8 +6,8 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <AsyncDisplayKit/ASBasicImageDownloaderInternal.h>
 #import <AsyncDisplayKit/ASBasicImageDownloader.h>
+#import "ASBasicImageDownloaderInternal.h"
 
 #import <OCMock/OCMock.h>
 

AsyncDisplayKitTests/ASSnapshotTestCase.mm

@@ -7,8 +7,7 @@
  */
 
 #import "ASSnapshotTestCase.h"
-
+#import "ASDisplayNodeInternal.h"
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
 
 @implementation ASSnapshotTestCase