From 8d4959bd76f1ff5334f07679bd816b7f4f59589b Mon Sep 17 00:00:00 2001 From: Garrett Moon Date: Mon, 16 May 2016 14:56:41 -0700 Subject: [PATCH 1/4] Revert "ASViewController.m -> ASViewController.mm upstream" This reverts commit b34e8d78de20ea11b2b07a24df3b12d2936d1a5e. In attempting to rebase my visibility patch, I overwrote all of Ricky's changes to ASViewController. This puts them back in. --- AsyncDisplayKit/ASViewController.mm | 92 ++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/AsyncDisplayKit/ASViewController.mm b/AsyncDisplayKit/ASViewController.mm index 7cb031a1..710016cc 100644 --- a/AsyncDisplayKit/ASViewController.mm +++ b/AsyncDisplayKit/ASViewController.mm @@ -9,8 +9,11 @@ #import "ASViewController.h" #import "ASAssert.h" #import "ASDimension.h" +#import "ASDisplayNodeInternal.h" #import "ASDisplayNode+FrameworkPrivate.h" #import "ASDisplayNode+Beta.h" +#import "ASTraitCollection.h" +#import "ASEnvironmentInternal.h" #import "ASRangeControllerUpdateRangeProtocol+Beta.h" #define AS_LOG_VISIBILITY_CHANGES 0 @@ -46,10 +49,21 @@ _node = node; _automaticallyAdjustRangeModeBasedOnViewEvents = NO; - + return self; } +- (void)dealloc +{ + if (_traitColectionContext != nil) { + // The setter will iterate through the VC's subnodes and replace the traitCollectionContext in their ASEnvironmentTraitCollection with nil. + // Since the VC holds the only strong reference to this context and we are in the process of destroying + // the VC, all the references in the subnodes will be unsafe unless we nil them out. More than likely all the subnodes will be dealloc'ed + // as part of the VC being dealloc'ed, but this is just to make extra sure. + self.traitColectionContext = nil; + } +} + - (void)loadView { ASDisplayNodeAssertTrue(!_node.layerBacked); @@ -171,4 +185,80 @@ ASVisibilityDepthImplementation; return _node.interfaceState; } +#pragma mark - ASEnvironmentTraitCollection + +- (void)setTraitColectionContext:(id)traitColectionContext +{ + if (_traitColectionContext != traitColectionContext) { + // propagate first so that nodes aren't hanging around with a dealloc'ed pointer + ASEnvironmentTraitCollectionUpdateDisplayContext(self.node, traitColectionContext); + + _traitColectionContext = traitColectionContext; + } +} + +- (ASEnvironmentTraitCollection)displayTraitsForTraitCollection:(UITraitCollection *)traitCollection +{ + if (self.overrideDisplayTraitsWithTraitCollection) { + ASTraitCollection *asyncTraitCollection = self.overrideDisplayTraitsWithTraitCollection(traitCollection); + self.traitColectionContext = asyncTraitCollection.traitCollectionContext; + return [asyncTraitCollection environmentTraitCollection]; + } + + ASEnvironmentTraitCollection asyncTraitCollection = ASEnvironmentTraitCollectionFromUITraitCollection(traitCollection); + asyncTraitCollection.displayContext = self.traitColectionContext; + return asyncTraitCollection; +} + +- (ASEnvironmentTraitCollection)displayTraitsForWindowSize:(CGSize)windowSize +{ + if (self.overrideDisplayTraitsWithWindowSize) { + ASTraitCollection *traitCollection = self.overrideDisplayTraitsWithWindowSize(windowSize); + self.traitColectionContext = traitCollection.traitCollectionContext; + return [traitCollection environmentTraitCollection]; + } + return self.node.environmentTraitCollection; +} + +- (void)progagateNewDisplayTraits:(ASEnvironmentTraitCollection)traitCollection +{ + ASEnvironmentState environmentState = self.node.environmentState; + ASEnvironmentTraitCollection oldTraitCollection = environmentState.traitCollection; + + if (ASEnvironmentTraitCollectionIsEqualToASEnvironmentTraitCollection(traitCollection, oldTraitCollection) == NO) { + environmentState.traitCollection = traitCollection; + self.node.environmentState = environmentState; + [self.node setNeedsLayout]; + + NSArray> *children = [self.node children]; + for (id child in children) { + ASEnvironmentStatePropagateDown(child, environmentState.traitCollection); + } + } +} + +- (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection +{ + [super traitCollectionDidChange:previousTraitCollection]; + + ASEnvironmentTraitCollection traitCollection = [self displayTraitsForTraitCollection:self.traitCollection]; + [self progagateNewDisplayTraits:traitCollection]; +} + +- (void)willTransitionToTraitCollection:(UITraitCollection *)newCollection withTransitionCoordinator:(id)coordinator +{ + [super willTransitionToTraitCollection:newCollection withTransitionCoordinator:coordinator]; + + ASEnvironmentTraitCollection traitCollection = [self displayTraitsForTraitCollection:newCollection]; + [self progagateNewDisplayTraits:traitCollection]; +} + +- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id)coordinator +{ + [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; + + ASEnvironmentTraitCollection traitCollection = [self displayTraitsForWindowSize:size]; + [self progagateNewDisplayTraits:traitCollection]; +} + @end From 14bbfe6f385b19e6b491130e127914cbd548de92 Mon Sep 17 00:00:00 2001 From: ricky Date: Mon, 16 May 2016 17:05:17 -0700 Subject: [PATCH 2/4] [ASAvailability.h] Add kCFCoreFoundationVersionNumber_iOS_9_0 define My implementation of AS_AT_LEAST_IOS9 broke when 8.4.1 was released. I ran the iOS 9.0 simulator to find the proper `kCFCoreFoundationVersionNumber` value for iOS9, added this as `kCFCoreFoundationVersionNumber_iOS_9_0` and updated the `AS_AT_LEAST_IOS9` macro --- Base/ASAvailability.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Base/ASAvailability.h b/Base/ASAvailability.h index 65fe04d6..fef62f67 100644 --- a/Base/ASAvailability.h +++ b/Base/ASAvailability.h @@ -27,6 +27,10 @@ #define kCFCoreFoundationVersionNumber_iOS_8_4 1145.15 #endif +#ifndef kCFCoreFoundationVersionNumber_iOS_9_0 +#define kCFCoreFoundationVersionNumber_iOS_9_0 1240.10 +#endif + #ifndef __IPHONE_7_0 #define __IPHONE_7_0 70000 #endif @@ -46,4 +50,4 @@ #define AS_AT_LEAST_IOS7 (kCFCoreFoundationVersionNumber > kCFCoreFoundationVersionNumber_iOS_6_1) #define AS_AT_LEAST_IOS7_1 (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iOS_7_1) #define AS_AT_LEAST_IOS8 (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iOS_8_0) -#define AS_AT_LEAST_IOS9 (kCFCoreFoundationVersionNumber > kCFCoreFoundationVersionNumber_iOS_8_4) +#define AS_AT_LEAST_IOS9 (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iOS_9_0) From d26b4895299a334c9fbbe498ecfc621e5c072039 Mon Sep 17 00:00:00 2001 From: Scott Goodson Date: Tue, 17 May 2016 10:52:43 -0700 Subject: [PATCH 3/4] [Examples] Move several simpler, single-purpose examples to extras to ensure Travis does not time out. --- .../ASTraitCollection/Podfile | 0 .../Sample.xcodeproj/project.pbxproj | 0 .../project.xcworkspace/contents.xcworkspacedata | 0 .../xcshareddata/xcschemes/Sample.xcscheme | 0 .../Sample.xcworkspace/contents.xcworkspacedata | 0 .../ASTraitCollection/Sample/AppDelegate.h | 0 .../ASTraitCollection/Sample/AppDelegate.m | 0 .../Sample/CollectionViewController.h | 0 .../Sample/CollectionViewController.m | 0 .../ASTraitCollection/Sample/Info.plist | 0 .../ASTraitCollection/Sample/KittenNode.h | 0 .../ASTraitCollection/Sample/KittenNode.m | 0 .../Sample/Launch Screen.storyboard | 0 .../Sample/OverrideViewController.h | 0 .../Sample/OverrideViewController.m | 0 .../ASTraitCollection/Sample/TableViewController.h | 0 .../ASTraitCollection/Sample/TableViewController.m | 0 .../ASTraitCollection/Sample/ViewController.h | 0 .../ASTraitCollection/Sample/ViewController.m | 0 .../ASTraitCollection/Sample/main.m | 0 .../BackgroundPropertySetting/Podfile | 0 .../Sample.xcodeproj/project.pbxproj | 0 .../project.xcworkspace/contents.xcworkspacedata | 0 .../xcshareddata/xcschemes/Sample.xcscheme | 0 .../Sample/AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../Sample/Base.lproj/LaunchScreen.storyboard | 0 .../Sample/DemoCellNode.swift | 0 .../BackgroundPropertySetting/Sample/Info.plist | 0 .../Sample/Utilities.swift | 0 .../Sample/ViewController.swift | 0 .../EditableText/Default-568h@2x.png | Bin .../EditableText/Default-667h@2x.png | Bin .../EditableText/Default-736h@3x.png | Bin {examples => examples_extra}/EditableText/Podfile | 0 .../EditableText/Sample.xcodeproj/project.pbxproj | 0 .../project.xcworkspace/contents.xcworkspacedata | 0 .../xcshareddata/xcschemes/Sample.xcscheme | 0 .../EditableText/Sample/AppDelegate.h | 0 .../EditableText/Sample/AppDelegate.m | 0 .../EditableText/Sample/Info.plist | 0 .../EditableText/Sample/ViewController.h | 0 .../EditableText/Sample/ViewController.m | 0 .../EditableText/Sample/main.m | 0 .../Multiplex/Default-568h@2x.png | Bin .../Multiplex/Default-667h@2x.png | Bin .../Multiplex/Default-736h@3x.png | Bin {examples => examples_extra}/Multiplex/Podfile | 0 .../Multiplex/Sample.xcodeproj/project.pbxproj | 0 .../project.xcworkspace/contents.xcworkspacedata | 0 .../xcshareddata/xcschemes/Sample.xcscheme | 0 .../Multiplex/Sample/AppDelegate.h | 0 .../Multiplex/Sample/AppDelegate.m | 0 .../Multiplex/Sample/Info.plist | 0 .../Multiplex/Sample/ScreenNode.h | 0 .../Multiplex/Sample/ScreenNode.m | 0 .../Multiplex/Sample/ViewController.h | 0 .../Multiplex/Sample/ViewController.m | 0 .../Multiplex/Sample/main.m | 0 {examples => examples_extra}/Multiplex/best.png | Bin {examples => examples_extra}/Multiplex/medium.png | Bin {examples => examples_extra}/Multiplex/worst.png | Bin .../Placeholders/Default-568h@2x.png | Bin .../Placeholders/Default-667h@2x.png | Bin .../Placeholders/Default-736h@3x.png | Bin {examples => examples_extra}/Placeholders/Podfile | 0 .../Placeholders/Sample.xcodeproj/project.pbxproj | 0 .../project.xcworkspace/contents.xcworkspacedata | 0 .../xcshareddata/xcschemes/Sample.xcscheme | 0 .../Placeholders/Sample/AppDelegate.h | 0 .../Placeholders/Sample/AppDelegate.m | 0 .../Placeholders/Sample/Info.plist | 0 .../Placeholders/Sample/PostNode.h | 0 .../Placeholders/Sample/PostNode.m | 0 .../Placeholders/Sample/SlowpokeImageNode.h | 0 .../Placeholders/Sample/SlowpokeImageNode.m | 0 .../Placeholders/Sample/SlowpokeShareNode.h | 0 .../Placeholders/Sample/SlowpokeShareNode.m | 0 .../Placeholders/Sample/SlowpokeTextNode.h | 0 .../Placeholders/Sample/SlowpokeTextNode.m | 0 .../Placeholders/Sample/ViewController.h | 0 .../Placeholders/Sample/ViewController.m | 0 .../Placeholders/Sample/logo.png | Bin .../Placeholders/Sample/main.m | 0 84 files changed, 0 insertions(+), 0 deletions(-) rename {examples => examples_extra}/ASTraitCollection/Podfile (100%) rename {examples => examples_extra}/ASTraitCollection/Sample.xcodeproj/project.pbxproj (100%) rename {examples => examples_extra}/ASTraitCollection/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {examples => examples_extra}/ASTraitCollection/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme (100%) rename {examples => examples_extra}/ASTraitCollection/Sample.xcworkspace/contents.xcworkspacedata (100%) rename {examples => examples_extra}/ASTraitCollection/Sample/AppDelegate.h (100%) rename {examples => examples_extra}/ASTraitCollection/Sample/AppDelegate.m (100%) rename {examples => examples_extra}/ASTraitCollection/Sample/CollectionViewController.h (100%) rename {examples => examples_extra}/ASTraitCollection/Sample/CollectionViewController.m (100%) rename {examples => examples_extra}/ASTraitCollection/Sample/Info.plist (100%) rename {examples => examples_extra}/ASTraitCollection/Sample/KittenNode.h (100%) rename {examples => examples_extra}/ASTraitCollection/Sample/KittenNode.m (100%) rename {examples => examples_extra}/ASTraitCollection/Sample/Launch Screen.storyboard (100%) rename {examples => examples_extra}/ASTraitCollection/Sample/OverrideViewController.h (100%) rename {examples => examples_extra}/ASTraitCollection/Sample/OverrideViewController.m (100%) rename {examples => examples_extra}/ASTraitCollection/Sample/TableViewController.h (100%) rename {examples => examples_extra}/ASTraitCollection/Sample/TableViewController.m (100%) rename {examples => examples_extra}/ASTraitCollection/Sample/ViewController.h (100%) rename {examples => examples_extra}/ASTraitCollection/Sample/ViewController.m (100%) rename {examples => examples_extra}/ASTraitCollection/Sample/main.m (100%) rename {examples => examples_extra}/BackgroundPropertySetting/Podfile (100%) rename {examples => examples_extra}/BackgroundPropertySetting/Sample.xcodeproj/project.pbxproj (100%) rename {examples => examples_extra}/BackgroundPropertySetting/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {examples => examples_extra}/BackgroundPropertySetting/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme (100%) rename {examples => examples_extra}/BackgroundPropertySetting/Sample/AppDelegate.swift (100%) rename {examples => examples_extra}/BackgroundPropertySetting/Sample/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {examples => examples_extra}/BackgroundPropertySetting/Sample/Base.lproj/LaunchScreen.storyboard (100%) rename {examples => examples_extra}/BackgroundPropertySetting/Sample/DemoCellNode.swift (100%) rename {examples => examples_extra}/BackgroundPropertySetting/Sample/Info.plist (100%) rename {examples => examples_extra}/BackgroundPropertySetting/Sample/Utilities.swift (100%) rename {examples => examples_extra}/BackgroundPropertySetting/Sample/ViewController.swift (100%) rename {examples => examples_extra}/EditableText/Default-568h@2x.png (100%) rename {examples => examples_extra}/EditableText/Default-667h@2x.png (100%) rename {examples => examples_extra}/EditableText/Default-736h@3x.png (100%) rename {examples => examples_extra}/EditableText/Podfile (100%) rename {examples => examples_extra}/EditableText/Sample.xcodeproj/project.pbxproj (100%) rename {examples => examples_extra}/EditableText/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {examples => examples_extra}/EditableText/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme (100%) rename {examples => examples_extra}/EditableText/Sample/AppDelegate.h (100%) rename {examples => examples_extra}/EditableText/Sample/AppDelegate.m (100%) rename {examples => examples_extra}/EditableText/Sample/Info.plist (100%) rename {examples => examples_extra}/EditableText/Sample/ViewController.h (100%) rename {examples => examples_extra}/EditableText/Sample/ViewController.m (100%) rename {examples => examples_extra}/EditableText/Sample/main.m (100%) rename {examples => examples_extra}/Multiplex/Default-568h@2x.png (100%) rename {examples => examples_extra}/Multiplex/Default-667h@2x.png (100%) rename {examples => examples_extra}/Multiplex/Default-736h@3x.png (100%) rename {examples => examples_extra}/Multiplex/Podfile (100%) rename {examples => examples_extra}/Multiplex/Sample.xcodeproj/project.pbxproj (100%) rename {examples => examples_extra}/Multiplex/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {examples => examples_extra}/Multiplex/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme (100%) rename {examples => examples_extra}/Multiplex/Sample/AppDelegate.h (100%) rename {examples => examples_extra}/Multiplex/Sample/AppDelegate.m (100%) rename {examples => examples_extra}/Multiplex/Sample/Info.plist (100%) rename {examples => examples_extra}/Multiplex/Sample/ScreenNode.h (100%) rename {examples => examples_extra}/Multiplex/Sample/ScreenNode.m (100%) rename {examples => examples_extra}/Multiplex/Sample/ViewController.h (100%) rename {examples => examples_extra}/Multiplex/Sample/ViewController.m (100%) rename {examples => examples_extra}/Multiplex/Sample/main.m (100%) rename {examples => examples_extra}/Multiplex/best.png (100%) rename {examples => examples_extra}/Multiplex/medium.png (100%) rename {examples => examples_extra}/Multiplex/worst.png (100%) rename {examples => examples_extra}/Placeholders/Default-568h@2x.png (100%) rename {examples => examples_extra}/Placeholders/Default-667h@2x.png (100%) rename {examples => examples_extra}/Placeholders/Default-736h@3x.png (100%) rename {examples => examples_extra}/Placeholders/Podfile (100%) rename {examples => examples_extra}/Placeholders/Sample.xcodeproj/project.pbxproj (100%) rename {examples => examples_extra}/Placeholders/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {examples => examples_extra}/Placeholders/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme (100%) rename {examples => examples_extra}/Placeholders/Sample/AppDelegate.h (100%) rename {examples => examples_extra}/Placeholders/Sample/AppDelegate.m (100%) rename {examples => examples_extra}/Placeholders/Sample/Info.plist (100%) rename {examples => examples_extra}/Placeholders/Sample/PostNode.h (100%) rename {examples => examples_extra}/Placeholders/Sample/PostNode.m (100%) rename {examples => examples_extra}/Placeholders/Sample/SlowpokeImageNode.h (100%) rename {examples => examples_extra}/Placeholders/Sample/SlowpokeImageNode.m (100%) rename {examples => examples_extra}/Placeholders/Sample/SlowpokeShareNode.h (100%) rename {examples => examples_extra}/Placeholders/Sample/SlowpokeShareNode.m (100%) rename {examples => examples_extra}/Placeholders/Sample/SlowpokeTextNode.h (100%) rename {examples => examples_extra}/Placeholders/Sample/SlowpokeTextNode.m (100%) rename {examples => examples_extra}/Placeholders/Sample/ViewController.h (100%) rename {examples => examples_extra}/Placeholders/Sample/ViewController.m (100%) rename {examples => examples_extra}/Placeholders/Sample/logo.png (100%) rename {examples => examples_extra}/Placeholders/Sample/main.m (100%) diff --git a/examples/ASTraitCollection/Podfile b/examples_extra/ASTraitCollection/Podfile similarity index 100% rename from examples/ASTraitCollection/Podfile rename to examples_extra/ASTraitCollection/Podfile diff --git a/examples/ASTraitCollection/Sample.xcodeproj/project.pbxproj b/examples_extra/ASTraitCollection/Sample.xcodeproj/project.pbxproj similarity index 100% rename from examples/ASTraitCollection/Sample.xcodeproj/project.pbxproj rename to examples_extra/ASTraitCollection/Sample.xcodeproj/project.pbxproj diff --git a/examples/ASTraitCollection/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/examples_extra/ASTraitCollection/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from examples/ASTraitCollection/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to examples_extra/ASTraitCollection/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/examples/ASTraitCollection/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme b/examples_extra/ASTraitCollection/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme similarity index 100% rename from examples/ASTraitCollection/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme rename to examples_extra/ASTraitCollection/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme diff --git a/examples/ASTraitCollection/Sample.xcworkspace/contents.xcworkspacedata b/examples_extra/ASTraitCollection/Sample.xcworkspace/contents.xcworkspacedata similarity index 100% rename from examples/ASTraitCollection/Sample.xcworkspace/contents.xcworkspacedata rename to examples_extra/ASTraitCollection/Sample.xcworkspace/contents.xcworkspacedata diff --git a/examples/ASTraitCollection/Sample/AppDelegate.h b/examples_extra/ASTraitCollection/Sample/AppDelegate.h similarity index 100% rename from examples/ASTraitCollection/Sample/AppDelegate.h rename to examples_extra/ASTraitCollection/Sample/AppDelegate.h diff --git a/examples/ASTraitCollection/Sample/AppDelegate.m b/examples_extra/ASTraitCollection/Sample/AppDelegate.m similarity index 100% rename from examples/ASTraitCollection/Sample/AppDelegate.m rename to examples_extra/ASTraitCollection/Sample/AppDelegate.m diff --git a/examples/ASTraitCollection/Sample/CollectionViewController.h b/examples_extra/ASTraitCollection/Sample/CollectionViewController.h similarity index 100% rename from examples/ASTraitCollection/Sample/CollectionViewController.h rename to examples_extra/ASTraitCollection/Sample/CollectionViewController.h diff --git a/examples/ASTraitCollection/Sample/CollectionViewController.m b/examples_extra/ASTraitCollection/Sample/CollectionViewController.m similarity index 100% rename from examples/ASTraitCollection/Sample/CollectionViewController.m rename to examples_extra/ASTraitCollection/Sample/CollectionViewController.m diff --git a/examples/ASTraitCollection/Sample/Info.plist b/examples_extra/ASTraitCollection/Sample/Info.plist similarity index 100% rename from examples/ASTraitCollection/Sample/Info.plist rename to examples_extra/ASTraitCollection/Sample/Info.plist diff --git a/examples/ASTraitCollection/Sample/KittenNode.h b/examples_extra/ASTraitCollection/Sample/KittenNode.h similarity index 100% rename from examples/ASTraitCollection/Sample/KittenNode.h rename to examples_extra/ASTraitCollection/Sample/KittenNode.h diff --git a/examples/ASTraitCollection/Sample/KittenNode.m b/examples_extra/ASTraitCollection/Sample/KittenNode.m similarity index 100% rename from examples/ASTraitCollection/Sample/KittenNode.m rename to examples_extra/ASTraitCollection/Sample/KittenNode.m diff --git a/examples/ASTraitCollection/Sample/Launch Screen.storyboard b/examples_extra/ASTraitCollection/Sample/Launch Screen.storyboard similarity index 100% rename from examples/ASTraitCollection/Sample/Launch Screen.storyboard rename to examples_extra/ASTraitCollection/Sample/Launch Screen.storyboard diff --git a/examples/ASTraitCollection/Sample/OverrideViewController.h b/examples_extra/ASTraitCollection/Sample/OverrideViewController.h similarity index 100% rename from examples/ASTraitCollection/Sample/OverrideViewController.h rename to examples_extra/ASTraitCollection/Sample/OverrideViewController.h diff --git a/examples/ASTraitCollection/Sample/OverrideViewController.m b/examples_extra/ASTraitCollection/Sample/OverrideViewController.m similarity index 100% rename from examples/ASTraitCollection/Sample/OverrideViewController.m rename to examples_extra/ASTraitCollection/Sample/OverrideViewController.m diff --git a/examples/ASTraitCollection/Sample/TableViewController.h b/examples_extra/ASTraitCollection/Sample/TableViewController.h similarity index 100% rename from examples/ASTraitCollection/Sample/TableViewController.h rename to examples_extra/ASTraitCollection/Sample/TableViewController.h diff --git a/examples/ASTraitCollection/Sample/TableViewController.m b/examples_extra/ASTraitCollection/Sample/TableViewController.m similarity index 100% rename from examples/ASTraitCollection/Sample/TableViewController.m rename to examples_extra/ASTraitCollection/Sample/TableViewController.m diff --git a/examples/ASTraitCollection/Sample/ViewController.h b/examples_extra/ASTraitCollection/Sample/ViewController.h similarity index 100% rename from examples/ASTraitCollection/Sample/ViewController.h rename to examples_extra/ASTraitCollection/Sample/ViewController.h diff --git a/examples/ASTraitCollection/Sample/ViewController.m b/examples_extra/ASTraitCollection/Sample/ViewController.m similarity index 100% rename from examples/ASTraitCollection/Sample/ViewController.m rename to examples_extra/ASTraitCollection/Sample/ViewController.m diff --git a/examples/ASTraitCollection/Sample/main.m b/examples_extra/ASTraitCollection/Sample/main.m similarity index 100% rename from examples/ASTraitCollection/Sample/main.m rename to examples_extra/ASTraitCollection/Sample/main.m diff --git a/examples/BackgroundPropertySetting/Podfile b/examples_extra/BackgroundPropertySetting/Podfile similarity index 100% rename from examples/BackgroundPropertySetting/Podfile rename to examples_extra/BackgroundPropertySetting/Podfile diff --git a/examples/BackgroundPropertySetting/Sample.xcodeproj/project.pbxproj b/examples_extra/BackgroundPropertySetting/Sample.xcodeproj/project.pbxproj similarity index 100% rename from examples/BackgroundPropertySetting/Sample.xcodeproj/project.pbxproj rename to examples_extra/BackgroundPropertySetting/Sample.xcodeproj/project.pbxproj diff --git a/examples/BackgroundPropertySetting/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/examples_extra/BackgroundPropertySetting/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from examples/BackgroundPropertySetting/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to examples_extra/BackgroundPropertySetting/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/examples/BackgroundPropertySetting/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme b/examples_extra/BackgroundPropertySetting/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme similarity index 100% rename from examples/BackgroundPropertySetting/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme rename to examples_extra/BackgroundPropertySetting/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme diff --git a/examples/BackgroundPropertySetting/Sample/AppDelegate.swift b/examples_extra/BackgroundPropertySetting/Sample/AppDelegate.swift similarity index 100% rename from examples/BackgroundPropertySetting/Sample/AppDelegate.swift rename to examples_extra/BackgroundPropertySetting/Sample/AppDelegate.swift diff --git a/examples/BackgroundPropertySetting/Sample/Assets.xcassets/AppIcon.appiconset/Contents.json b/examples_extra/BackgroundPropertySetting/Sample/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from examples/BackgroundPropertySetting/Sample/Assets.xcassets/AppIcon.appiconset/Contents.json rename to examples_extra/BackgroundPropertySetting/Sample/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/examples/BackgroundPropertySetting/Sample/Base.lproj/LaunchScreen.storyboard b/examples_extra/BackgroundPropertySetting/Sample/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from examples/BackgroundPropertySetting/Sample/Base.lproj/LaunchScreen.storyboard rename to examples_extra/BackgroundPropertySetting/Sample/Base.lproj/LaunchScreen.storyboard diff --git a/examples/BackgroundPropertySetting/Sample/DemoCellNode.swift b/examples_extra/BackgroundPropertySetting/Sample/DemoCellNode.swift similarity index 100% rename from examples/BackgroundPropertySetting/Sample/DemoCellNode.swift rename to examples_extra/BackgroundPropertySetting/Sample/DemoCellNode.swift diff --git a/examples/BackgroundPropertySetting/Sample/Info.plist b/examples_extra/BackgroundPropertySetting/Sample/Info.plist similarity index 100% rename from examples/BackgroundPropertySetting/Sample/Info.plist rename to examples_extra/BackgroundPropertySetting/Sample/Info.plist diff --git a/examples/BackgroundPropertySetting/Sample/Utilities.swift b/examples_extra/BackgroundPropertySetting/Sample/Utilities.swift similarity index 100% rename from examples/BackgroundPropertySetting/Sample/Utilities.swift rename to examples_extra/BackgroundPropertySetting/Sample/Utilities.swift diff --git a/examples/BackgroundPropertySetting/Sample/ViewController.swift b/examples_extra/BackgroundPropertySetting/Sample/ViewController.swift similarity index 100% rename from examples/BackgroundPropertySetting/Sample/ViewController.swift rename to examples_extra/BackgroundPropertySetting/Sample/ViewController.swift diff --git a/examples/EditableText/Default-568h@2x.png b/examples_extra/EditableText/Default-568h@2x.png similarity index 100% rename from examples/EditableText/Default-568h@2x.png rename to examples_extra/EditableText/Default-568h@2x.png diff --git a/examples/EditableText/Default-667h@2x.png b/examples_extra/EditableText/Default-667h@2x.png similarity index 100% rename from examples/EditableText/Default-667h@2x.png rename to examples_extra/EditableText/Default-667h@2x.png diff --git a/examples/EditableText/Default-736h@3x.png b/examples_extra/EditableText/Default-736h@3x.png similarity index 100% rename from examples/EditableText/Default-736h@3x.png rename to examples_extra/EditableText/Default-736h@3x.png diff --git a/examples/EditableText/Podfile b/examples_extra/EditableText/Podfile similarity index 100% rename from examples/EditableText/Podfile rename to examples_extra/EditableText/Podfile diff --git a/examples/EditableText/Sample.xcodeproj/project.pbxproj b/examples_extra/EditableText/Sample.xcodeproj/project.pbxproj similarity index 100% rename from examples/EditableText/Sample.xcodeproj/project.pbxproj rename to examples_extra/EditableText/Sample.xcodeproj/project.pbxproj diff --git a/examples/EditableText/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/examples_extra/EditableText/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from examples/EditableText/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to examples_extra/EditableText/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/examples/EditableText/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme b/examples_extra/EditableText/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme similarity index 100% rename from examples/EditableText/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme rename to examples_extra/EditableText/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme diff --git a/examples/EditableText/Sample/AppDelegate.h b/examples_extra/EditableText/Sample/AppDelegate.h similarity index 100% rename from examples/EditableText/Sample/AppDelegate.h rename to examples_extra/EditableText/Sample/AppDelegate.h diff --git a/examples/EditableText/Sample/AppDelegate.m b/examples_extra/EditableText/Sample/AppDelegate.m similarity index 100% rename from examples/EditableText/Sample/AppDelegate.m rename to examples_extra/EditableText/Sample/AppDelegate.m diff --git a/examples/EditableText/Sample/Info.plist b/examples_extra/EditableText/Sample/Info.plist similarity index 100% rename from examples/EditableText/Sample/Info.plist rename to examples_extra/EditableText/Sample/Info.plist diff --git a/examples/EditableText/Sample/ViewController.h b/examples_extra/EditableText/Sample/ViewController.h similarity index 100% rename from examples/EditableText/Sample/ViewController.h rename to examples_extra/EditableText/Sample/ViewController.h diff --git a/examples/EditableText/Sample/ViewController.m b/examples_extra/EditableText/Sample/ViewController.m similarity index 100% rename from examples/EditableText/Sample/ViewController.m rename to examples_extra/EditableText/Sample/ViewController.m diff --git a/examples/EditableText/Sample/main.m b/examples_extra/EditableText/Sample/main.m similarity index 100% rename from examples/EditableText/Sample/main.m rename to examples_extra/EditableText/Sample/main.m diff --git a/examples/Multiplex/Default-568h@2x.png b/examples_extra/Multiplex/Default-568h@2x.png similarity index 100% rename from examples/Multiplex/Default-568h@2x.png rename to examples_extra/Multiplex/Default-568h@2x.png diff --git a/examples/Multiplex/Default-667h@2x.png b/examples_extra/Multiplex/Default-667h@2x.png similarity index 100% rename from examples/Multiplex/Default-667h@2x.png rename to examples_extra/Multiplex/Default-667h@2x.png diff --git a/examples/Multiplex/Default-736h@3x.png b/examples_extra/Multiplex/Default-736h@3x.png similarity index 100% rename from examples/Multiplex/Default-736h@3x.png rename to examples_extra/Multiplex/Default-736h@3x.png diff --git a/examples/Multiplex/Podfile b/examples_extra/Multiplex/Podfile similarity index 100% rename from examples/Multiplex/Podfile rename to examples_extra/Multiplex/Podfile diff --git a/examples/Multiplex/Sample.xcodeproj/project.pbxproj b/examples_extra/Multiplex/Sample.xcodeproj/project.pbxproj similarity index 100% rename from examples/Multiplex/Sample.xcodeproj/project.pbxproj rename to examples_extra/Multiplex/Sample.xcodeproj/project.pbxproj diff --git a/examples/Multiplex/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/examples_extra/Multiplex/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from examples/Multiplex/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to examples_extra/Multiplex/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/examples/Multiplex/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme b/examples_extra/Multiplex/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme similarity index 100% rename from examples/Multiplex/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme rename to examples_extra/Multiplex/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme diff --git a/examples/Multiplex/Sample/AppDelegate.h b/examples_extra/Multiplex/Sample/AppDelegate.h similarity index 100% rename from examples/Multiplex/Sample/AppDelegate.h rename to examples_extra/Multiplex/Sample/AppDelegate.h diff --git a/examples/Multiplex/Sample/AppDelegate.m b/examples_extra/Multiplex/Sample/AppDelegate.m similarity index 100% rename from examples/Multiplex/Sample/AppDelegate.m rename to examples_extra/Multiplex/Sample/AppDelegate.m diff --git a/examples/Multiplex/Sample/Info.plist b/examples_extra/Multiplex/Sample/Info.plist similarity index 100% rename from examples/Multiplex/Sample/Info.plist rename to examples_extra/Multiplex/Sample/Info.plist diff --git a/examples/Multiplex/Sample/ScreenNode.h b/examples_extra/Multiplex/Sample/ScreenNode.h similarity index 100% rename from examples/Multiplex/Sample/ScreenNode.h rename to examples_extra/Multiplex/Sample/ScreenNode.h diff --git a/examples/Multiplex/Sample/ScreenNode.m b/examples_extra/Multiplex/Sample/ScreenNode.m similarity index 100% rename from examples/Multiplex/Sample/ScreenNode.m rename to examples_extra/Multiplex/Sample/ScreenNode.m diff --git a/examples/Multiplex/Sample/ViewController.h b/examples_extra/Multiplex/Sample/ViewController.h similarity index 100% rename from examples/Multiplex/Sample/ViewController.h rename to examples_extra/Multiplex/Sample/ViewController.h diff --git a/examples/Multiplex/Sample/ViewController.m b/examples_extra/Multiplex/Sample/ViewController.m similarity index 100% rename from examples/Multiplex/Sample/ViewController.m rename to examples_extra/Multiplex/Sample/ViewController.m diff --git a/examples/Multiplex/Sample/main.m b/examples_extra/Multiplex/Sample/main.m similarity index 100% rename from examples/Multiplex/Sample/main.m rename to examples_extra/Multiplex/Sample/main.m diff --git a/examples/Multiplex/best.png b/examples_extra/Multiplex/best.png similarity index 100% rename from examples/Multiplex/best.png rename to examples_extra/Multiplex/best.png diff --git a/examples/Multiplex/medium.png b/examples_extra/Multiplex/medium.png similarity index 100% rename from examples/Multiplex/medium.png rename to examples_extra/Multiplex/medium.png diff --git a/examples/Multiplex/worst.png b/examples_extra/Multiplex/worst.png similarity index 100% rename from examples/Multiplex/worst.png rename to examples_extra/Multiplex/worst.png diff --git a/examples/Placeholders/Default-568h@2x.png b/examples_extra/Placeholders/Default-568h@2x.png similarity index 100% rename from examples/Placeholders/Default-568h@2x.png rename to examples_extra/Placeholders/Default-568h@2x.png diff --git a/examples/Placeholders/Default-667h@2x.png b/examples_extra/Placeholders/Default-667h@2x.png similarity index 100% rename from examples/Placeholders/Default-667h@2x.png rename to examples_extra/Placeholders/Default-667h@2x.png diff --git a/examples/Placeholders/Default-736h@3x.png b/examples_extra/Placeholders/Default-736h@3x.png similarity index 100% rename from examples/Placeholders/Default-736h@3x.png rename to examples_extra/Placeholders/Default-736h@3x.png diff --git a/examples/Placeholders/Podfile b/examples_extra/Placeholders/Podfile similarity index 100% rename from examples/Placeholders/Podfile rename to examples_extra/Placeholders/Podfile diff --git a/examples/Placeholders/Sample.xcodeproj/project.pbxproj b/examples_extra/Placeholders/Sample.xcodeproj/project.pbxproj similarity index 100% rename from examples/Placeholders/Sample.xcodeproj/project.pbxproj rename to examples_extra/Placeholders/Sample.xcodeproj/project.pbxproj diff --git a/examples/Placeholders/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/examples_extra/Placeholders/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from examples/Placeholders/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to examples_extra/Placeholders/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/examples/Placeholders/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme b/examples_extra/Placeholders/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme similarity index 100% rename from examples/Placeholders/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme rename to examples_extra/Placeholders/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme diff --git a/examples/Placeholders/Sample/AppDelegate.h b/examples_extra/Placeholders/Sample/AppDelegate.h similarity index 100% rename from examples/Placeholders/Sample/AppDelegate.h rename to examples_extra/Placeholders/Sample/AppDelegate.h diff --git a/examples/Placeholders/Sample/AppDelegate.m b/examples_extra/Placeholders/Sample/AppDelegate.m similarity index 100% rename from examples/Placeholders/Sample/AppDelegate.m rename to examples_extra/Placeholders/Sample/AppDelegate.m diff --git a/examples/Placeholders/Sample/Info.plist b/examples_extra/Placeholders/Sample/Info.plist similarity index 100% rename from examples/Placeholders/Sample/Info.plist rename to examples_extra/Placeholders/Sample/Info.plist diff --git a/examples/Placeholders/Sample/PostNode.h b/examples_extra/Placeholders/Sample/PostNode.h similarity index 100% rename from examples/Placeholders/Sample/PostNode.h rename to examples_extra/Placeholders/Sample/PostNode.h diff --git a/examples/Placeholders/Sample/PostNode.m b/examples_extra/Placeholders/Sample/PostNode.m similarity index 100% rename from examples/Placeholders/Sample/PostNode.m rename to examples_extra/Placeholders/Sample/PostNode.m diff --git a/examples/Placeholders/Sample/SlowpokeImageNode.h b/examples_extra/Placeholders/Sample/SlowpokeImageNode.h similarity index 100% rename from examples/Placeholders/Sample/SlowpokeImageNode.h rename to examples_extra/Placeholders/Sample/SlowpokeImageNode.h diff --git a/examples/Placeholders/Sample/SlowpokeImageNode.m b/examples_extra/Placeholders/Sample/SlowpokeImageNode.m similarity index 100% rename from examples/Placeholders/Sample/SlowpokeImageNode.m rename to examples_extra/Placeholders/Sample/SlowpokeImageNode.m diff --git a/examples/Placeholders/Sample/SlowpokeShareNode.h b/examples_extra/Placeholders/Sample/SlowpokeShareNode.h similarity index 100% rename from examples/Placeholders/Sample/SlowpokeShareNode.h rename to examples_extra/Placeholders/Sample/SlowpokeShareNode.h diff --git a/examples/Placeholders/Sample/SlowpokeShareNode.m b/examples_extra/Placeholders/Sample/SlowpokeShareNode.m similarity index 100% rename from examples/Placeholders/Sample/SlowpokeShareNode.m rename to examples_extra/Placeholders/Sample/SlowpokeShareNode.m diff --git a/examples/Placeholders/Sample/SlowpokeTextNode.h b/examples_extra/Placeholders/Sample/SlowpokeTextNode.h similarity index 100% rename from examples/Placeholders/Sample/SlowpokeTextNode.h rename to examples_extra/Placeholders/Sample/SlowpokeTextNode.h diff --git a/examples/Placeholders/Sample/SlowpokeTextNode.m b/examples_extra/Placeholders/Sample/SlowpokeTextNode.m similarity index 100% rename from examples/Placeholders/Sample/SlowpokeTextNode.m rename to examples_extra/Placeholders/Sample/SlowpokeTextNode.m diff --git a/examples/Placeholders/Sample/ViewController.h b/examples_extra/Placeholders/Sample/ViewController.h similarity index 100% rename from examples/Placeholders/Sample/ViewController.h rename to examples_extra/Placeholders/Sample/ViewController.h diff --git a/examples/Placeholders/Sample/ViewController.m b/examples_extra/Placeholders/Sample/ViewController.m similarity index 100% rename from examples/Placeholders/Sample/ViewController.m rename to examples_extra/Placeholders/Sample/ViewController.m diff --git a/examples/Placeholders/Sample/logo.png b/examples_extra/Placeholders/Sample/logo.png similarity index 100% rename from examples/Placeholders/Sample/logo.png rename to examples_extra/Placeholders/Sample/logo.png diff --git a/examples/Placeholders/Sample/main.m b/examples_extra/Placeholders/Sample/main.m similarity index 100% rename from examples/Placeholders/Sample/main.m rename to examples_extra/Placeholders/Sample/main.m From 9c5b2fcb1888a4375c2a18929b713f25ca925de7 Mon Sep 17 00:00:00 2001 From: Scott Goodson Date: Tue, 17 May 2016 11:01:09 -0700 Subject: [PATCH 4/4] [Cocoapods] Update podspec to version 1.9.74. --- AsyncDisplayKit.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AsyncDisplayKit.podspec b/AsyncDisplayKit.podspec index de6cfeff..9a9d0f5e 100644 --- a/AsyncDisplayKit.podspec +++ b/AsyncDisplayKit.podspec @@ -1,11 +1,11 @@ Pod::Spec.new do |spec| spec.name = 'AsyncDisplayKit' - spec.version = '1.9.73' + spec.version = '1.9.74' 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.73' } + spec.source = { :git => 'https://github.com/facebook/AsyncDisplayKit.git', :tag => '1.9.74' } spec.documentation_url = 'http://asyncdisplaykit.org/appledoc/'