Skip to content

Do not compile UIKit code for watchOS #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisballinger merged 1 commit into from
Mar 19, 2020
Merged

Do not compile UIKit code for watchOS #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/UIKit/AdaptableTextContainer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Sources/UIKit/AdaptiveStyle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Sources/UIKit/AdaptiveStyleTransformation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//

#if canImport(UIKit)
#if canImport(UIKit) && !os(watchOS)
import UIKit

/// Defines a style transformation that is dependent on a `UITraitCollection`.
Expand Down
2 changes: 1 addition & 1 deletion Sources/UIKit/EmbeddedTransformation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Sources/UIKit/NSAttributedString+Adaptive.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//

#if canImport(UIKit)
#if canImport(UIKit) && !os(watchOS)
import UIKit

extension NSAttributedString {
Expand Down
2 changes: 1 addition & 1 deletion Sources/UIKit/StyleableUIElement.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Copyright © 2016 Rightpoint. All rights reserved.
//

#if canImport(UIKit)
#if canImport(UIKit) && !os(watchOS)
import UIKit

extension UILabel {
Expand Down
2 changes: 1 addition & 1 deletion Sources/UIKit/Tab+Adaptive.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions Sources/UIKit/TextAlignmentConstraint.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
// Copyright © 2016 Rightpoint. All rights reserved.
//

#if !os(watchOS)

#if os(OSX)
import AppKit
#else
Expand Down Expand Up @@ -238,3 +240,5 @@ private extension String {
}

}

#endif
2 changes: 1 addition & 1 deletion Sources/UIKit/Tracking+Adaptive.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Copyright © 2016 Rightpoint. All rights reserved.
//

#if canImport(UIKit)
#if canImport(UIKit) && !os(watchOS)
import UIKit

extension Tracking: AdaptiveStyleTransformation {
Expand Down
2 changes: 1 addition & 1 deletion Sources/UIKit/UIKit+AdaptableTextContainerSupport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Copyright © 2016 Rightpoint. All rights reserved.
//

#if canImport(UIKit)
#if canImport(UIKit) && !os(watchOS)
import UIKit

extension UIApplication {
Expand Down
2 changes: 1 addition & 1 deletion Sources/UIKit/UIKit+Helpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//

#if canImport(UIKit)
#if canImport(UIKit) && !os(watchOS)
import UIKit

// UIKit helpers for iOS and tvOS
Expand Down