Merge branch 'release-1.6.25'

odrobnik · odrobnik · commit dcb893de2a8c · 2020-10-09T09:10:23.000+02:00
diff --git a/Core/Source/DTAccessibilityElement.h b/Core/Source/DTAccessibilityElement.h
@@ -8,7 +8,7 @@
 
 #import "DTCompatibility.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 #import <UIKit/UIKit.h>
 
diff --git a/Core/Source/DTAccessibilityElement.m b/Core/Source/DTAccessibilityElement.m
@@ -8,7 +8,7 @@
 
 #import "DTAccessibilityElement.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 static const CGPoint DTAccessibilityElementNullActivationPoint = {CGFLOAT_MAX, CGFLOAT_MAX};
 
diff --git a/Core/Source/DTAccessibilityViewProxy.h b/Core/Source/DTAccessibilityViewProxy.h
@@ -9,7 +9,7 @@
 #import "DTCompatibility.h"
 #import "DTAccessibilityElement.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 #import "DTTextAttachment.h"
 
diff --git a/Core/Source/DTAccessibilityViewProxy.m b/Core/Source/DTAccessibilityViewProxy.m
@@ -8,7 +8,7 @@
 
 #import "DTAccessibilityViewProxy.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 @implementation DTAccessibilityViewProxy
 
diff --git a/Core/Source/DTAttributedLabel.h b/Core/Source/DTAttributedLabel.h
@@ -8,7 +8,7 @@
 
 #import "DTCompatibility.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 #import "DTAttributedTextContentView.h"
 
diff --git a/Core/Source/DTAttributedLabel.m b/Core/Source/DTAttributedLabel.m
@@ -8,7 +8,7 @@
 
 #import "DTAttributedLabel.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 #import "DTCoreTextLayoutFrame.h"
 #import <QuartzCore/QuartzCore.h>
diff --git a/Core/Source/DTAttributedTextCell.h b/Core/Source/DTAttributedTextCell.h
@@ -8,7 +8,7 @@
 
 #import "DTCompatibility.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 #import <UIKit/UIKit.h>
 
diff --git a/Core/Source/DTAttributedTextCell.m b/Core/Source/DTAttributedTextCell.m
@@ -10,7 +10,7 @@
 
 #import "DTAttributedTextCell.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 #import "DTCoreText.h"
 #import "DTCSSStylesheet.h"
diff --git a/Core/Source/DTAttributedTextContentView.h b/Core/Source/DTAttributedTextContentView.h
@@ -8,7 +8,7 @@
 
 #import "DTCompatibility.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 #import "DTCoreTextLayoutFrame.h"
 #import <DTFoundation/DTWeakSupport.h>
diff --git a/Core/Source/DTAttributedTextContentView.m b/Core/Source/DTAttributedTextContentView.m
@@ -8,7 +8,7 @@
 
 #import "DTAttributedTextContentView.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 #import <QuartzCore/QuartzCore.h>
 
diff --git a/Core/Source/DTAttributedTextView.h b/Core/Source/DTAttributedTextView.h
@@ -8,7 +8,7 @@
 
 #import "DTCompatibility.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 #import <UIKit/UIKit.h>
 
diff --git a/Core/Source/DTAttributedTextView.m b/Core/Source/DTAttributedTextView.m
@@ -8,7 +8,7 @@
 
 #import "DTAttributedTextView.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 #import <QuartzCore/QuartzCore.h>
 
diff --git a/Core/Source/DTCoreTextLayoutFrame.h b/Core/Source/DTCoreTextLayoutFrame.h
@@ -9,8 +9,10 @@
 #import "DTCompatibility.h"
 #import "DTCoreTextConstants.h"
 
-#if TARGET_OS_IPHONE
+
 #import <CoreText/CoreText.h>
+
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 #import <UIKit/UIKit.h>
 #endif
 
diff --git a/Core/Source/DTCoreTextLayoutFrame.m b/Core/Source/DTCoreTextLayoutFrame.m
@@ -1174,7 +1174,7 @@ - (void)_setShadowInContext:(CGContextRef)context fromDictionary:(NSDictionary *
 	
 	CGFloat scaleFactor = 1.0;
 	
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 	if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)])
 	{
 		scaleFactor = [[UIScreen mainScreen] scale];
diff --git a/Core/Source/DTCoreTextLayoutFrameAccessibilityElementGenerator.h b/Core/Source/DTCoreTextLayoutFrameAccessibilityElementGenerator.h
@@ -8,7 +8,7 @@
 
 #import "DTCompatibility.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 #import "DTAccessibilityElement.h"
 
diff --git a/Core/Source/DTCoreTextLayoutFrameAccessibilityElementGenerator.m b/Core/Source/DTCoreTextLayoutFrameAccessibilityElementGenerator.m
@@ -8,7 +8,7 @@
 
 #import "DTCoreTextLayoutFrameAccessibilityElementGenerator.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 #import "DTCoreTextLayoutFrame.h"
 #import "DTCoreTextLayoutLine.h"
diff --git a/Core/Source/DTDictationPlaceholderView.h b/Core/Source/DTDictationPlaceholderView.h
@@ -8,7 +8,7 @@
 
 #import "DTCompatibility.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 #import <UIKit/UIKit.h>
 
diff --git a/Core/Source/DTDictationPlaceholderView.m b/Core/Source/DTDictationPlaceholderView.m
@@ -8,7 +8,7 @@
 
 #import "DTDictationPlaceholderView.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 // if you change any of these then also make sure to adjust the sizes in DTDictationPlaceholderTextAttachment
 #define DOT_WIDTH 10.0f
diff --git a/Core/Source/DTLazyImageView.h b/Core/Source/DTLazyImageView.h
@@ -8,7 +8,7 @@
 
 #import "DTCompatibility.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 #import <DTFoundation/DTWeakSupport.h>
 #import "DTAttributedTextContentView.h"
diff --git a/Core/Source/DTLazyImageView.m b/Core/Source/DTLazyImageView.m
@@ -8,7 +8,7 @@
 
 #import "DTLazyImageView.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 #import <ImageIO/ImageIO.h>
 
diff --git a/Core/Source/DTLinkButton.h b/Core/Source/DTLinkButton.h
@@ -8,7 +8,7 @@
 
 #import "DTCompatibility.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 #import <UIKit/UIKit.h>
 
 /**
diff --git a/Core/Source/DTLinkButton.m b/Core/Source/DTLinkButton.m
@@ -8,7 +8,7 @@
 
 #import "DTLinkButton.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 #import "DTCoreText.h"
 
diff --git a/DTCoreText.xcodeproj/xcshareddata/xcschemes/DTCoreText-Package.xcscheme b/DTCoreText.xcodeproj/xcshareddata/xcschemes/DTCoreText-Package.xcscheme

Original file line number	Diff line number	Diff line change
`@@ -1174,7 +1174,7 @@ - (void)_setShadowInContext:(CGContextRef)context fromDictionary:(NSDictionary *`
`1174`	`1174`
`1175`	`1175`	`CGFloat scaleFactor = 1.0;`
`1176`	`1176`
`1177`		`-#if TARGET_OS_IPHONE`
	`1177`	`+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH`
`1178`	`1178`	`if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)])`
`1179`	`1179`	`{`
`1180`	`1180`	`scaleFactor = [[UIScreen mainScreen] scale];`