Merge remote-tracking branch 'upstream/master'

Author: aaronschubert0

AsyncDisplayKit-iOS/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.facebook.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

AsyncDisplayKit.podspec

@@ -1,24 +1,31 @@
 Pod::Spec.new do |spec|
   spec.name         = 'AsyncDisplayKit'
-  spec.version      = '1.9.5'
+  spec.version      = '1.9.7'
   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.7' }
 
   spec.documentation_url = 'http://asyncdisplaykit.org/appledoc/'
 
   spec.public_header_files = [
       'AsyncDisplayKit/*.h',
       'AsyncDisplayKit/Details/**/*.h',
       'AsyncDisplayKit/Layout/*.h',
-      'Base/*.h'
+      'Base/*.h',
+      'AsyncDisplayKit/TextKit/ASTextNodeTypes.h'
   ]
 
   spec.source_files = [
       'AsyncDisplayKit/**/*.{h,m,mm}',
-      'Base/*.{h,m}'
+      'Base/*.{h,m}',
+      
+      # Most TextKit components are not public because the C++ content
+      # in the headers will cause build errors when using
+      # `use_frameworks!` on 0.39.0 & Swift 2.1.
+      # See https://github.com/facebook/AsyncDisplayKit/issues/1153
+      'AsyncDisplayKit/TextKit/*.h',
   ]
 
   spec.frameworks = 'AssetsLibrary'
@@ -30,6 +37,9 @@ Pod::Spec.new do |spec|
     'AsyncDisplayKit/Details/ASDealloc2MainObject.h',
     'AsyncDisplayKit/Details/ASDealloc2MainObject.m',
   ]
+  
+  #Subspecs
+  
   spec.subspec 'ASDealloc2MainObject' do |mrr|
     mrr.requires_arc = false
     mrr.source_files = [
@@ -38,6 +48,15 @@ Pod::Spec.new do |spec|
       'AsyncDisplayKit/Details/ASDealloc2MainObject.m',
     ]
   end
+  
+  spec.subspec 'PINRemoteImage' do |pin|
+      pin.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) PIN_REMOTE_IMAGE=1' }
+      pin.dependency 'PINRemoteImage/iOS', '>= 2'
+      pin.dependency 'AsyncDisplayKit/ASDealloc2MainObject'
+  end
+  
+  # Include optional FLAnimatedImage module
+  spec.default_subspec = 'PINRemoteImage'
 
   spec.social_media_url = 'https://twitter.com/fbOpenSource'
   spec.library = 'c++'
@@ -47,4 +66,6 @@ Pod::Spec.new do |spec|
   }
 
   spec.ios.deployment_target = '7.0'
+  # tvOS not recognized by older versions of Cocoapods - add this only after tvOS support complete.
+  # spec.tvos.deployment_target = '9.0'
 end

AsyncDisplayKit.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

AsyncDisplayKit.xcodeproj/xcshareddata/xcschemes/AsyncDisplayKit.xcscheme

@@ -11,8 +11,9 @@
 
 @interface ASButtonNode : ASControlNode
 
-@property (nonatomic, readonly) ASTextNode *titleNode;
-@property (nonatomic, readonly) ASImageNode *imageNode;
+@property (nonatomic, readonly) ASTextNode  * _Nonnull titleNode;
+@property (nonatomic, readonly) ASImageNode * _Nonnull imageNode;
+@property (nonatomic, readonly) ASImageNode * _Nonnull backgroundImageNode;
 
 /**
  Spacing between image and title. Defaults to 8.0.
@@ -36,11 +37,71 @@
  */
 @property (nonatomic, assign) ASVerticalAlignment contentVerticalAlignment;
 
+/**
+ * @discussion The insets used around the title and image node
+ */
+@property (nonatomic, assign) UIEdgeInsets contentEdgeInsets;
+
+/**
+ *  Returns the styled title associated with the specified state.
+ *
+ *  @param state The state that uses the styled title. The possible values are described in ASControlState.
+ *
+ *  @return The title for the specified state.
+ */
+- (NSAttributedString * _Nullable)attributedTitleForState:(ASControlState)state;
+
+/**
+ *  Sets the styled title to use for the specified state. This will reset styled title previously set with -setTitle:withFont:withColor:forState.
+ *
+ *  @param title The styled text string to use for the title.
+ *  @param state The state that uses the specified title. The possible values are described in ASControlState.
+ */
+- (void)setAttributedTitle:(nullable NSAttributedString *)title forState:(ASControlState)state;
+
+/**
+ *  Sets the title to use for the specified state. This will reset styled title previously set with -setAttributedTitle:forState.
+ *
+ *  @param title The styled text string to use for the title.
+ *  @param font The font to use for the title.
+ *  @param color The color to use for the title.
+ *  @param state The state that uses the specified title. The possible values are described in ASControlState.
+ */
+- (void)setTitle:(nonnull NSString *)title withFont:(nullable UIFont *)font withColor:(nullable UIColor *)color forState:(ASControlState)state;
+
+/**
+ *  Returns the image used for a button state.
+ *
+ *  @param state The state that uses the image. Possible values are described in ASControlState.
+ *
+ *  @return The image used for the specified state.
+ */
+- (UIImage * _Nullable)imageForState:(ASControlState)state;
+
+/**
+ *  Sets the image to use for the specified state.
+ *
+ *  @param image The image to use for the specified state.
+ *  @param state The state that uses the specified title. The values are described in ASControlState.
+ */
+- (void)setImage:(nullable UIImage *)image forState:(ASControlState)state;
+
+/**
+ *  Sets the background image to use for the specified state.
+ *
+ *  @param image The image to use for the specified state.
+ *  @param state The state that uses the specified title. The values are described in ASControlState.
+ */
+- (void)setBackgroundImage:(nullable UIImage *)image forState:(ASControlState)state;
 
-- (NSAttributedString *)attributedTitleForState:(ASControlState)state;
-- (void)setAttributedTitle:(NSAttributedString *)title forState:(ASControlState)state;
 
-- (UIImage *)imageForState:(ASControlState)state;
-- (void)setImage:(UIImage *)image forState:(ASControlState)state;
+/**
+ *  Returns the background image used for a button state.
+ *
+ *  @param state The state that uses the image. Possible values are described in ASControlState.
+ *
+ *  @return The background image used for the specified state.
+ */
+- (UIImage * _Nullable)backgroundImageForState:(ASControlState)state;
 
 @end