Implement SPM support (#646)

Author: Widcket

.gitignore

@@ -31,6 +31,11 @@ examples/**/Pods/
 # Carthage
 Carthage/
 
+# SPM
+.swiftpm
+.build
+Package.resolved
+
 #Fabric
 .fabric_key
 

App/ViewController.swift

@@ -105,7 +105,7 @@ class ViewController: UIViewController {
                     .withOptions {
                         applyDefaultOptions(&$0)
                         $0.allow = [.Login]
-                        $0.usernameStyle = [.Email]
+                        $0.usernameStyle = [.Username]
                     }
                     .withConnections { connections in
                         connections.database(name: "Username-Password-Authentication", requiresUsername: true)
@@ -116,6 +116,7 @@ class ViewController: UIViewController {
                     .classic()
                     .withOptions {
                         applyDefaultOptions(&$0)
+                        $0.usernameStyle = [.Username]
                     }
                     .withConnections { connections in
                         connections.social(name: "apple", style: .Apple)

Lock/AuthPresenter.swift

@@ -21,6 +21,7 @@
 // THE SOFTWARE.
 
 import Foundation
+import UIKit
 
 class AuthPresenter: Presentable, Loggable {
 

Lock/CustomTextField.swift

@@ -21,6 +21,7 @@
 // THE SOFTWARE.
 
 import Foundation
+import UIKit
 
 public struct CustomTextField {
 

Lock/EnterpriseDomainPresenter.swift

@@ -21,6 +21,7 @@
 // THE SOFTWARE.
 
 import Foundation
+import UIKit
 
 class EnterpriseDomainPresenter: Presentable, Loggable {
 

Lock/Extensions.swift

@@ -21,6 +21,7 @@
 // THE SOFTWARE.
 
 import Foundation
+import UIKit
 
 extension Optional {
 

Lock/Layout.swift

@@ -21,6 +21,7 @@
 // THE SOFTWARE.
 
 import Foundation
+import UIKit
 
 // MARK: - NSLayoutXAxisAnchor
 @discardableResult func constraintEqual<C: NSLayoutAnchor<NSLayoutXAxisAnchor>>(anchor: C, toAnchor anotherAnchor: C, constant: CGFloat? = nil, priority: UILayoutPriority = UILayoutPriority.priorityRequired) -> NSLayoutConstraint {

Lock/LazyImage.swift

@@ -21,6 +21,7 @@
 // THE SOFTWARE.
 
 import Foundation
+import UIKit
 
 /**
  *  Convenience struct to hold an image reference to a `NSBundle` without loading the `UIImage`.

Lock/Lock.swift

@@ -21,6 +21,7 @@
 // THE SOFTWARE.
 
 import Foundation
+import UIKit
 import Auth0
 
 /// Lock main class to configure and show the native widget

Lock/MessageView.swift

@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import Foundation
 import UIKit
 
 class MessageView: UIView {

Lock/Navigable.swift

@@ -21,6 +21,7 @@
 // THE SOFTWARE.
 
 import Foundation
+import UIKit
 import Auth0
 
 protocol Navigable {

Lock/ObserverStore.swift

@@ -21,6 +21,7 @@
 // THE SOFTWARE.
 
 import Foundation
+import UIKit
 import Auth0
 
 struct ObserverStore: Dispatcher {

Lock/OnePassword.swift

@@ -21,6 +21,7 @@
 // THE SOFTWARE.
 
 import Foundation
+import UIKit
 
 protocol PasswordManager {
 

Lock/PasswordlessPresenter.swift

@@ -21,6 +21,7 @@
 // THE SOFTWARE.
 
 import Foundation
+import UIKit
 
 class PasswordlessPresenter: Presentable, Loggable {
 

Lock/Resources.swift

@@ -21,8 +21,15 @@
 // THE SOFTWARE.
 
 import Foundation
+import UIKit
 
-public func bundleForLock() -> Bundle { return Bundle(for: InputField.classForCoder()) }
+public func bundleForLock() -> Bundle {
+    #if SWIFT_PACKAGE
+    return Bundle.module
+    #else
+    return Bundle(for: InputField.classForCoder())
+    #endif
+}
 
 func lazyImage(named name: String) -> LazyImage { return LazyImage(name: name, bundle: bundleForLock()) }
 

Lock/Router.swift

@@ -21,6 +21,7 @@
 // THE SOFTWARE.
 
 import Foundation
+import UIKit
 import Auth0
 
 protocol Router: Navigable {

Lock/Style.swift

@@ -21,6 +21,7 @@
 // THE SOFTWARE.
 
 import Foundation
+import UIKit
 
 /**
  *  Define Auth0 Lock style and allows to customise it.

Lock/UnrecoverableErrorPresenter.swift

@@ -21,6 +21,7 @@
 // THE SOFTWARE.
 
 import Foundation
+import UIKit
 
 class UnrecoverableErrorPresenter: Presentable {
     let navigator: Navigable

LockTests/AuthCollectionViewSpec.swift

@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import UIKit
 import Quick
 import Nimble
 

LockTests/CountryTableViewControllerSpec.swift

@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import UIKit
 import Quick
 import Nimble
 
@@ -55,11 +56,10 @@ class CountryTableViewControllerSpec: QuickSpec {
 
             it("should return cell info for Argentina") {
                 let index = IndexPath(item: 8, section: 0)
-                expect(tableView.cellForRow(at: index)?.textLabel?.text) == "Argentina"
-                expect(tableView.cellForRow(at: index)?.detailTextLabel?.text) == "+54"
+                expect(controller.tableView(tableView, cellForRowAt: index).textLabel?.text) == "Argentina"
+                expect(controller.tableView(tableView, cellForRowAt: index).detailTextLabel?.text) == "+54"
             }
 
-
             describe("tableview action") {
 
                 var countryCode: CountryCode?

LockTests/EmailValidatorSpec.swift

@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import Foundation
 import Quick
 import Nimble
 

LockTests/InputFieldSpec.swift

@@ -20,8 +20,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import UIKit
 import Quick
 import Nimble
+
 @testable import Lock
 
 class InputFieldSpec: QuickSpec {

LockTests/Interactors/Auth0OAuth2InteractorSpec.swift

@@ -22,9 +22,12 @@
 
 import Quick
 import Nimble
+import Auth0
 import OHHTTPStubs
+#if SWIFT_PACKAGE
+import OHHTTPStubsSwift
+#endif
 
-import Auth0
 @testable import Lock
 
 private let DomainURL = URL(fileURLWithPath: domain)

LockTests/Interactors/CDNLoaderInteractorSpec.swift

@@ -23,6 +23,9 @@
 import Quick
 import Nimble
 import OHHTTPStubs
+#if SWIFT_PACKAGE
+import OHHTTPStubsSwift
+#endif
 
 @testable import Lock
 

LockTests/Interactors/DatabaseInteractorSpec.swift

@@ -22,8 +22,11 @@
 
 import Quick
 import Nimble
-import OHHTTPStubs
 import Auth0
+import OHHTTPStubs
+#if SWIFT_PACKAGE
+import OHHTTPStubsSwift
+#endif
 
 @testable import Lock
 

LockTests/Interactors/DatabasePasswordInteractorSpec.swift

@@ -22,8 +22,11 @@
 
 import Quick
 import Nimble
-import OHHTTPStubs
 import Auth0
+import OHHTTPStubs
+#if SWIFT_PACKAGE
+import OHHTTPStubsSwift
+#endif
 
 @testable import Lock
 

LockTests/Interactors/EnterpriseActiveAuthInteractorSpec.swift

@@ -22,8 +22,11 @@
 
 import Quick
 import Nimble
-import OHHTTPStubs
 import Auth0
+import OHHTTPStubs
+#if SWIFT_PACKAGE
+import OHHTTPStubsSwift
+#endif
 
 @testable import Lock
 

LockTests/Interactors/MultifactorInteractorSpec.swift

@@ -23,6 +23,9 @@
 import Quick
 import Nimble
 import OHHTTPStubs
+#if SWIFT_PACKAGE
+import OHHTTPStubsSwift
+#endif
 
 import Auth0
 @testable import Lock

LockTests/Interactors/PasswordlessInteractorSpec.swift

@@ -22,8 +22,11 @@
 
 import Quick
 import Nimble
-import OHHTTPStubs
 import Auth0
+import OHHTTPStubs
+#if SWIFT_PACKAGE
+import OHHTTPStubsSwift
+#endif
 
 @testable import Lock
 

LockTests/LazyImageSpec.swift

@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import Foundation
 import Quick
 import Nimble
 

LockTests/LockSpec.swift

@@ -20,9 +20,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import Foundation
+import UIKit
 import Quick
 import Nimble
 import Auth0
+
 @testable import Lock
 
 class LockSpec: QuickSpec {

LockTests/LockViewControllerSpec.swift

@@ -20,6 +20,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import Foundation
+import UIKit
 import Quick
 import Nimble
 

LockTests/LoggerSpec.swift

@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import Foundation
 import Quick
 import Nimble
 

LockTests/Models/AuthStyleSpec.swift

@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import UIKit
 import Quick
 import Nimble
 

LockTests/PasswordlessActivitySpec.swift

@@ -24,6 +24,9 @@ import Quick
 import Nimble
 import Auth0
 import OHHTTPStubs
+#if SWIFT_PACKAGE
+import OHHTTPStubsSwift
+#endif
 
 @testable import Lock
 

LockTests/Presenters/AuthPresenterSpec.swift

@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import UIKit
 import Quick
 import Nimble
 

LockTests/Presenters/BannerMessagePresenterSpec.swift

@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import UIKit
 import Quick
 import Nimble
 

LockTests/Presenters/DatabaseForgotPasswordPresenterSpec.swift

@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import Foundation
 import Quick
 import Nimble
 

LockTests/Presenters/DatabasePresenterSpec.swift

@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import UIKit
 import Quick
 import Nimble
 

LockTests/Router/ClassicRouterSpec.swift

@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import UIKit
 import Nimble
 import Quick
 import Auth0