Fix importing via spm (#69)

* Fix SPM

* Update README.md

* Use @_exported to remove duplicate imports

Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         ])
     ],
     targets: [
-        .target(name: "DarkModeCore"),
+        .target(name: "DarkModeCore", cSettings: [.define("SWIFT_PACKAGE")]),
         .target(name: "FluentDarkModeKit", dependencies: ["DarkModeCore"]),
         .testTarget(name: "FluentDarkModeKitTests", dependencies: ["FluentDarkModeKit"]),
     ]

README.md

@@ -38,6 +38,12 @@ github "microsoft/FluentDarkModeKit"
 
 Click "Files -> Swift Package Manager -> Add Package Dependency..." in Xcode's menu and search "https://github.com/microsoft/FluentDarkModeKit"
 
+Since Xcode uses its own tools to handle swifft packages, git-lfs might not be picked up if it is installed via Homebrew. Run the following command to create a symbolic link if Xcode fails to fetch the package:
+
+```
+ln -s /usr/local/bin/git-lfs $(xcode-select -p)/usr/bin/git-lfs
+```
+
 ### CocoaPods
 
 To integrate FluentDarkModeKit into your Xcode project using CocoaPods, specify it in your `Podfile`:

Sources/DarkModeCore/UIColor+DarkModeKit.h

@@ -4,7 +4,11 @@
 //
 
 #import <UIKit/UIKit.h>
+#ifdef SWIFT_PACKAGE
+#import "DMNamespace.h"
+#else
 #import <FluentDarkModeKit/DMNamespace.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 

Sources/DarkModeCore/UIImage+DarkModeKit.h

@@ -4,7 +4,11 @@
 //
 
 #import <UIKit/UIKit.h>
+#ifdef SWIFT_PACKAGE
+#import "DMNamespace.h"
+#else
 #import <FluentDarkModeKit/DMNamespace.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 

Sources/DarkModeCore/include/DarkModeCore.h

@@ -1,4 +1,12 @@
+#ifndef SWIFT_PACKAGE
+#define SWIFT_PACKAGE
+#endif
+
 #import "../DMDynamicColor.h"
 #import "../DMDynamicImage.h"
+#import "../DMNamespace.h"
 #import "../DMTraitCollection.h"
 #import "../NSObject+DarkModeKit.h"
+#import "../UIColor+DarkModeKit.h"
+#import "../UIImage+DarkModeKit.h"
+#import "../UIView+DarkModeKit.h"

Sources/FluentDarkModeKit/DarkModeManager.swift

@@ -4,6 +4,9 @@
 //
 
 import UIKit
+#if SWIFT_PACKAGE
+@_exported import DarkModeCore
+#endif
 
 public final class DarkModeManager: NSObject {
   public static func setup() {

Sources/FluentDarkModeKit/Extensions/UIApplication+DarkModeKit.swift

@@ -3,8 +3,6 @@
 //  Licensed under the MIT License.
 //
 
-import UIKit
-
 extension UIApplication: DMTraitEnvironment {
   open func dmTraitCollectionDidChange(_ previousTraitCollection: DMTraitCollection?) {
     windows.forEach { $0.dmTraitCollectionDidChange(previousTraitCollection) }

Sources/FluentDarkModeKit/Extensions/UIButton+DarkModeKit.swift

@@ -3,10 +3,6 @@
 //  Licensed under the MIT License.
 //
 
-#if SWIFT_PACKAGE
-import DarkModeCore
-#endif
-
 extension UIButton {
   override func dm_updateDynamicColors() {
     super.dm_updateDynamicColors()

Sources/FluentDarkModeKit/Extensions/UIImageView+DarkModeKit.swift

@@ -3,10 +3,6 @@
 //  Licensed under the MIT License.
 //
 
-#if SWIFT_PACKAGE
-import DarkModeCore
-#endif
-
 extension UIImageView {
 
   private struct Constants {

Sources/FluentDarkModeKit/Extensions/UILabel+DarkModeKit.swift

@@ -3,10 +3,6 @@
 //  Licensed under the MIT License.
 //
 
-#if SWIFT_PACKAGE
-import DarkModeCore
-#endif
-
 extension UILabel {
   private enum Constants {
     static var currentThemeKey = "currentThemeKey"

Sources/FluentDarkModeKit/Extensions/UINavigationBar+DarkModeKit.swift

@@ -3,10 +3,6 @@
 //  Licensed under the MIT License.
 //
 
-#if SWIFT_PACKAGE
-import DarkModeCore
-#endif
-
 extension UINavigationBar {
   override func dm_updateDynamicColors() {
     super.dm_updateDynamicColors()

Sources/FluentDarkModeKit/Extensions/UIPageControl+DarkModeKit.swift

@@ -3,10 +3,6 @@
 //  Licensed under the MIT License.
 //
 
-#if SWIFT_PACKAGE
-import DarkModeCore
-#endif
-
 extension UIPageControl {
   override func dm_updateDynamicColors() {
     super.dm_updateDynamicColors()

Sources/FluentDarkModeKit/Extensions/UIProgressView+DarkModeKit.swift

@@ -3,10 +3,6 @@
 //  Licensed under the MIT License.
 //
 
-#if SWIFT_PACKAGE
-import DarkModeCore
-#endif
-
 extension UIProgressView {
   override func dm_updateDynamicColors() {
     super.dm_updateDynamicColors()

Sources/FluentDarkModeKit/Extensions/UIScrollView+DarkModeKit.swift

@@ -3,10 +3,6 @@
 //  Licensed under the MIT License.
 //
 
-#if SWIFT_PACKAGE
-import DarkModeCore
-#endif
-
 extension UIScrollView {
   override func dm_updateDynamicColors() {
     super.dm_updateDynamicColors()

Sources/FluentDarkModeKit/Extensions/UISlider+DarkModeKit.swift

@@ -3,10 +3,6 @@
 //  Licensed under the MIT License.
 //
 
-#if SWIFT_PACKAGE
-import DarkModeCore
-#endif
-
 extension UISlider {
   override func dm_updateDynamicColors() {
     super.dm_updateDynamicColors()

Sources/FluentDarkModeKit/Extensions/UITabBar+DarkModeKit.swift

@@ -3,10 +3,6 @@
 //  Licensed under the MIT License.
 //
 
-#if SWIFT_PACKAGE
-import DarkModeCore
-#endif
-
 extension UITabBar {
   override open func dmTraitCollectionDidChange(_ previousTraitCollection: DMTraitCollection?) {
     super.dmTraitCollectionDidChange(previousTraitCollection)

Sources/FluentDarkModeKit/Extensions/UITableView+DarkModeKit.swift

@@ -3,10 +3,6 @@
 //  Licensed under the MIT License.
 //
 
-#if SWIFT_PACKAGE
-import DarkModeCore
-#endif
-
 extension UITableView {
   override func dm_updateDynamicColors() {
     super.dm_updateDynamicColors()

Sources/FluentDarkModeKit/Extensions/UITextField+DarkModeKit.swift

@@ -3,10 +3,6 @@
 //  Licensed under the MIT License.
 //
 
-#if SWIFT_PACKAGE
-import DarkModeCore
-#endif
-
 extension UITextField {
   override func dm_updateDynamicColors() {
     super.dm_updateDynamicColors()

Sources/FluentDarkModeKit/Extensions/UITextView+DarkModeKit.swift

@@ -3,10 +3,6 @@
 //  Licensed under the MIT License.
 //
 
-#if SWIFT_PACKAGE
-import DarkModeCore
-#endif
-
 extension UITextView {
   override func dm_updateDynamicColors() {
     super.dm_updateDynamicColors()

Sources/FluentDarkModeKit/Extensions/UIToolbar+DarkModeKit.swift

@@ -3,10 +3,6 @@
 //  Licensed under the MIT License.
 //
 
-#if SWIFT_PACKAGE
-import DarkModeCore
-#endif
-
 extension UIToolbar {
   override func dm_updateDynamicColors() {
     super.dm_updateDynamicColors()

Sources/FluentDarkModeKit/Extensions/UIView+DarkModeKit.swift

@@ -3,10 +3,6 @@
 //  Licensed under the MIT License.
 //
 
-#if SWIFT_PACKAGE
-import DarkModeCore
-#endif
-
 extension UIView: DMTraitEnvironment {
   open func dmTraitCollectionDidChange(_ previousTraitCollection: DMTraitCollection?) {
     subviews.forEach { $0.dmTraitCollectionDidChange(previousTraitCollection) }

Sources/FluentDarkModeKit/Extensions/UIViewController+DarkModeKit.swift

@@ -3,10 +3,6 @@
 //  Licensed under the MIT License.
 //
 
-#if SWIFT_PACKAGE
-import DarkModeCore
-#endif
-
 extension UIViewController: DMTraitEnvironment {
   open func dmTraitCollectionDidChange(_ previousTraitCollection: DMTraitCollection?) {
     setNeedsStatusBarAppearanceUpdate()

Sources/FluentDarkModeKit/Extensions/UIWindow+DarkModeKit.swift

@@ -3,8 +3,6 @@
 //  Licensed under the MIT License.
 //
 
-import UIKit
-
 extension UIWindow {
   override open func dmTraitCollectionDidChange(_ previousTraitCollection: DMTraitCollection?) {
     super.dmTraitCollectionDidChange(previousTraitCollection)