Made UIKit-dependent classes available where able to import UIKit

rwbutler · rwbutler · commit 947e224b38bc · 2023-02-03T13:44:55.000Z
diff --git a/.gitignore b/.gitignore
@@ -26,7 +26,7 @@ DerivedData
 .swiftpm
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
 # Carthage/Checkouts
-
+*.icloud
 *.svg
 Carthage/Build
 docs/images/*.pdf
diff --git a/FeatureFlags/Classes/Extensions/UIColorAdditions.swift b/FeatureFlags/Classes/Extensions/UIColorAdditions.swift
@@ -5,9 +5,12 @@
 //  Created by Ross Butler on 11/21/18.
 //
 
+#if canImport(UIKit)
 import Foundation
+import UIKit
 
 extension UIColor {
     static let featureFlagsGreen =  UIColor(red: 63.0/255.0, green: 134.0/255.0, blue: 80.0/255.0, alpha: 1.0)
     static let featureFlagsRed = UIColor(red: 189.0/255.0, green: 50.0/255.0, blue: 80.0/255.0, alpha: 1.0)
 }
+#endif
diff --git a/FeatureFlags/Classes/UI/Details/View Controller/FeatureDetailsViewController.swift b/FeatureFlags/Classes/UI/Details/View Controller/FeatureDetailsViewController.swift
@@ -5,6 +5,7 @@
 //  Created by Ross Butler on 10/23/18.
 //
 
+#if canImport(UIKit)
 import Foundation
 import UIKit
 
@@ -171,3 +172,4 @@ private extension FeatureDetailsViewController {
         }
     }
 }
+#endif
diff --git a/FeatureFlags/Classes/UI/Feature Flags/View Controller/FeatureFlagsViewController+UIViewControllerPreviewingDelegate.swift b/FeatureFlags/Classes/UI/Feature Flags/View Controller/FeatureFlagsViewController+UIViewControllerPreviewingDelegate.swift
@@ -5,7 +5,9 @@
 //  Created by Ross Butler on 23/12/2019.
 //
 
+#if canImport(UIKit)
 import Foundation
+import UIKit
 
 extension FeatureFlagsViewController: UIViewControllerPreviewingDelegate {
     
@@ -30,3 +32,4 @@ extension FeatureFlagsViewController: UIViewControllerPreviewingDelegate {
     }
     
 }
+#endif
diff --git a/FeatureFlags/Classes/UI/Feature Flags/View Controller/FeatureFlagsViewController.swift b/FeatureFlags/Classes/UI/Feature Flags/View Controller/FeatureFlagsViewController.swift
@@ -5,6 +5,7 @@
 //  Created by Ross Butler on 10/19/18.
 //
 
+#if canImport(UIKit)
 import Foundation
 import UIKit
 
@@ -383,3 +384,4 @@ private extension FeatureFlagsViewController {
     }
     
 }
+#endif
diff --git a/FeatureFlags/Classes/UI/Feature Flags/View Controller/NavigationSettings.swift b/FeatureFlags/Classes/UI/Feature Flags/View Controller/NavigationSettings.swift
@@ -5,11 +5,12 @@
 //  Created by Ross Butler on 10/30/18.
 //
 
+#if canImport(UIKit)
 import Foundation
 import UIKit
 
 @objc public class ViewControllerNavigationSettings: NSObject {
-
+    
     let actionButton: UIBarButtonItem.SystemItem
     let animated: Bool
     let autoClose: Bool
@@ -36,5 +37,6 @@ import UIKit
         self.isNavigationBarHidden = isNavigationBarHidden
         self.shouldRefresh = shouldRefresh
     }
-
+    
 }
+#endif
diff --git a/FeatureFlags/Classes/UI/Feature Flags/View Model/FeatureFlagsViewModel.swift b/FeatureFlags/Classes/UI/Feature Flags/View Model/FeatureFlagsViewModel.swift
@@ -5,6 +5,7 @@
 //  Created by Ross Butler on 23/12/2019.
 //
 
+#if canImport(UIKit)
 import Foundation
 
 class FeatureFlagsViewModel {
@@ -123,3 +124,4 @@ class FeatureFlagsViewModel {
     }
     
 }
+#endif
diff --git a/FeatureFlags/Classes/UI/Feature Flags/Views/FeatureFlagTableViewCell.swift b/FeatureFlags/Classes/UI/Feature Flags/Views/FeatureFlagTableViewCell.swift
@@ -5,7 +5,9 @@
 //  Created by Ross Butler on 10/19/18.
 //
 
+#if canImport(UIKit)
 import Foundation
+import UIKit
 
 class FeatureFlagTableViewCell: UITableViewCell {
     @IBOutlet weak var featureName: UILabel!
@@ -17,3 +19,4 @@ class FeatureFlagTableViewCell: UITableViewCell {
     @IBOutlet weak var iconView: UIImageView!
     @IBOutlet weak var bottomMargin: NSLayoutConstraint!
 }
+#endif
diff --git a/FeatureFlags/Classes/UI/FeatureFlagsUI.swift b/FeatureFlags/Classes/UI/FeatureFlagsUI.swift
@@ -5,7 +5,9 @@
 //  Created by Ross Butler on 11/27/18.
 //
 
+#if canImport(UIKit)
 import Foundation
+import UIKit
 
 public struct FeatureFlagsUI {
     
@@ -107,3 +109,4 @@ public struct FeatureFlagsUI {
     }
     
 }
+#endif
diff --git a/FeatureFlags/Classes/UI/FeatureFlagsUIObserver.swift b/FeatureFlags/Classes/UI/FeatureFlagsUIObserver.swift
@@ -5,7 +5,9 @@
 //  Created by Ross Butler on 12/5/18.
 //
 
+#if canImport(UIKit)
 import Foundation
+import UIKit
 
 @objc class FeatureFlagsUIObserver: NSObject {
     
@@ -16,3 +18,4 @@ import Foundation
     }
 
 }
+#endif
diff --git a/FeatureFlags/Classes/UI/Picker/View Controller/PickerViewController.swift b/FeatureFlags/Classes/UI/Picker/View Controller/PickerViewController.swift
@@ -5,34 +5,35 @@
 //  Created by Ross Butler on 10/23/18.
 //
 
+#if canImport(UIKit)
 import Foundation
 import UIKit
 
 class PickerViewController<PickerOption: Equatable & CustomStringConvertible>:
-UIViewController, UIPickerViewDataSource, UIPickerViewDelegate, UITableViewDataSource {
-
+    UIViewController, UIPickerViewDataSource, UIPickerViewDelegate, UITableViewDataSource {
+    
     // MARK: Type definitions
     typealias PickerItemTapped = (PickerOption) -> Void
-
+    
     // MARK: Outlets
     @IBOutlet weak var tableView: UITableView!
     @IBOutlet weak var closeOverlay: UIControl!
-
+    
     // MARK: State
     public var selection: PickerItemTapped? // Callback
     private var selectedItem: PickerOption?
     public var viewModel: [String: PickerOptionsViewModel<PickerOption>]?
-
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         tableView.isScrollEnabled = false
     }
-
+    
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         setSelectedRows()
     }
-
+    
     @IBAction func dismiss() {
         guard selectedItem == nil else {
             self.dismiss(animated: false, completion: nil)
@@ -44,7 +45,7 @@ UIViewController, UIPickerViewDataSource, UIPickerViewDelegate, UITableViewDataS
         }
         self.dismiss(animated: false, completion: nil)
     }
-
+    
     private func setSelectedRows() {
         guard let sectionTitles = viewModel?.keys.compactMap({ $0 }) else {
             return
@@ -53,39 +54,39 @@ UIViewController, UIPickerViewDataSource, UIPickerViewDelegate, UITableViewDataS
         let sectionViewModels = sectionTitles.compactMap({ return viewModel?[$0] })
         for sectionViewModel in sectionViewModels {
             for i in 0..<sectionViewModel.pickerOptions.count where
-                sectionViewModel.pickerOptions[i] == sectionViewModel.pickerOptions[sectionViewModel.selectedIndex] {
-                    let cell = tableView.cellForRow(at:
-                        IndexPath(row: 0, section: sectionCounter)) // Currently 1 row per section
-                    let pickerTagOffset = sectionCounter
-                    if let pickerView = cell?.viewWithTag(pickerTagOffset) as? UIPickerView {
-                        pickerView.selectRow(i, inComponent: 0, animated: false)
-                    }
-                    break
+            sectionViewModel.pickerOptions[i] == sectionViewModel.pickerOptions[sectionViewModel.selectedIndex] {
+                let cell = tableView.cellForRow(at:
+                                                    IndexPath(row: 0, section: sectionCounter)) // Currently 1 row per section
+                let pickerTagOffset = sectionCounter
+                if let pickerView = cell?.viewWithTag(pickerTagOffset) as? UIPickerView {
+                    pickerView.selectRow(i, inComponent: 0, animated: false)
+                }
+                break
             }
             sectionCounter += 1
         }
     }
-
+    
     // MARK: UIPickerViewDataSource
     @objc func numberOfComponents(in pickerView: UIPickerView) -> Int {
         return 1
     }
-
+    
     @objc func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
         let sectionKeys = viewModel?.keys.compactMap({ $0 }) ?? []
         let sectionKey = sectionKeys[pickerView.tag]
         let options = viewModel?[sectionKey]
         return options?.pickerOptions.count ?? 0
     }
-
+    
     // MARK: UIPickerViewDelegate
     @objc func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
         let sectionKeys = viewModel?.keys.compactMap({ $0 }) ?? []
         let sectionKey = sectionKeys[pickerView.tag]
         let options = viewModel?[sectionKey]
         return options?.pickerOptions[row].description ?? ""
     }
-
+    
     @objc func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
         let sectionKeys = viewModel?.keys.compactMap({ $0 }) ?? []
         let sectionKey = sectionKeys[pickerView.tag]
@@ -95,15 +96,15 @@ UIViewController, UIPickerViewDataSource, UIPickerViewDelegate, UITableViewDataS
             selection?(selectedPickerOption)
         }
     }
-
+    
     func numberOfSections(in tableView: UITableView) -> Int {
         return viewModel?.keys.count ?? 0
     }
-
+    
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return 1
     }
-
+    
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "picker-cell", for: indexPath)
         if let pickerView = cell.viewWithTag(1) as? UIPickerView {
@@ -112,7 +113,7 @@ UIViewController, UIPickerViewDataSource, UIPickerViewDelegate, UITableViewDataS
         }
         return cell
     }
-
+    
     func pickerView(_ pickerView: UIPickerView, viewForRow row: Int,
                     forComponent component: Int, reusing view: UIView?) -> UIView {
         var pickerLabel: UILabel? = view as? UILabel
@@ -124,4 +125,6 @@ UIViewController, UIPickerViewDataSource, UIPickerViewDelegate, UITableViewDataS
         pickerLabel?.text = self.pickerView(pickerView, titleForRow: row, forComponent: component)
         return pickerLabel!
     }
+    
 }
+#endif
diff --git a/FeatureFlags/Classes/UI/Picker/View Controller/TestVariationPickerViewController.swift b/FeatureFlags/Classes/UI/Picker/View Controller/TestVariationPickerViewController.swift
@@ -5,6 +5,7 @@
 //  Created by Ross Butler on 10/23/18.
 //
 
+#if canImport(UIKit)
 import Foundation
 import UIKit
 
@@ -18,3 +19,4 @@ class TestVariationPickerViewController: PickerViewController<Test.Variation> {
         set { super.viewModel = newValue }
     }
 }
+#endif
diff --git a/Package.swift b/Package.swift
@@ -1,8 +1,12 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.1
 import PackageDescription
 
 let package = Package(
     name: "FeatureFlags",
+    platforms: [
+        .iOS(.v11),
+        .macOS(.v10_13)
+    ],
     products: [
         .library(
             name: "FeatureFlags",
@@ -11,7 +15,7 @@ let package = Package(
     targets: [
         .target(
             name: "FeatureFlags",
-            path: "FeatureFlags",
-            exclude: ["Classes/UI", "Classes/Extensions/UIColorAdditions.swift"])
+            path: "FeatureFlags"
+        )
     ]
 )

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`// Created by Ross Butler on 10/23/18.`
`6`	`6`	`//`
`7`	`7`
	`8`	`+#if canImport(UIKit)`
`8`	`9`	`import Foundation`
`9`	`10`	`import UIKit`
`10`	`11`
`@@ -171,3 +172,4 @@ private extension FeatureDetailsViewController {`
`171`	`172`	`}`
`172`	`173`	`}`
`173`	`174`	`}`
	`175`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@`
`5`	`5`	`// Created by Ross Butler on 23/12/2019.`
`6`	`6`	`//`
`7`	`7`
	`8`	`+#if canImport(UIKit)`
`8`	`9`	`import Foundation`
	`10`	`+import UIKit`
`9`	`11`
`10`	`12`	`extension FeatureFlagsViewController: UIViewControllerPreviewingDelegate {`
`11`	`13`
`@@ -30,3 +32,4 @@ extension FeatureFlagsViewController: UIViewControllerPreviewingDelegate {`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`}`
	`35`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`// Created by Ross Butler on 10/19/18.`
`6`	`6`	`//`
`7`	`7`
	`8`	`+#if canImport(UIKit)`
`8`	`9`	`import Foundation`
`9`	`10`	`import UIKit`
`10`	`11`
`@@ -383,3 +384,4 @@ private extension FeatureFlagsViewController {`
`383`	`384`	`}`
`384`	`385`
`385`	`386`	`}`
	`387`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@`
`5`	`5`	`// Created by Ross Butler on 11/27/18.`
`6`	`6`	`//`
`7`	`7`
	`8`	`+#if canImport(UIKit)`
`8`	`9`	`import Foundation`
	`10`	`+import UIKit`
`9`	`11`
`10`	`12`	`public struct FeatureFlagsUI {`
`11`	`13`
`@@ -107,3 +109,4 @@ public struct FeatureFlagsUI {`
`107`	`109`	`}`
`108`	`110`
`109`	`111`	`}`
	`112`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@`
`5`	`5`	`// Created by Ross Butler on 12/5/18.`
`6`	`6`	`//`
`7`	`7`
	`8`	`+#if canImport(UIKit)`
`8`	`9`	`import Foundation`
	`10`	`+import UIKit`
`9`	`11`
`10`	`12`	`@objc class FeatureFlagsUIObserver: NSObject {`
`11`	`13`
`@@ -16,3 +18,4 @@ import Foundation`
`16`	`18`	`}`
`17`	`19`
`18`	`20`	`}`
	`21`	`+#endif`