Skip to content
This repository was archived by the owner on Feb 2, 2023. It is now read-only.

Commit 2c5db2e

Browse files
author
Scott Goodson
committed
Podfile bump to 1.9.6; minor preparations for release.
1 parent ea6c7ae commit 2c5db2e

5 files changed

Lines changed: 28 additions & 40 deletions

File tree

AsyncDisplayKit.podspec

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Pod::Spec.new do |spec|
22
spec.name = 'AsyncDisplayKit'
3-
spec.version = '1.9.5'
3+
spec.version = '1.9.6'
44
spec.license = { :type => 'BSD' }
55
spec.homepage = 'http://asyncdisplaykit.org'
66
spec.authors = { 'Scott Goodson' => 'scottgoodson@gmail.com', 'Ryan Nystrom' => 'rnystrom@fb.com' }
77
spec.summary = 'Smooth asynchronous user interfaces for iOS apps.'
8-
spec.source = { :git => 'https://github.com/facebook/AsyncDisplayKit.git', :tag => '1.9.5' }
8+
spec.source = { :git => 'https://github.com/facebook/AsyncDisplayKit.git', :tag => '1.9.6' }
99

1010
spec.documentation_url = 'http://asyncdisplaykit.org/appledoc/'
1111

@@ -47,5 +47,6 @@ Pod::Spec.new do |spec|
4747
}
4848

4949
spec.ios.deployment_target = '7.0'
50-
spec.tvos.deployment_target = '9.0'
50+
# tvOS not recognized by older versions of Cocoapods - add this only after tvOS support complete.
51+
# spec.tvos.deployment_target = '9.0'
5152
end

AsyncDisplayKit.xcodeproj/project.pbxproj

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1587,8 +1587,6 @@
15871587
058D09B9195D04C000B7D73C /* Frameworks */,
15881588
058D09BA195D04C000B7D73C /* Resources */,
15891589
3B9D88CDF51B429C8409E4B6 /* Copy Pods Resources */,
1590-
527A806066E1F4E2795090DF /* Embed Pods Frameworks */,
1591-
1B86F48711505F91D5FEF571 /* Embed Pods Frameworks */,
15921590
);
15931591
buildRules = (
15941592
);
@@ -1718,21 +1716,6 @@
17181716
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AsyncDisplayKitTests/Pods-AsyncDisplayKitTests-resources.sh\"\n";
17191717
showEnvVarsInLog = 0;
17201718
};
1721-
527A806066E1F4E2795090DF /* Embed Pods Frameworks */ = {
1722-
isa = PBXShellScriptBuildPhase;
1723-
buildActionMask = 2147483647;
1724-
files = (
1725-
);
1726-
inputPaths = (
1727-
);
1728-
name = "Embed Pods Frameworks";
1729-
outputPaths = (
1730-
);
1731-
runOnlyForDeploymentPostprocessing = 0;
1732-
shellPath = /bin/sh;
1733-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AsyncDisplayKitTests/Pods-AsyncDisplayKitTests-frameworks.sh\"\n";
1734-
showEnvVarsInLog = 0;
1735-
};
17361719
/* End PBXShellScriptBuildPhase section */
17371720

17381721
/* Begin PBXSourcesBuildPhase section */

AsyncDisplayKit/ASVideoNode.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
/* Copyright (c) 2014-present, Facebook, Inc.
2+
* All rights reserved.
3+
*
4+
* This source code is licensed under the BSD-style license found in the
5+
* LICENSE file in the root directory of this source tree. An additional grant
6+
* of patent rights can be found in the PATENTS file in the same directory.
7+
*/
18

29
#import <AsyncDisplayKit/AsyncDisplayKit.h>
310

@@ -9,6 +16,10 @@ typedef NS_ENUM(NSUInteger, ASVideoGravity) {
916

1017
@protocol ASVideoNodeDelegate;
1118

19+
// If you need ASVideoNode, please use AsyncDisplayKit master until this comment is removed.
20+
// As of 1.9.6, ASVideoNode accidentally triggers creating the AVPlayerLayer even before playing
21+
// the video. Using a lot of them intended to show static frame placeholders will be slow.
22+
1223
@interface ASVideoNode : ASControlNode
1324
@property (atomic, strong, readwrite) AVAsset *asset;
1425
@property (atomic, strong, readonly) AVPlayer *player;

AsyncDisplayKit/ASVideoNode.mm

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
1+
/* Copyright (c) 2014-present, Facebook, Inc.
2+
* All rights reserved.
3+
*
4+
* This source code is licensed under the BSD-style license found in the
5+
* LICENSE file in the root directory of this source tree. An additional grant
6+
* of patent rights can be found in the PATENTS file in the same directory.
7+
*/
28

39
#import "ASVideoNode.h"
4-
#import "ASDisplayNode+Beta.h"
510

611
@interface ASVideoNode ()
712
{
@@ -31,9 +36,13 @@ @implementation ASVideoNode
3136

3237
- (instancetype)init
3338
{
34-
if (!(self = [super init])) { return nil; }
39+
if (!(self = [super init])) {
40+
return nil;
41+
}
3542

36-
[ASDisplayNode setShouldUseNewRenderingRange:YES];
43+
#if DEBUG
44+
NSLog(@"*** Warning: ASVideoNode is a new component - the 1.9.6 version may cause performance hiccups.");
45+
#endif
3746

3847
self.gravity = AVLayerVideoGravityResizeAspect;
3948

examples/VideoTableView/Sample.xcodeproj/project.pbxproj

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
05E2127E19D4DB510098F589 /* Frameworks */,
129129
05E2127F19D4DB510098F589 /* Resources */,
130130
F012A6F39E0149F18F564F50 /* Copy Pods Resources */,
131-
A5C135CBCFD74D965DE0D799 /* Embed Pods Frameworks */,
132131
);
133132
buildRules = (
134133
);
@@ -185,21 +184,6 @@
185184
/* End PBXResourcesBuildPhase section */
186185

187186
/* Begin PBXShellScriptBuildPhase section */
188-
A5C135CBCFD74D965DE0D799 /* Embed Pods Frameworks */ = {
189-
isa = PBXShellScriptBuildPhase;
190-
buildActionMask = 2147483647;
191-
files = (
192-
);
193-
inputPaths = (
194-
);
195-
name = "Embed Pods Frameworks";
196-
outputPaths = (
197-
);
198-
runOnlyForDeploymentPostprocessing = 0;
199-
shellPath = /bin/sh;
200-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
201-
showEnvVarsInLog = 0;
202-
};
203187
E080B80F89C34A25B3488E26 /* Check Pods Manifest.lock */ = {
204188
isa = PBXShellScriptBuildPhase;
205189
buildActionMask = 2147483647;

0 commit comments

Comments
 (0)