Make a streamline ASDK version

Podfile.lock

@@ -17,4 +17,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: ff1a1777e31f49e6e4b7b148d0f10e504db7fa26
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.10.1

Source/ASButtonNode.mm

@@ -8,7 +8,6 @@
 //
 
 #import <AsyncDisplayKit/ASButtonNode+Private.h>
-#import <AsyncDisplayKit/ASButtonNode+Yoga.h>
 #import <AsyncDisplayKit/ASStackLayoutSpec.h>
 #import <AsyncDisplayKit/ASThread.h>
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
@@ -41,8 +40,6 @@ - (instancetype)init
     _contentEdgeInsets = UIEdgeInsetsZero;
     _imageAlignment = ASButtonNodeImageAlignmentBeginning;
     self.accessibilityTraits = self.defaultAccessibilityTraits;
-
-    [self updateYogaLayoutIfNeeded];
   }
   return self;
 }
@@ -52,13 +49,7 @@ - (ASTextNode *)titleNode
   ASLockScopeSelf();
   if (!_titleNode) {
     _titleNode = [[ASTextNode alloc] init];
-    #if TARGET_OS_TV
-      // tvOS needs access to the underlying view
-      // of the button node to add a touch handler.
-      [_titleNode setLayerBacked:NO];
-    #else
-      [_titleNode setLayerBacked:YES];
-    #endif
+    [_titleNode setLayerBacked:YES];
     _titleNode.style.flexShrink = 1.0;
     _titleNode.textColorFollowsTintColor = YES;
   }
@@ -169,7 +160,6 @@ - (void)updateImage
     _imageNode.image = newImage;
     [self unlock];
 
-    [self updateYogaLayoutIfNeeded];
     [self setNeedsLayout];
     return;
   }
@@ -201,7 +191,6 @@ - (void)updateTitle
     [self unlock];
 
     self.accessibilityLabel = self.defaultAccessibilityLabel;
-    [self updateYogaLayoutIfNeeded];
     [self setNeedsLayout];
     return;
   }
@@ -230,7 +219,6 @@ - (void)updateBackgroundImage
     _backgroundImageNode.image = newImage;
     [self unlock];
 
-    [self updateYogaLayoutIfNeeded];
     [self setNeedsLayout];
     return;
   }
@@ -247,7 +235,6 @@ - (CGFloat)contentSpacing
 - (void)setContentSpacing:(CGFloat)contentSpacing
 {
   if (ASLockedSelfCompareAssign(_contentSpacing, contentSpacing)) {
-    [self updateYogaLayoutIfNeeded];
     [self setNeedsLayout];
   }
 }
@@ -261,7 +248,6 @@ - (BOOL)laysOutHorizontally
 - (void)setLaysOutHorizontally:(BOOL)laysOutHorizontally
 {
   if (ASLockedSelfCompareAssign(_laysOutHorizontally, laysOutHorizontally)) {
-    [self updateYogaLayoutIfNeeded];
     [self setNeedsLayout];
   }
 }
@@ -515,8 +501,6 @@ - (UIAccessibilityTraits)defaultAccessibilityTraits
 }
 
 #pragma mark - Layout
-
-#if !YOGA
 - (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize
 {
     UIEdgeInsets contentEdgeInsets;
@@ -561,7 +545,6 @@ - (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize
 
     return spec;
 }
-#endif
 
 - (void)layout
 {

Source/ASCellNode.mm

@@ -20,7 +20,6 @@
 #import <AsyncDisplayKit/ASTextNode.h>
 #import <AsyncDisplayKit/ASCollectionNode.h>
 
-#import <AsyncDisplayKit/ASDKViewController.h>
 #import <AsyncDisplayKit/ASInsetLayoutSpec.h>
 #import <AsyncDisplayKit/ASDisplayNodeInternal.h>
 
@@ -79,17 +78,11 @@ - (void)didLoad
     _viewController = _viewControllerBlock();
     _viewControllerBlock = nil;
 
-    if ([_viewController isKindOfClass:[ASDKViewController class]]) {
-      ASDKViewController *asViewController = (ASDKViewController *)_viewController;
-      _viewControllerNode = asViewController.node;
-      [_viewController loadViewIfNeeded];
-    } else {
-      // Careful to avoid retain cycle
-      UIViewController *viewController = _viewController;
-      _viewControllerNode = [[ASDisplayNode alloc] initWithViewBlock:^{
-        return viewController.view;
-      }];
-    }
+    // Careful to avoid retain cycle
+    UIViewController *viewController = _viewController;
+    _viewControllerNode = [[ASDisplayNode alloc] initWithViewBlock:^{
+      return viewController.view;
+    }];
     [self addSubnode:_viewControllerNode];
 
     // Since we just loaded our node, and added _viewControllerNode as a subnode,

Source/ASCollectionNode+Beta.h

@@ -9,7 +9,7 @@
 
 #import <AsyncDisplayKit/ASCollectionNode.h>
 
-@protocol ASCollectionViewLayoutFacilitatorProtocol, ASCollectionLayoutDelegate, ASBatchFetchingDelegate;
+@protocol ASBatchFetchingDelegate;
 @class ASElementMap;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -28,29 +28,8 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, readonly) ASElementMap *visibleElements;
 
-@property (nullable, readonly) id<ASCollectionLayoutDelegate> layoutDelegate;
-
 @property (nullable, nonatomic, weak) id<ASBatchFetchingDelegate> batchFetchingDelegate;
 
-/**
- * When this mode is enabled, ASCollectionView matches the timing of UICollectionView as closely as
- * possible, ensuring that all reload and edit operations are performed on the main thread as
- * blocking calls.
- *
- * This mode is useful for applications that are debugging issues with their collection view
- * implementation. In particular, some applications do not properly conform to the API requirement
- * of UICollectionView, and these applications may experience difficulties with ASCollectionView.
- * Providing this mode allows for developers to work towards resolving technical debt in their
- * collection view data source, while ramping up asynchronous collection layout.
- *
- * NOTE: Because this mode results in expensive operations like cell layout being performed on the
- * main thread, it should be used as a tool to resolve data source conformance issues with Apple
- * collection view API.
- *
- * @default defaults to ASCellLayoutModeNone.
- */
-@property (nonatomic) ASCellLayoutMode cellLayoutMode;
-
 /**
  *  Returns YES if the ASCollectionNode contents are completely synchronized with the underlying collection-view layout.
  */
@@ -64,15 +43,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)onDidFinishSynchronizing:(void (^)(void))didFinishSynchronizing;
 
-- (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout layoutFacilitator:(nullable id<ASCollectionViewLayoutFacilitatorProtocol>)layoutFacilitator;
-
-- (instancetype)initWithLayoutDelegate:(id<ASCollectionLayoutDelegate>)layoutDelegate layoutFacilitator:(nullable id<ASCollectionViewLayoutFacilitatorProtocol>)layoutFacilitator;
-
-- (void)beginUpdates ASDISPLAYNODE_DEPRECATED_MSG("Use -performBatchUpdates:completion: instead.");
-
-- (void)endUpdatesAnimated:(BOOL)animated ASDISPLAYNODE_DEPRECATED_MSG("Use -performBatchUpdates:completion: instead.");
-
-- (void)endUpdatesAnimated:(BOOL)animated completion:(nullable void (^)(BOOL))completion ASDISPLAYNODE_DEPRECATED_MSG("Use -performBatchUpdates:completion: instead.");
+- (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout;
 
 @end