Merge pull request #388 from Rightpoint/bugfix/spm-watchos

Do not compile UIKit code for watchOS
Rightpoint · Mar 19, 2020 · 921bfb2 · 921bfb2
2 parents d949391 + cf89815
commit 921bfb2
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 10 deletions.
diff --git a/Sources/UIKit/AdaptableTextContainer.swift b/Sources/UIKit/AdaptableTextContainer.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Rightpoint. All rights reserved.
 //
 
-#if canImport(UIKit)
+#if canImport(UIKit) && !os(watchOS)
 import UIKit
 
 /// A protocol to update the text style contained by the object. This can be

diff --git a/Sources/UIKit/AdaptiveStyle.swift b/Sources/UIKit/AdaptiveStyle.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Rightpoint. All rights reserved.
 //
 
-#if canImport(UIKit)
+#if canImport(UIKit) && !os(watchOS)
 import UIKit
 
 /// A few default font scaling behaviors.

diff --git a/Sources/UIKit/AdaptiveStyleTransformation.swift b/Sources/UIKit/AdaptiveStyleTransformation.swift
@@ -6,7 +6,7 @@
 //
 //
 
-#if canImport(UIKit)
+#if canImport(UIKit) && !os(watchOS)
 import UIKit
 
 /// Defines a style transformation that is dependent on a `UITraitCollection`.

diff --git a/Sources/UIKit/EmbeddedTransformation.swift b/Sources/UIKit/EmbeddedTransformation.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Rightpoint. All rights reserved.
 //
 
-#if canImport(UIKit)
+#if canImport(UIKit) && !os(watchOS)
 import UIKit
 
 /// BonMot embeds transformation objects inside `NSAttributedString` attributes

diff --git a/Sources/UIKit/NSAttributedString+Adaptive.swift b/Sources/UIKit/NSAttributedString+Adaptive.swift
@@ -6,7 +6,7 @@
 //
 //
 
-#if canImport(UIKit)
+#if canImport(UIKit) && !os(watchOS)
 import UIKit
 
 extension NSAttributedString {

diff --git a/Sources/UIKit/StyleableUIElement.swift b/Sources/UIKit/StyleableUIElement.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Rightpoint. All rights reserved.
 //
 
-#if canImport(UIKit)
+#if canImport(UIKit) && !os(watchOS)
 import UIKit
 
 extension UILabel {

diff --git a/Sources/UIKit/Tab+Adaptive.swift b/Sources/UIKit/Tab+Adaptive.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Rightpoint. All rights reserved.
 //
 
-#if canImport(UIKit)
+#if canImport(UIKit) && !os(watchOS)
 import UIKit
 
 // Just declare conformance. Implementation is already defined and used even

diff --git a/Sources/UIKit/TextAlignmentConstraint.swift b/Sources/UIKit/TextAlignmentConstraint.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2016 Rightpoint. All rights reserved.
 //
 
+#if !os(watchOS)
+
 #if os(OSX)
     import AppKit
 #else
@@ -238,3 +240,5 @@ private extension String {
     }
 
 }
+
+#endif
diff --git a/Sources/UIKit/Tracking+Adaptive.swift b/Sources/UIKit/Tracking+Adaptive.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Rightpoint. All rights reserved.
 //
 
-#if canImport(UIKit)
+#if canImport(UIKit) && !os(watchOS)
 import UIKit
 
 extension Tracking: AdaptiveStyleTransformation {

diff --git a/Sources/UIKit/UIKit+AdaptableTextContainerSupport.swift b/Sources/UIKit/UIKit+AdaptableTextContainerSupport.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Rightpoint. All rights reserved.
 //
 
-#if canImport(UIKit)
+#if canImport(UIKit) && !os(watchOS)
 import UIKit
 
 extension UIApplication {

diff --git a/Sources/UIKit/UIKit+Helpers.swift b/Sources/UIKit/UIKit+Helpers.swift
@@ -6,7 +6,7 @@
 //
 //
 
-#if canImport(UIKit)
+#if canImport(UIKit) && !os(watchOS)
 import UIKit
 
 // UIKit helpers for iOS and tvOS