From 2c5db2e335b09a08d990ed1c0786ec1e23c1b782 Mon Sep 17 00:00:00 2001 From: Scott Goodson Date: Sat, 23 Jan 2016 13:05:27 -0800 Subject: [PATCH] Podfile bump to 1.9.6; minor preparations for release. --- AsyncDisplayKit.podspec | 7 ++++--- AsyncDisplayKit.xcodeproj/project.pbxproj | 17 ----------------- AsyncDisplayKit/ASVideoNode.h | 11 +++++++++++ AsyncDisplayKit/ASVideoNode.mm | 17 +++++++++++++---- .../Sample.xcodeproj/project.pbxproj | 16 ---------------- 5 files changed, 28 insertions(+), 40 deletions(-) diff --git a/AsyncDisplayKit.podspec b/AsyncDisplayKit.podspec index 5698d550de..dfc8aad047 100644 --- a/AsyncDisplayKit.podspec +++ b/AsyncDisplayKit.podspec @@ -1,11 +1,11 @@ Pod::Spec.new do |spec| spec.name = 'AsyncDisplayKit' - spec.version = '1.9.5' + spec.version = '1.9.6' spec.license = { :type => 'BSD' } spec.homepage = 'http://asyncdisplaykit.org' spec.authors = { 'Scott Goodson' => 'scottgoodson@gmail.com', 'Ryan Nystrom' => 'rnystrom@fb.com' } spec.summary = 'Smooth asynchronous user interfaces for iOS apps.' - spec.source = { :git => 'https://github.com/facebook/AsyncDisplayKit.git', :tag => '1.9.5' } + spec.source = { :git => 'https://github.com/facebook/AsyncDisplayKit.git', :tag => '1.9.6' } spec.documentation_url = 'http://asyncdisplaykit.org/appledoc/' @@ -47,5 +47,6 @@ Pod::Spec.new do |spec| } spec.ios.deployment_target = '7.0' - spec.tvos.deployment_target = '9.0' + # tvOS not recognized by older versions of Cocoapods - add this only after tvOS support complete. + # spec.tvos.deployment_target = '9.0' end diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj index 861b362e96..04868896b6 100644 --- a/AsyncDisplayKit.xcodeproj/project.pbxproj +++ b/AsyncDisplayKit.xcodeproj/project.pbxproj @@ -1587,8 +1587,6 @@ 058D09B9195D04C000B7D73C /* Frameworks */, 058D09BA195D04C000B7D73C /* Resources */, 3B9D88CDF51B429C8409E4B6 /* Copy Pods Resources */, - 527A806066E1F4E2795090DF /* Embed Pods Frameworks */, - 1B86F48711505F91D5FEF571 /* Embed Pods Frameworks */, ); buildRules = ( ); @@ -1718,21 +1716,6 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AsyncDisplayKitTests/Pods-AsyncDisplayKitTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 527A806066E1F4E2795090DF /* Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AsyncDisplayKitTests/Pods-AsyncDisplayKitTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/AsyncDisplayKit/ASVideoNode.h b/AsyncDisplayKit/ASVideoNode.h index a01624f7d1..31b63545e2 100644 --- a/AsyncDisplayKit/ASVideoNode.h +++ b/AsyncDisplayKit/ASVideoNode.h @@ -1,3 +1,10 @@ +/* Copyright (c) 2014-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + */ #import @@ -9,6 +16,10 @@ typedef NS_ENUM(NSUInteger, ASVideoGravity) { @protocol ASVideoNodeDelegate; +// If you need ASVideoNode, please use AsyncDisplayKit master until this comment is removed. +// As of 1.9.6, ASVideoNode accidentally triggers creating the AVPlayerLayer even before playing +// the video. Using a lot of them intended to show static frame placeholders will be slow. + @interface ASVideoNode : ASControlNode @property (atomic, strong, readwrite) AVAsset *asset; @property (atomic, strong, readonly) AVPlayer *player; diff --git a/AsyncDisplayKit/ASVideoNode.mm b/AsyncDisplayKit/ASVideoNode.mm index 42d9d5ce36..e883ad4e52 100644 --- a/AsyncDisplayKit/ASVideoNode.mm +++ b/AsyncDisplayKit/ASVideoNode.mm @@ -1,7 +1,12 @@ - +/* Copyright (c) 2014-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + */ #import "ASVideoNode.h" -#import "ASDisplayNode+Beta.h" @interface ASVideoNode () { @@ -31,9 +36,13 @@ - (instancetype)init { - if (!(self = [super init])) { return nil; } + if (!(self = [super init])) { + return nil; + } - [ASDisplayNode setShouldUseNewRenderingRange:YES]; +#if DEBUG + NSLog(@"*** Warning: ASVideoNode is a new component - the 1.9.6 version may cause performance hiccups."); +#endif self.gravity = AVLayerVideoGravityResizeAspect; diff --git a/examples/VideoTableView/Sample.xcodeproj/project.pbxproj b/examples/VideoTableView/Sample.xcodeproj/project.pbxproj index c198b60ae4..f2ba462aca 100644 --- a/examples/VideoTableView/Sample.xcodeproj/project.pbxproj +++ b/examples/VideoTableView/Sample.xcodeproj/project.pbxproj @@ -128,7 +128,6 @@ 05E2127E19D4DB510098F589 /* Frameworks */, 05E2127F19D4DB510098F589 /* Resources */, F012A6F39E0149F18F564F50 /* Copy Pods Resources */, - A5C135CBCFD74D965DE0D799 /* Embed Pods Frameworks */, ); buildRules = ( ); @@ -185,21 +184,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - A5C135CBCFD74D965DE0D799 /* Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; E080B80F89C34A25B3488E26 /* Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647;