Merge branch 'release-1.7.8'

Cocoanetics · Oct 7, 2015 · 21eb993 · 21eb993
2 parents aa90b13 + 412ca81
commit 21eb993
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/Core/Source/iOS/BlocksAdditions/DTActionSheet.h b/Core/Source/iOS/BlocksAdditions/DTActionSheet.h
@@ -14,7 +14,7 @@ typedef void (^DTActionSheetBlock)(void);
 /**
  Extends UIActionSheet with support for blocks.
  */
-#if !TARGET_OS_TV
+#if !TARGET_OS_TV && __IPHONE_OS_VERSION_MAX_ALLOWED < 80300
 @interface DTActionSheet : UIActionSheet
 
 /**

diff --git a/Core/Source/iOS/BlocksAdditions/DTActionSheet.m b/Core/Source/iOS/BlocksAdditions/DTActionSheet.m
@@ -11,7 +11,7 @@
 
 #import "DTLog.h"
 
-#if !TARGET_OS_TV
+#if !TARGET_OS_TV && __IPHONE_OS_VERSION_MAX_ALLOWED < 80300
 
 @interface DTActionSheet () <UIActionSheetDelegate>
 

diff --git a/Core/Source/iOS/BlocksAdditions/DTAlertView.h b/Core/Source/iOS/BlocksAdditions/DTAlertView.h
@@ -8,7 +8,7 @@
 
 #import "DTWeakSupport.h"
 
-#if !TARGET_OS_TV
+#if !TARGET_OS_TV && __IPHONE_OS_VERSION_MAX_ALLOWED < 90000
 // the block to execute when an alert button is tapped
 typedef void (^DTAlertViewBlock)(void);
 

diff --git a/Core/Source/iOS/BlocksAdditions/DTAlertView.m b/Core/Source/iOS/BlocksAdditions/DTAlertView.m
@@ -8,7 +8,8 @@
 
 #import "DTAlertView.h"
 #import "DTLog.h"
-#if !TARGET_OS_TV
+
+#if !TARGET_OS_TV  && __IPHONE_OS_VERSION_MAX_ALLOWED < 90000
 @interface DTAlertView() <UIAlertViewDelegate>
 
 @end