SPM support #213

BlueprintUILists/Sources/BlueprintHeaderFooterContent.swift

@@ -7,6 +7,7 @@
 
 import BlueprintUI
 import ListableUI
+import UIKit
 
 
 /// Alias to allow less verbose creation of headers.

BlueprintUILists/Sources/BlueprintItemContent.swift

@@ -7,6 +7,7 @@
 
 import BlueprintUI
 import ListableUI
+import UIKit
 
 
 ///

BlueprintUILists/Sources/List.swift

@@ -6,8 +6,8 @@
 //
 
 import BlueprintUI
-
 import ListableUI
+import UIKit
 
 
 ///

BlueprintUILists/Sources/ListReorderGesture.swift

@@ -7,6 +7,7 @@
 
 import BlueprintUI
 import ListableUI
+import UIKit
 
 
 ///

Internal Pods/EnglishDictionary/Sources/EnglishDictionary.swift

@@ -8,7 +8,16 @@
 import UIKit
 
 
-class BundleFinder : NSObject {}
+internal extension Bundle {
+    static var resources: Bundle {
+        #if SWIFT_PACKAGE
+        return .module
+        #else
+        let main = Bundle(for: EnglishDictionary.self)
+        return Bundle(url: main.url(forResource: "EnglishDictionaryResources", withExtension: "bundle")!)!
+        #endif
+    }
+}
 
 public class EnglishDictionary
 {
@@ -19,8 +28,7 @@ public class EnglishDictionary
 
     public init()
     {
-        let main = Bundle(for: EnglishDictionary.self)
-        let bundle = Bundle(url: main.url(forResource: "EnglishDictionaryResources", withExtension: "bundle")!)!
+        let bundle = Bundle.resources
 
         let stream = InputStream(url: bundle.url(forResource: "dictionary", withExtension: "json")!)!
         defer { stream.close() }

Internal Pods/Snapshot/Sources/Snapshot.swift

@@ -8,53 +8,53 @@
 import XCTest
 
 public struct Snapshot<Iteration:SnapshotIteration>
-{    
+{
     public typealias Test = (Iteration) throws -> Iteration.RenderingFormat
-    
+
     public let settings : SnapshotSettings
     public let iterations : [Iteration]
     public let test : Test
-    
+
     internal typealias OnFail = (_ message : String, _ file : StaticString, _ line : UInt) -> ()
-    internal var onFail : OnFail = XCTFail
-    
+    internal var onFail : OnFail = { message, file, line in XCTFail(message, file: file, line: line) }
+
     public init(
         for iteration: Iteration ,
         settings : SnapshotSettings = .init(),
         input : Iteration.RenderingFormat
     ) {
         self.init(for: [iteration], settings : settings) { _ in input }
     }
-    
+
     public init(
         for iterations: [Iteration] ,
         settings : SnapshotSettings = .init(),
         input : Iteration.RenderingFormat
     ) {
         self.init(for: iterations, settings : settings) { _ in input }
     }
-    
+
     public init(
         for iterations : [Iteration],
         settings : SnapshotSettings = .init(),
         test : @escaping Test
     ) {
         let hasIterations = iterations.isEmpty == false
         precondition(hasIterations, "Must provide at least one iteration.")
-        
+
         let allNames = iterations.map { $0.name }
-        
+
         let allNamesUnique = Set(allNames).count == iterations.count
         precondition(allNamesUnique, "Must provide iterations with unique names.")
-        
+
         let allNamesNonEmpty = allNames.allSatisfy { $0.isEmpty == false }
         precondition(allNamesNonEmpty, "Cannot provide an empty iteration name.")
-        
+
         self.iterations = iterations.sorted { $0.name < $1.name }
         self.settings = settings
         self.test = test
     }
-    
+
     public func test<OutputFormat:SnapshotOutputFormat>(
         output: OutputFormat.Type,
         testCase : String? = nil,
@@ -72,16 +72,16 @@ public struct Snapshot<Iteration:SnapshotIteration>
                 functionName: functionName.description,
                 iteration: iteration.name
             )
-            
+
             var onFailData : Data? = nil
-                        
+
             do {
                 let rendering = iteration.prepare(render: try self.test(iteration))
                 let data = try OutputFormat.snapshotData(with: rendering)
                 onFailData = data
-                
+
                 let existingData = try self.existingData(at: url)
-                
+
                 if let existingData = existingData {
                     do {
                         try OutputFormat.validate(render: rendering, existingData: existingData)
@@ -100,35 +100,35 @@ public struct Snapshot<Iteration:SnapshotIteration>
                         return "Error generating snapshotData."
                     }
                 }()
-                
+
                 self.onFail(
                     """
                     Snapshot test '\(iteration.name)' with format '\(OutputFormat.self)' failed.
-                    
+
                     Error: \(error).
-                    
+
                     File extension: '.\(output.outputInfo.fileExtension)'.
-                    
+
                     Base64 Data (pass this to `Data.saveBase64(toPath: "~/Development/etc ...", content: "...")` to inspect locally):
-                    
+
                     '\(data)'.
-                    
+
                     """,
                     testFilePath, line
                 )
-            }            
+            }
         }
     }
-    
+
     func existingData(at url : URL) throws -> Data?
     {
         guard FileManager.default.fileExists(atPath: url.path) else {
             return nil
         }
-        
+
         return try Data(contentsOf: url)
     }
-    
+
     static func outputUrl<OutputFormat:SnapshotOutputFormat>(
         with settings : SnapshotSettings,
         output: OutputFormat.Type,
@@ -141,23 +141,23 @@ public struct Snapshot<Iteration:SnapshotIteration>
         let testFileURL = URL(fileURLWithPath: testFilePath)
         let testFileName = testFileURL.lastPathComponent
         let testDirectory = testFileURL.deletingLastPathComponent()
-        
+
         // For:        ~/Development/Project/Tests/Tests.swift
         // We Provide: ~/Development/Project/Tests/Snapshot Results/Tests.swift/OSVersion/testFunctionName()/outputFormat/testCase/modifierName.extension
-        
+
         var snapshotsDirectory = testDirectory
             .appendingPathComponent("Snapshot Results", isDirectory: true)
             .appendingPathComponent(testFileName, isDirectory: true)
             .appendingPathComponent(settings.savesBySystemVersion.systemVersionDirectory(), isDirectory: true)
             .appendingPathComponent(functionName, isDirectory: true)
             .appendingPathComponent(OutputFormat.outputInfo.directoryName, isDirectory: true)
-        
+
         if let testCase = testCase {
             snapshotsDirectory = snapshotsDirectory.appendingPathComponent(testCase, isDirectory: true)
         }
-        
+
         try! FileManager.default.createDirectory(at: snapshotsDirectory, withIntermediateDirectories: true, attributes: [:])
-        
+
         return snapshotsDirectory
             .appendingPathComponent(iteration)
             .appendingPathExtension(OutputFormat.outputInfo.fileExtension)
@@ -170,19 +170,19 @@ public extension Data
     static func saveBase64(toPath path : String, content : String) -> Bool
     {
         let url = URL(fileURLWithPath: (path as NSString).expandingTildeInPath)
-        
+
         guard let data = Data(base64Encoded: content) else {
             print("Could not create data from base64 string.")
             return false
         }
-        
+
         do {
             try data.write(to: url)
         } catch {
             print("Could not write data to disk. Error: \(error)")
             return false
         }
-        
+
         return true
     }
 }
@@ -197,11 +197,11 @@ public enum SnapshotValidationError : Error
 public protocol SnapshotOutputFormat
 {
     associatedtype RenderingFormat
-    
+
     static func snapshotData(with renderingFormat : RenderingFormat) throws -> Data
-    
+
     static var outputInfo : SnapshotOutputInfo { get }
-    
+
     static func validate(render: RenderingFormat, existingData : Data) throws
 }
 
@@ -210,7 +210,7 @@ public struct SnapshotOutputInfo : Equatable
 {
     public var directoryName : String
     public var fileExtension : String
-    
+
     public init(
         directoryName : String,
         fileExtension : String
@@ -224,8 +224,8 @@ public struct SnapshotOutputInfo : Equatable
 public protocol SnapshotIteration
 {
     associatedtype RenderingFormat
-    
+
     var name : String { get }
-    
+
     func prepare(render : RenderingFormat) -> RenderingFormat
 }

ListableUI/Sources/Appearance.swift

@@ -5,6 +5,8 @@
 //  Created by Kyle Van Essen on 10/17/19.
 //
 
+import UIKit
+
 
 ///
 /// Contains all the properties which affect the appearance of all possible kinds of list layouts.

ListableUI/Sources/Behavior.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import UIKit
 
 
 /// Controls various behaviors of the list view, such as keyboard dismissal, selection mode, and behavior

ListableUI/Sources/Content.swift

@@ -5,6 +5,7 @@
 //  Created by Kyle Van Essen on 6/21/19.
 //
 
+import UIKit
 
 
 public struct Content

ListableUI/Sources/ContentBounds/ListContentBounds.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import UIKit
 
 
 /// For participating layouts; allows controlling the padding around and width of content when it is laid out.

ListableUI/Sources/EmbeddedList.swift

@@ -5,6 +5,8 @@
 //  Created by Kyle Van Essen on 11/10/19.
 //
 
+import UIKit
+
 
 public extension Item where Content == EmbeddedList
 {

ListableUI/Sources/HeaderFooter/AnyHeaderFooter.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import UIKit
 
 
 public protocol AnyHeaderFooter : AnyHeaderFooterConvertible, AnyHeaderFooter_Internal

ListableUI/Sources/HeaderFooter/HeaderFooter.swift

@@ -5,6 +5,8 @@
 //  Created by Kyle Van Essen on 8/10/19.
 //
 
+import UIKit
+
 
 public typealias Header<Content:HeaderFooterContent> = HeaderFooter<Content>
 public typealias Footer<Content:HeaderFooterContent> = HeaderFooter<Content>

ListableUI/Sources/HeaderFooter/HeaderFooterContent.swift

@@ -5,6 +5,8 @@
 //  Created by Kyle Van Essen on 8/10/19.
 //
 
+import UIKit
+
 
 public typealias HeaderContent = HeaderFooterContent
 public typealias FooterContent = HeaderFooterContent

ListableUI/Sources/Internal/CGSize.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import UIKit
 
 
 internal extension CGSize

ListableUI/Sources/Internal/PresentationState/PresentationState.HeaderFooterState.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import UIKit
 
 
 protocol AnyPresentationHeaderFooterState : AnyObject

ListableUI/Sources/Internal/PresentationState/PresentationState.ItemState.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import UIKit
 
 
 protocol AnyPresentationItemState : AnyObject

ListableUI/Sources/Internal/PresentationState/PresentationState.RefreshControl.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import UIKit
 
 
 extension PresentationState

ListableUI/Sources/Internal/PresentationState/PresentationState.swift

@@ -5,6 +5,8 @@
 //  Created by Kyle Van Essen on 7/22/19.
 //
 
+import UIKit
+
 
 /// A class used to manage the "live" / mutable state of the visible items in the list,
 /// which is persistent across diffs of content (instances are only created or destroyed when an item enters or leaves the list).

ListableUI/Sources/Internal/UIView.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import UIKit
 
 
 extension UIView {