From 2e5869172a60a064577c9ec2562d111028dec251 Mon Sep 17 00:00:00 2001 From: Jim Boyd Date: Tue, 2 Mar 2021 17:24:47 -0700 Subject: [PATCH 1/2] Exclude the info.plist file generated by the swift package project. --- Package.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 41a8894..a64781b 100644 --- a/Package.swift +++ b/Package.swift @@ -20,7 +20,8 @@ let package = Package( targets: [ .target( name: "Theme", - dependencies: ["Signals"]), + dependencies: ["Signals"], + exclude: ["Info.plist"]), .testTarget( name: "ThemeTests", dependencies: ["Theme"]), From 5f3487a6377aad55dd8fd9d306add9aaadbd5deb Mon Sep 17 00:00:00 2001 From: Jim Boyd Date: Wed, 3 Mar 2021 14:28:44 -0700 Subject: [PATCH 2/2] Support a macOS target. --- Package.swift | 3 ++- Sources/Theme/ThemeObserver.swift | 2 ++ Sources/Theme/UIColor.swift | 2 ++ Sources/Theme/UIView.swift | 2 ++ Sources/Theme/UIViewController.swift | 2 ++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index a64781b..e0ebdcf 100644 --- a/Package.swift +++ b/Package.swift @@ -7,7 +7,8 @@ let package = Package( name: "Theme", platforms: [ .iOS(.v9), - .tvOS(.v10) + .tvOS(.v10), + .macOS(.v10_13), ], products: [ // Products define the executables and libraries a package produces, and make them visible to other packages. diff --git a/Sources/Theme/ThemeObserver.swift b/Sources/Theme/ThemeObserver.swift index d97e3f1..810f5de 100644 --- a/Sources/Theme/ThemeObserver.swift +++ b/Sources/Theme/ThemeObserver.swift @@ -20,6 +20,7 @@ // THE SOFTWARE. // +#if canImport(UIKit) import UIKit public protocol ThemeObserver {} @@ -37,3 +38,4 @@ extension ThemeObserver where Self: UIViewController { callback() } } +#endif diff --git a/Sources/Theme/UIColor.swift b/Sources/Theme/UIColor.swift index 017d628..fc30179 100644 --- a/Sources/Theme/UIColor.swift +++ b/Sources/Theme/UIColor.swift @@ -20,6 +20,7 @@ // THE SOFTWARE. // +#if canImport(UIKit) import UIKit public extension UIColor { @@ -102,3 +103,4 @@ public extension UIColor { return nil } } +#endif diff --git a/Sources/Theme/UIView.swift b/Sources/Theme/UIView.swift index 4c72699..3c2e99a 100644 --- a/Sources/Theme/UIView.swift +++ b/Sources/Theme/UIView.swift @@ -20,8 +20,10 @@ // THE SOFTWARE. // +#if canImport(UIKit) import UIKit extension UIView: ThemeObserver { } +#endif diff --git a/Sources/Theme/UIViewController.swift b/Sources/Theme/UIViewController.swift index c746daa..6a7c080 100644 --- a/Sources/Theme/UIViewController.swift +++ b/Sources/Theme/UIViewController.swift @@ -20,8 +20,10 @@ // THE SOFTWARE. // +#if canImport(UIKit) import UIKit extension UIViewController: ThemeObserver { } +#endif