Skip to content

Commit 404795d

Browse files
author
Adlai Holler
authored
Remove Support for iOS 7 (facebookarchive#2930)
* Drop support for iOS 7 * Copy reference images * Update deployment for sample projects * Update version * Update "Life Without Cocoapods"
1 parent 0be6859 commit 404795d

334 files changed

Lines changed: 5991 additions & 12744 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AsyncDisplayKit.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Pod::Spec.new do |spec|
1212
spec.weak_frameworks = 'Photos','MapKit','AssetsLibrary'
1313
spec.requires_arc = true
1414

15-
spec.ios.deployment_target = '7.0'
15+
spec.ios.deployment_target = '8.0'
1616

1717
# Uncomment when fixed: issues with tvOS build for release 2.0
1818
# spec.tvos.deployment_target = '9.0'

‎AsyncDisplayKit.xcodeproj/project.pbxproj‎

Lines changed: 244 additions & 984 deletions
Large diffs are not rendered by default.

‎AsyncDisplayKit.xcodeproj/xcshareddata/xcschemes/AsyncDisplayKit-iOS.xcscheme‎

Lines changed: 0 additions & 81 deletions
This file was deleted.

‎AsyncDisplayKit.xcodeproj/xcshareddata/xcschemes/AsyncDisplayKit.xcscheme‎

Lines changed: 9 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,19 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "058D09AB195D04C000B7D73C"
18-
BuildableName = "libAsyncDisplayKit.a"
17+
BlueprintIdentifier = "B35061D91B010EDF0018CF92"
18+
BuildableName = "AsyncDisplayKit.framework"
1919
BlueprintName = "AsyncDisplayKit"
2020
ReferencedContainer = "container:AsyncDisplayKit.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
23-
<BuildActionEntry
24-
buildForTesting = "YES"
25-
buildForRunning = "YES"
26-
buildForProfiling = "NO"
27-
buildForArchiving = "NO"
28-
buildForAnalyzing = "YES">
29-
<BuildableReference
30-
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "058D09BB195D04C000B7D73C"
32-
BuildableName = "AsyncDisplayKitTests.xctest"
33-
BlueprintName = "AsyncDisplayKitTests"
34-
ReferencedContainer = "container:AsyncDisplayKit.xcodeproj">
35-
</BuildableReference>
36-
</BuildActionEntry>
3723
</BuildActionEntries>
3824
</BuildAction>
3925
<TestAction
4026
buildConfiguration = "Debug"
4127
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4228
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
shouldUseLaunchSchemeArgsEnv = "YES"
44-
codeCoverageEnabled = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES">
4530
<Testables>
4631
<TestableReference
4732
skipped = "NO">
@@ -56,17 +41,14 @@
5641
<Test
5742
Identifier = "ASTextNodePerformanceTests">
5843
</Test>
59-
<Test
60-
Identifier = "ASUIViewTests">
61-
</Test>
6244
</SkippedTests>
6345
</TestableReference>
6446
</Testables>
6547
<MacroExpansion>
6648
<BuildableReference
6749
BuildableIdentifier = "primary"
68-
BlueprintIdentifier = "058D09AB195D04C000B7D73C"
69-
BuildableName = "libAsyncDisplayKit.a"
50+
BlueprintIdentifier = "B35061D91B010EDF0018CF92"
51+
BuildableName = "AsyncDisplayKit.framework"
7052
BlueprintName = "AsyncDisplayKit"
7153
ReferencedContainer = "container:AsyncDisplayKit.xcodeproj">
7254
</BuildableReference>
@@ -87,19 +69,12 @@
8769
<MacroExpansion>
8870
<BuildableReference
8971
BuildableIdentifier = "primary"
90-
BlueprintIdentifier = "058D09AB195D04C000B7D73C"
91-
BuildableName = "libAsyncDisplayKit.a"
72+
BlueprintIdentifier = "B35061D91B010EDF0018CF92"
73+
BuildableName = "AsyncDisplayKit.framework"
9274
BlueprintName = "AsyncDisplayKit"
9375
ReferencedContainer = "container:AsyncDisplayKit.xcodeproj">
9476
</BuildableReference>
9577
</MacroExpansion>
96-
<EnvironmentVariables>
97-
<EnvironmentVariable
98-
key = "FB_REFERENCE_IMAGE_DIR"
99-
value = "$(SOURCE_ROOT)/$(PROJECT_NAME)Tests/ReferenceImages"
100-
isEnabled = "YES">
101-
</EnvironmentVariable>
102-
</EnvironmentVariables>
10378
<AdditionalOptions>
10479
</AdditionalOptions>
10580
</LaunchAction>
@@ -112,8 +87,8 @@
11287
<MacroExpansion>
11388
<BuildableReference
11489
BuildableIdentifier = "primary"
115-
BlueprintIdentifier = "058D09AB195D04C000B7D73C"
116-
BuildableName = "libAsyncDisplayKit.a"
90+
BlueprintIdentifier = "B35061D91B010EDF0018CF92"
91+
BuildableName = "AsyncDisplayKit.framework"
11792
BlueprintName = "AsyncDisplayKit"
11893
ReferencedContainer = "container:AsyncDisplayKit.xcodeproj">
11994
</BuildableReference>

‎AsyncDisplayKit/ASBlockTypes.h‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//
2+
// ASBlockTypes.h
3+
// AsyncDisplayKit
4+
//
5+
// Created by Adlai Holler on 1/25/17.
6+
// Copyright © 2017 Facebook. All rights reserved.
7+
//
8+
9+
#import <Foundation/Foundation.h>
10+
11+
@class ASCellNode;
12+
13+
/**
14+
* ASCellNode creation block. Used to lazily create the ASCellNode instance for a specified indexPath.
15+
*/
16+
typedef ASCellNode * _Nonnull(^ASCellNodeBlock)();
17+
18+
// Type for the cancellation checker block passed into the async display blocks. YES means the operation has been cancelled, NO means continue.
19+
typedef BOOL(^asdisplaynode_iscancelled_block_t)(void);

‎AsyncDisplayKit/ASButtonNode.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88
// of patent rights can be found in the PATENTS file in the same directory.
99
//
1010

11-
#import <AsyncDisplayKit/ASTextNode.h>
12-
#import <AsyncDisplayKit/ASImageNode.h>
11+
#import <AsyncDisplayKit/ASControlNode.h>
12+
#import <UIKit/UIKit.h>
1313

1414
NS_ASSUME_NONNULL_BEGIN
1515

16+
@class ASImageNode, ASTextNode;
17+
1618
/**
1719
Image alignment defines where the image will be placed relative to the text.
1820
*/

‎AsyncDisplayKit/ASButtonNode.mm‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@
88
// of patent rights can be found in the PATENTS file in the same directory.
99
//
1010

11-
#import "ASButtonNode.h"
12-
#import "ASStackLayoutSpec.h"
13-
#import "ASThread.h"
14-
#import "ASDisplayNode+FrameworkSubclasses.h"
15-
#import "ASBackgroundLayoutSpec.h"
16-
#import "ASInsetLayoutSpec.h"
17-
#import "ASAbsoluteLayoutSpec.h"
11+
#import <AsyncDisplayKit/ASButtonNode.h>
12+
#import <AsyncDisplayKit/ASStackLayoutSpec.h>
13+
#import <AsyncDisplayKit/ASThread.h>
14+
#import <AsyncDisplayKit/ASDisplayNode+FrameworkSubclasses.h>
15+
#import <AsyncDisplayKit/ASBackgroundLayoutSpec.h>
16+
#import <AsyncDisplayKit/ASInsetLayoutSpec.h>
17+
#import <AsyncDisplayKit/ASAbsoluteLayoutSpec.h>
18+
#import <AsyncDisplayKit/ASTextNode.h>
19+
#import <AsyncDisplayKit/ASImageNode.h>
1820

1921
@interface ASButtonNode ()
2022
{

‎AsyncDisplayKit/ASCellNode+Internal.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// of patent rights can be found in the PATENTS file in the same directory.
1111
//
1212

13-
#import "ASCellNode.h"
13+
#import <AsyncDisplayKit/ASCellNode.h>
1414

1515
NS_ASSUME_NONNULL_BEGIN
1616

‎AsyncDisplayKit/ASCellNode.mm‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
// of patent rights can be found in the PATENTS file in the same directory.
99
//
1010

11-
#import "ASCellNode+Internal.h"
11+
#import <AsyncDisplayKit/ASCellNode+Internal.h>
1212

13-
#import "ASEqualityHelpers.h"
14-
#import "ASInternalHelpers.h"
15-
#import "ASDisplayNode+FrameworkPrivate.h"
16-
#import "ASCollectionView+Undeprecated.h"
17-
#import "ASTableView+Undeprecated.h"
13+
#import <AsyncDisplayKit/ASEqualityHelpers.h>
14+
#import <AsyncDisplayKit/ASInternalHelpers.h>
15+
#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
16+
#import <AsyncDisplayKit/ASCollectionView+Undeprecated.h>
17+
#import <AsyncDisplayKit/ASTableView+Undeprecated.h>
1818
#import <AsyncDisplayKit/_ASDisplayView.h>
1919
#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
2020
#import <AsyncDisplayKit/ASDisplayNode+Beta.h>
@@ -338,7 +338,7 @@ - (void)handleVisibilityChange:(BOOL)isVisible
338338
CGRect cellFrame = CGRectZero;
339339

340340
// Ensure our _scrollView is still valid before converting. It's also possible that we have already been removed from the _scrollView,
341-
// in which case it is not valid to perform a convertRect (this actually crashes on iOS 7 and 8).
341+
// in which case it is not valid to perform a convertRect (this actually crashes on iOS 8).
342342
UIScrollView *scrollView = (_scrollView != nil && view.superview != nil && [view isDescendantOfView:_scrollView]) ? _scrollView : nil;
343343
if (scrollView) {
344344
cellFrame = [view convertRect:view.bounds toView:_scrollView];

‎AsyncDisplayKit/ASCollectionNode+Beta.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
// of patent rights can be found in the PATENTS file in the same directory.
99
//
1010

11-
#import "ASCollectionNode.h"
11+
#import <AsyncDisplayKit/ASCollectionNode.h>
12+
1213
@protocol ASCollectionViewLayoutFacilitatorProtocol;
1314

1415
NS_ASSUME_NONNULL_BEGIN

0 commit comments

Comments
 (0)