Merge pull request #23 from jorgenhenrichsen/dev

Dev

.codecov.yml

@@ -0,0 +1,2 @@
+ignore:
+  - "Example/.*"

.travis.yml

@@ -2,13 +2,16 @@
 # * http://www.objc.io/issue-6/travis-ci.html
 # * https://github.com/supermarin/xcpretty#usage
 
-osx_image: xcode9.2
-language: objective-c
+osx_image: xcode9.4
+language: swift
 cache: cocoapods
 podfile: Example/Podfile
 before_install:
 - gem install cocoapods # Since Travis is not always on latest version
-- pod install --project-directory=Example
+- pod install --project-directory=Example --repo-update
 script:
-- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/SwiftAudio.xcworkspace -scheme SwiftAudio-Example -sdk iphonesimulator11.2 -destination "OS=11.2,name=iPhone X" | xcpretty
+- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/SwiftAudio.xcworkspace -scheme SwiftAudio-Example -sdk iphonesimulator11.4 -destination "OS=11.4,name=iPhone X" | xcpretty
 - pod lib lint
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash) -J 'SwiftAudio'

Example/Podfile

@@ -7,8 +7,8 @@ target 'SwiftAudio_Example' do
   target 'SwiftAudio_Tests' do
     inherit! :search_paths
 
-    pod 'Quick'
-    pod 'Nimble'
+    pod 'Quick', '~> 1.3.0'
+    pod 'Nimble' , '~> 7.3.0'
     
   end
 end

Example/Podfile.lock

@@ -1,22 +1,27 @@
 PODS:
-  - Nimble (7.0.3)
-  - Quick (1.2.0)
-  - SwiftAudio (0.1.0)
+  - Nimble (7.3.1)
+  - Quick (1.3.2)
+  - SwiftAudio (0.3.3)
 
 DEPENDENCIES:
-  - Nimble
-  - Quick
+  - Nimble (~> 7.3.0)
+  - Quick (~> 1.3.0)
   - SwiftAudio (from `../`)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Nimble
+    - Quick
+
 EXTERNAL SOURCES:
   SwiftAudio:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
-  Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
-  Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
-  SwiftAudio: a3a2d2c800a7d47687dcfd7c35ab757462b75856
+  Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
+  Quick: 2623cb30d7a7f41ca62f684f679586558f483d46
+  SwiftAudio: 2e712c3e04cf172d05639d7bb1516db7afd195da
 
-PODFILE CHECKSUM: 4725c63cba8dedecdf397c1768967bd269bf4532
+PODFILE CHECKSUM: 8a75946cbc65d8d98176f80a88d8363a28d118ce
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.5.3

Example/Pods/Local Podspecs/SwiftAudio.podspec.json

@@ -1,9 +1,9 @@
 {
   "name": "SwiftAudio",
-  "version": "0.1.0",
-  "summary": "A short description of SwiftAudio.",
-  "description": "TODO: Add long description of the pod here.",
-  "homepage": "https://github.com/Jørgen Henrichsen/SwiftAudio",
+  "version": "0.3.3",
+  "summary": "Easy audio streaming for iOS",
+  "description": "SwiftAudio is an audio player written in Swift, making it simpler to work with audio playback from streams and files.",
+  "homepage": "https://github.com/jorgenhenrichsen/SwiftAudio",
   "license": {
     "type": "MIT",
     "file": "LICENSE"
@@ -12,8 +12,8 @@
     "Jørgen Henrichsen": "jh.henrichs@gmail.com"
   },
   "source": {
-    "git": "https://github.com/Jørgen Henrichsen/SwiftAudio.git",
-    "tag": "0.1.0"
+    "git": "https://github.com/jorgenhenrichsen/SwiftAudio.git",
+    "tag": "0.3.3"
   },
   "platforms": {
     "ios": "10.0"

Example/Pods/Manifest.lock

@@ -1,22 +1,27 @@
 PODS:
-  - Nimble (7.0.3)
-  - Quick (1.2.0)
-  - SwiftAudio (0.1.0)
+  - Nimble (7.3.1)
+  - Quick (1.3.2)
+  - SwiftAudio (0.3.3)
 
 DEPENDENCIES:
-  - Nimble
-  - Quick
+  - Nimble (~> 7.3.0)
+  - Quick (~> 1.3.0)
   - SwiftAudio (from `../`)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Nimble
+    - Quick
+
 EXTERNAL SOURCES:
   SwiftAudio:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
-  Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
-  Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
-  SwiftAudio: a3a2d2c800a7d47687dcfd7c35ab757462b75856
+  Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
+  Quick: 2623cb30d7a7f41ca62f684f679586558f483d46
+  SwiftAudio: 2e712c3e04cf172d05639d7bb1516db7afd195da
 
-PODFILE CHECKSUM: 4725c63cba8dedecdf397c1768967bd269bf4532
+PODFILE CHECKSUM: 8a75946cbc65d8d98176f80a88d8363a28d118ce
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.5.3

Example/Pods/Nimble/Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift

@@ -25,13 +25,11 @@ import CwlCatchExceptionSupport
 #endif
 
 private func catchReturnTypeConverter<T: NSException>(_ type: T.Type, block: () -> Void) -> T? {
-	// Get the type from an *instance*, instead of a receiving the type directly
 	return catchExceptionOfKind(type, block) as? T
 }
 
 extension NSException {
 	public static func catchException(in block: () -> Void) -> Self? {
-		// Use a dummy instance of Self to provide the type
 		return catchReturnTypeConverter(self, block: block)
 	}
 }

Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift

@@ -97,8 +97,9 @@ import Foundation
 			// Request the next mach message from the port
 			request.Head.msgh_local_port = context.currentExceptionPort
 			request.Head.msgh_size = UInt32(MemoryLayout<request_mach_exception_raise_t>.size)
+			let requestSize = request.Head.msgh_size
 			try kernCheck { request.withMsgHeaderPointer { requestPtr in
-				mach_msg(requestPtr, MACH_RCV_MSG | MACH_RCV_INTERRUPT, 0, request.Head.msgh_size, context.currentExceptionPort, 0, UInt32(MACH_PORT_NULL))
+				mach_msg(requestPtr, MACH_RCV_MSG | MACH_RCV_INTERRUPT, 0, requestSize, context.currentExceptionPort, 0, UInt32(MACH_PORT_NULL))
 			} }
 			
 			// Prepare the reply structure
@@ -121,8 +122,9 @@ import Foundation
 			}
 			
 			// Send the reply
+			let replySize = reply.Head.msgh_size
 			try kernCheck { reply.withMsgHeaderPointer { replyPtr in
-				mach_msg(replyPtr, MACH_SEND_MSG, reply.Head.msgh_size, 0, UInt32(MACH_PORT_NULL), 0, UInt32(MACH_PORT_NULL))
+				mach_msg(replyPtr, MACH_SEND_MSG, replySize, 0, UInt32(MACH_PORT_NULL), 0, UInt32(MACH_PORT_NULL))
 			} }
 		} catch let error as NSError where (error.domain == NSMachErrorDomain && (error.code == Int(MACH_RCV_PORT_CHANGED) || error.code == Int(MACH_RCV_INVALID_NAME))) {
 			// Port was already closed before we started or closed while we were listening.

Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/Mach/CwlPreconditionTesting.h

@@ -20,6 +20,8 @@
 
 #import <Foundation/Foundation.h>
 
+extern bool _swift_reportFatalErrorsToDebugger;
+
 //! Project version number for CwlUtils.
 FOUNDATION_EXPORT double CwlPreconditionTestingVersionNumber;
 

Example/Pods/Nimble/README.md

@@ -226,9 +226,9 @@ exception once evaluated:
 //       that Nimble will catch.
 //       (see https://github.com/Quick/Nimble/issues/220#issuecomment-172667064)
 let exception = NSException(
-  name: NSInternalInconsistencyException,
-  reason: "Not enough fish in the sea.",
-  userInfo: ["something": "is fishy"])
+    name: NSInternalInconsistencyException,
+    reason: "Not enough fish in the sea.",
+    userInfo: ["something": "is fishy"])
 expect { exception.raise() }.to(raiseException())
 
 // Also, you can customize raiseException to be more specific
@@ -714,7 +714,7 @@ expect(actual) ≈ expected
 expect(actual) ≈ (expected, delta)
 
 ```
-(Type Option-x to get ≈ on a U.S. keyboard)
+(Type <kbd>option</kbd>+<kbd>x</kbd> to get `≈` on a U.S. keyboard)
 
 The former version uses the default delta of 0.0001. Here is yet another way to do this:
 
@@ -725,7 +725,7 @@ expect(actual) ≈ expected ± delta
 expect(actual) == expected ± delta
 
 ```
-(Type Option-Shift-= to get ± on a U.S. keyboard)
+(Type <kbd>option</kbd>+<kbd>shift</kbd>+<kbd>=</kbd> to get `±` on a U.S. keyboard)
 
 If you are comparing arrays of floating point numbers, you'll find the following useful:
 
@@ -1043,10 +1043,10 @@ let turtles: [Turtle] = functionThatReturnsSomeTurtlesInAnyOrder()
 // [{color: "blue"}, {color: "green"}] or [{color: "green"}, {color: "blue"}]:
 
 expect(turtles).to(containElementSatisfying({ turtle in
-	return turtle.color == "green"
+    return turtle.color == "green"
 }))
 expect(turtles).to(containElementSatisfying({ turtle in
-	return turtle.color == "blue"
+    return turtle.color == "blue"
 }, "that is a turtle with color 'blue'"))
 
 // The second matcher will incorporate the provided string in the error message
@@ -1069,10 +1069,10 @@ NSArray<Turtle *> * __nonnull turtles = functionThatReturnsSomeTurtlesInAnyOrder
 // [{color: "blue"}, {color: "green"}] or [{color: "green"}, {color: "blue"}]:
 
 expect(turtles).to(containElementSatisfying(^BOOL(id __nonnull object) {
-	return [[turtle color] isEqualToString:@"green"];
+    return [[turtle color] isEqualToString:@"green"];
 }));
 expect(turtles).to(containElementSatisfying(^BOOL(id __nonnull object) {
-	return [[turtle color] isEqualToString:@"blue"];
+    return [[turtle color] isEqualToString:@"blue"];
 }));
 ```
 
@@ -1273,24 +1273,24 @@ value and return a `Predicate` closure. Take `equal`, for example:
 // Swift
 
 public func equal<T: Equatable>(expectedValue: T?) -> Predicate<T> {
-  // Can be shortened to:
-  //   Predicate { actual in  ... }
-  //
-  // But shown with types here for clarity.
-  return Predicate { (actual: Expression<T>) throws -> PredicateResult in
-    let msg = ExpectationMessage.expectedActualValueTo("equal <\(expectedValue)>")
-    if let actualValue = try actualExpression.evaluate() {
-    	return PredicateResult(
-            bool: actualValue == expectedValue!,
-            message: msg
-        )
-    } else {
-    	return PredicateResult(
-            status: .fail,
-            message: msg.appendedBeNilHint()
-        )
+    // Can be shortened to:
+    //   Predicate { actual in  ... }
+    //
+    // But shown with types here for clarity.
+    return Predicate { (actual: Expression<T>) throws -> PredicateResult in
+        let msg = ExpectationMessage.expectedActualValueTo("equal <\(expectedValue)>")
+        if let actualValue = try actualExpression.evaluate() {
+            return PredicateResult(
+                bool: actualValue == expectedValue!,
+                message: msg
+            )
+        } else {
+            return PredicateResult(
+                status: .fail,
+                message: msg.appendedBeNilHint()
+            )
+        }
     }
-  }
 }
 ```
 
@@ -1382,11 +1382,11 @@ custom matchers should call `actualExpression.evaluate()`:
 // Swift
 
 public func beNil<T>() -> Predicate<T> {
-	// Predicate.simpleNilable(..) automatically generates ExpectationMessage for
-	// us based on the string we provide to it. Also, the 'Nilable' postfix indicates
-	// that this Predicate supports matching against nil actualExpressions, instead of
-	// always resulting in a PredicateStatus.fail result -- which is true for
-	// Predicate.simple(..)
+    // Predicate.simpleNilable(..) automatically generates ExpectationMessage for
+    // us based on the string we provide to it. Also, the 'Nilable' postfix indicates
+    // that this Predicate supports matching against nil actualExpressions, instead of
+    // always resulting in a PredicateStatus.fail result -- which is true for
+    // Predicate.simple(..)
     return Predicate.simpleNilable("be nil") { actualExpression in
         let actualValue = try actualExpression.evaluate()
         return PredicateStatus(bool: actualValue == nil)
@@ -1412,9 +1412,9 @@ against the one provided to the matcher function, and passes if they are the sam
 // Swift
 
 public func haveDescription(description: String) -> Predicate<Printable?> {
-  return Predicate.simple("have description") { actual in
-    return PredicateStatus(bool: actual.evaluate().description == description)
-  }
+    return Predicate.simple("have description") { actual in
+        return PredicateStatus(bool: actual.evaluate().description == description)
+    }
 }
 ```
 
@@ -1489,7 +1489,7 @@ case expectedCustomValueTo(/* message: */ String, /* actual: */ String)
 
 // Emits standard error message without mentioning the actual value
 // eg - "expected to <message>"
-case expectedTo(/* message: */ String, /* actual: */ String)
+case expectedTo(/* message: */ String)
 
 // ...
 }
@@ -1526,13 +1526,13 @@ custom matcher. The example below defines the class method
 // Swift
 
 extension NMBObjCMatcher {
-  public class func beNilMatcher() -> NMBObjCMatcher {
-    return NMBObjCMatcher { actualBlock, failureMessage, location in
-      let block = ({ actualBlock() as NSObject? })
-      let expr = Expression(expression: block, location: location)
-      return beNil().matches(expr, failureMessage: failureMessage)
+    public class func beNilMatcher() -> NMBObjCMatcher {
+        return NMBObjCMatcher { actualBlock, failureMessage, location in
+            let block = ({ actualBlock() as NSObject? })
+            let expr = Expression(expression: block, location: location)
+            return beNil().matches(expr, failureMessage: failureMessage)
+        }
     }
-  }
 }
 ```
 
@@ -1551,7 +1551,7 @@ class method:
 // Objective-C
 
 FOUNDATION_EXPORT id<NMBMatcher> beNil() {
-  return [NMBObjCMatcher beNilMatcher];
+    return [NMBObjCMatcher beNilMatcher];
 }
 ```
 

Example/Pods/Nimble/Sources/Nimble/Adapters/AssertionRecorder.swift

@@ -65,7 +65,7 @@ public func withAssertionHandler(_ tempAssertionHandler: AssertionHandler, closu
 ///                 assertion handler when this is true. Defaults to false.
 ///
 /// @see gatherFailingExpectations
-public func gatherExpectations(silently: Bool = false, closure: @escaping () -> Void) -> [AssertionRecord] {
+public func gatherExpectations(silently: Bool = false, closure: () -> Void) -> [AssertionRecord] {
     let previousRecorder = NimbleEnvironment.activeInstance.assertionHandler
     let recorder = AssertionRecorder()
     let handlers: [AssertionHandler]
@@ -92,7 +92,7 @@ public func gatherExpectations(silently: Bool = false, closure: @escaping () ->
 ///
 /// @see gatherExpectations
 /// @see raiseException source for an example use case.
-public func gatherFailingExpectations(silently: Bool = false, closure: @escaping () -> Void) -> [AssertionRecord] {
+public func gatherFailingExpectations(silently: Bool = false, closure: () -> Void) -> [AssertionRecord] {
     let assertions = gatherExpectations(silently: silently, closure: closure)
     return assertions.filter { assertion in
         !assertion.success

Example/Pods/Nimble/Sources/Nimble/Adapters/NMBExpectation.swift

@@ -4,7 +4,7 @@ import Foundation
 
 private func from(objcPredicate: NMBPredicate) -> Predicate<NSObject> {
     return Predicate { actualExpression in
-        let result = objcPredicate.satisfies(({ try! actualExpression.evaluate() }),
+        let result = objcPredicate.satisfies(({ try actualExpression.evaluate() }),
                                              location: actualExpression.location)
         return result.toSwift()
     }
@@ -30,13 +30,13 @@ internal struct ObjCMatcherWrapper: Matcher {
 
 // Equivalent to Expectation, but for Nimble's Objective-C interface
 public class NMBExpectation: NSObject {
-    internal let _actualBlock: () -> NSObject!
+    internal let _actualBlock: () -> NSObject?
     internal var _negative: Bool
     internal let _file: FileString
     internal let _line: UInt
     internal var _timeout: TimeInterval = 1.0
 
-    @objc public init(actualBlock: @escaping () -> NSObject!, negative: Bool, file: FileString, line: UInt) {
+    @objc public init(actualBlock: @escaping () -> NSObject?, negative: Bool, file: FileString, line: UInt) {
         self._actualBlock = actualBlock
         self._negative = negative
         self._file = file

Example/Pods/Nimble/Sources/Nimble/Adapters/NMBObjCMatcher.swift

@@ -3,8 +3,8 @@ import Foundation
 #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
 
 // swiftlint:disable line_length
-public typealias MatcherBlock = (_ actualExpression: Expression<NSObject>, _ failureMessage: FailureMessage) -> Bool
-public typealias FullMatcherBlock = (_ actualExpression: Expression<NSObject>, _ failureMessage: FailureMessage, _ shouldNotMatch: Bool) -> Bool
+public typealias MatcherBlock = (_ actualExpression: Expression<NSObject>, _ failureMessage: FailureMessage) throws -> Bool
+public typealias FullMatcherBlock = (_ actualExpression: Expression<NSObject>, _ failureMessage: FailureMessage, _ shouldNotMatch: Bool) throws -> Bool
 // swiftlint:enable line_length
 
 public class NMBObjCMatcher: NSObject, NMBMatcher {
@@ -24,7 +24,7 @@ public class NMBObjCMatcher: NSObject, NMBMatcher {
 
     public convenience init(canMatchNil: Bool, matcher: @escaping MatcherBlock) {
         self.init(canMatchNil: canMatchNil, matcher: matcher, notMatcher: ({ actualExpression, failureMessage in
-            return !matcher(actualExpression, failureMessage)
+            return try !matcher(actualExpression, failureMessage)
         }))
     }
 
@@ -34,9 +34,9 @@ public class NMBObjCMatcher: NSObject, NMBMatcher {
 
     public convenience init(canMatchNil: Bool, matcher: @escaping FullMatcherBlock) {
         self.init(canMatchNil: canMatchNil, matcher: ({ actualExpression, failureMessage in
-            return matcher(actualExpression, failureMessage, false)
+            return try matcher(actualExpression, failureMessage, false)
         }), notMatcher: ({ actualExpression, failureMessage in
-            return matcher(actualExpression, failureMessage, true)
+            return try matcher(actualExpression, failureMessage, true)
         }))
     }
 
@@ -55,11 +55,16 @@ public class NMBObjCMatcher: NSObject, NMBMatcher {
         return true
     }
 
-    public func matches(_ actualBlock: @escaping () -> NSObject!, failureMessage: FailureMessage, location: SourceLocation) -> Bool {
+    public func matches(_ actualBlock: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool {
         let expr = Expression(expression: actualBlock, location: location)
-        let result = _match(
-            expr,
-            failureMessage)
+        let result: Bool
+        do {
+            result = try _match(expr, failureMessage)
+        } catch let error {
+            failureMessage.stringValue = "unexpected error thrown: <\(error)>"
+            return false
+        }
+
         if self.canMatch(Expression(expression: actualBlock, location: location), failureMessage: failureMessage) {
             return result
         } else {
@@ -67,11 +72,16 @@ public class NMBObjCMatcher: NSObject, NMBMatcher {
         }
     }
 
-    public func doesNotMatch(_ actualBlock: @escaping () -> NSObject!, failureMessage: FailureMessage, location: SourceLocation) -> Bool {
+    public func doesNotMatch(_ actualBlock: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool {
         let expr = Expression(expression: actualBlock, location: location)
-        let result = _doesNotMatch(
-            expr,
-            failureMessage)
+        let result: Bool
+        do {
+            result = try _doesNotMatch(expr, failureMessage)
+        } catch let error {
+            failureMessage.stringValue = "unexpected error thrown: <\(error)>"
+            return false
+        }
+
         if self.canMatch(Expression(expression: actualBlock, location: location), failureMessage: failureMessage) {
             return result
         } else {

Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleXCTestHandler.swift

@@ -42,12 +42,23 @@ class NimbleXCTestUnavailableHandler: AssertionHandler {
 
     private(set) var currentTestCase: XCTestCase?
 
+    private var stashed_swift_reportFatalErrorsToDebugger: Bool = false
+
     @objc func testCaseWillStart(_ testCase: XCTestCase) {
+        #if swift(>=3.2)
+        stashed_swift_reportFatalErrorsToDebugger = _swift_reportFatalErrorsToDebugger
+        _swift_reportFatalErrorsToDebugger = false
+        #endif
+
         currentTestCase = testCase
     }
 
     @objc func testCaseDidFinish(_ testCase: XCTestCase) {
         currentTestCase = nil
+
+        #if swift(>=3.2)
+        _swift_reportFatalErrorsToDebugger = stashed_swift_reportFatalErrorsToDebugger
+        #endif
     }
 }
 #endif
@@ -61,7 +72,7 @@ func isXCTestAvailable() -> Bool {
 #endif
 }
 
-private func recordFailure(_ message: String, location: SourceLocation) {
+public func recordFailure(_ message: String, location: SourceLocation) {
 #if SWIFT_PACKAGE
     XCTFail("\(message)", file: location.file, line: location.line)
 #else

Example/Pods/Nimble/Sources/Nimble/DSL+Wait.swift

@@ -111,6 +111,6 @@ internal func blockedRunLoopErrorMessageFor(_ fnName: String, leeway: TimeInterv
 /// 
 /// This function manages the main run loop (`NSRunLoop.mainRunLoop()`) while this function
 /// is executing. Any attempts to touch the run loop may cause non-deterministic behavior.
-public func waitUntil(timeout: TimeInterval = 1, file: FileString = #file, line: UInt = #line, action: @escaping (@escaping () -> Void) -> Void) {
+public func waitUntil(timeout: TimeInterval = AsyncDefaults.Timeout, file: FileString = #file, line: UInt = #line, action: @escaping (@escaping () -> Void) -> Void) {
     NMBWait.until(timeout: timeout, file: file, line: line, action: action)
 }

Example/Pods/Nimble/Sources/Nimble/Expectation.swift

@@ -1,23 +1,5 @@
 import Foundation
 
-// Deprecated
-internal func expressionMatches<T, U>(_ expression: Expression<T>, matcher: U, to: String, description: String?) -> (Bool, FailureMessage)
-    where U: Matcher, U.ValueType == T {
-    let msg = FailureMessage()
-    msg.userDescription = description
-    msg.to = to
-    do {
-        let pass = try matcher.matches(expression, failureMessage: msg)
-        if msg.actualValue == "" {
-            msg.actualValue = "<\(stringify(try expression.evaluate()))>"
-        }
-        return (pass, msg)
-    } catch let error {
-        msg.stringValue = "unexpected error thrown: <\(error)>"
-        return (false, msg)
-    }
-}
-
 // Deprecated
 internal func expressionDoesNotMatch<T, U>(_ expression: Expression<T>, matcher: U, toNot: String, description: String?) -> (Bool, FailureMessage)
     where U: Matcher, U.ValueType == T {
@@ -75,6 +57,10 @@ public struct Expectation<T> {
 
     public let expression: Expression<T>
 
+    public init(expression: Expression<T>) {
+        self.expression = expression
+    }
+
     public func verify(_ pass: Bool, _ message: FailureMessage) {
         let handler = NimbleEnvironment.activeInstance.assertionHandler
         handler.assert(pass, message: message, location: expression.location)
@@ -85,8 +71,15 @@ public struct Expectation<T> {
     /// DEPRECATED: Tests the actual value using a matcher to match.
     public func to<U>(_ matcher: U, description: String? = nil)
         where U: Matcher, U.ValueType == T {
-        let (pass, msg) = expressionMatches(expression, matcher: matcher, to: "to", description: description)
-        verify(pass, msg)
+            let (pass, msg) = execute(
+                expression,
+                .toMatch,
+                matcher.predicate,
+                to: "to",
+                description: description,
+                captureExceptions: false
+            )
+            verify(pass, msg)
     }
 
     /// DEPRECATED: Tests the actual value using a matcher to not match.
@@ -127,6 +120,6 @@ public struct Expectation<T> {
     }
 
     // see:
-    // - AsyncMatcherWrapper for extension
+    // - `async` for extension
     // - NMBExpectation for Objective-C interface
 }

Example/Pods/Nimble/Sources/Nimble/ExpectationMessage.swift

@@ -152,8 +152,10 @@ public indirect enum ExpectationMessage {
     // Backwards compatibility: converts ExpectationMessage tree to FailureMessage
     internal func update(failureMessage: FailureMessage) {
         switch self {
-        case let .fail(msg):
+        case let .fail(msg) where !msg.isEmpty:
             failureMessage.stringValue = msg
+        case .fail:
+            break
         case let .expectedTo(msg):
             failureMessage.actualValue = nil
             failureMessage.postfixMessage = msg

Example/Pods/Nimble/Sources/Nimble/Matchers/AllPass.swift

@@ -68,7 +68,7 @@ extension NMBObjCMatcher {
     @objc public class func allPassMatcher(_ matcher: NMBMatcher) -> NMBPredicate {
         return NMBPredicate { actualExpression in
             let location = actualExpression.location
-            let actualValue = try! actualExpression.evaluate()
+            let actualValue = try actualExpression.evaluate()
             var nsObjects = [NSObject]()
 
             var collectionIsUsable = true
@@ -99,7 +99,7 @@ extension NMBObjCMatcher {
             let expr = Expression(expression: ({ nsObjects }), location: location)
             let pred: Predicate<[NSObject]> = createPredicate(Predicate { expr in
                 if let predicate = matcher as? NMBPredicate {
-                    return predicate.satisfies(({ try! expr.evaluate() }), location: expr.location).toSwift()
+                    return predicate.satisfies(({ try expr.evaluate() }), location: expr.location).toSwift()
                 } else {
                     let failureMessage = FailureMessage()
                     let result = matcher.matches(
@@ -114,7 +114,7 @@ extension NMBObjCMatcher {
                     )
                 }
             })
-            return try! pred.satisfies(expr).toObjectiveC()
+            return try pred.satisfies(expr).toObjectiveC()
         }
     }
 }

Example/Pods/Nimble/Sources/Nimble/Matchers/Async.swift

@@ -32,76 +32,7 @@ private func async<T>(style: ExpectationStyle, predicate: Predicate<T>, timeout:
             // swiftlint:disable:next line_length
             return PredicateResult(status: .fail, message: lastPredicateResult!.message.appended(message: " (timed out, but main thread was unresponsive)."))
         case .incomplete:
-            internalError("Reached .incomplete state for toEventually(...).")
-        }
-    }
-}
-
-// Deprecated
-internal struct AsyncMatcherWrapper<T, U>: Matcher
-    where U: Matcher, U.ValueType == T {
-    let fullMatcher: U
-    let timeoutInterval: TimeInterval
-    let pollInterval: TimeInterval
-
-    init(fullMatcher: U, timeoutInterval: TimeInterval = AsyncDefaults.Timeout, pollInterval: TimeInterval = AsyncDefaults.PollInterval) {
-      self.fullMatcher = fullMatcher
-      self.timeoutInterval = timeoutInterval
-      self.pollInterval = pollInterval
-    }
-
-    func matches(_ actualExpression: Expression<T>, failureMessage: FailureMessage) -> Bool {
-        let uncachedExpression = actualExpression.withoutCaching()
-        let fnName = "expect(...).toEventually(...)"
-        let result = pollBlock(
-            pollInterval: pollInterval,
-            timeoutInterval: timeoutInterval,
-            file: actualExpression.location.file,
-            line: actualExpression.location.line,
-            fnName: fnName) {
-                try self.fullMatcher.matches(uncachedExpression, failureMessage: failureMessage)
-        }
-        switch result {
-        case let .completed(isSuccessful): return isSuccessful
-        case .timedOut: return false
-        case let .errorThrown(error):
-            failureMessage.stringValue = "an unexpected error thrown: <\(error)>"
-            return false
-        case let .raisedException(exception):
-            failureMessage.stringValue = "an unexpected exception thrown: <\(exception)>"
-            return false
-        case .blockedRunLoop:
-            failureMessage.postfixMessage += " (timed out, but main thread was unresponsive)."
-            return false
-        case .incomplete:
-            internalError("Reached .incomplete state for toEventually(...).")
-        }
-    }
-
-    func doesNotMatch(_ actualExpression: Expression<T>, failureMessage: FailureMessage) -> Bool {
-        let uncachedExpression = actualExpression.withoutCaching()
-        let result = pollBlock(
-            pollInterval: pollInterval,
-            timeoutInterval: timeoutInterval,
-            file: actualExpression.location.file,
-            line: actualExpression.location.line,
-            fnName: "expect(...).toEventuallyNot(...)") {
-                try self.fullMatcher.doesNotMatch(uncachedExpression, failureMessage: failureMessage)
-        }
-        switch result {
-        case let .completed(isSuccessful): return isSuccessful
-        case .timedOut: return false
-        case let .errorThrown(error):
-            failureMessage.stringValue = "an unexpected error thrown: <\(error)>"
-            return false
-        case let .raisedException(exception):
-            failureMessage.stringValue = "an unexpected exception thrown: <\(exception)>"
-            return false
-        case .blockedRunLoop:
-            failureMessage.postfixMessage += " (timed out, but main thread was unresponsive)."
-            return false
-        case .incomplete:
-            internalError("Reached .incomplete state for toEventuallyNot(...).")
+            internalError("Reached .incomplete state for \(fnName)(...).")
         }
     }
 }
@@ -182,14 +113,19 @@ extension Expectation {
     public func toEventually<U>(_ matcher: U, timeout: TimeInterval = AsyncDefaults.Timeout, pollInterval: TimeInterval = AsyncDefaults.PollInterval, description: String? = nil)
         where U: Matcher, U.ValueType == T {
         if expression.isClosure {
-            let (pass, msg) = expressionMatches(
+            let (pass, msg) = execute(
                 expression,
-                matcher: AsyncMatcherWrapper(
-                    fullMatcher: matcher,
-                    timeoutInterval: timeout,
-                    pollInterval: pollInterval),
+                .toMatch,
+                async(
+                    style: .toMatch,
+                    predicate: matcher.predicate,
+                    timeout: timeout,
+                    poll: pollInterval,
+                    fnName: "toEventually"
+                ),
                 to: "to eventually",
-                description: description
+                description: description,
+                captureExceptions: false
             )
             verify(pass, msg)
         } else {
@@ -208,10 +144,13 @@ extension Expectation {
         if expression.isClosure {
             let (pass, msg) = expressionDoesNotMatch(
                 expression,
-                matcher: AsyncMatcherWrapper(
-                    fullMatcher: matcher,
-                    timeoutInterval: timeout,
-                    pollInterval: pollInterval),
+                matcher: async(
+                    style: .toNotMatch,
+                    predicate: matcher.predicate,
+                    timeout: timeout,
+                    poll: pollInterval,
+                    fnName: "toEventuallyNot"
+                ),
                 toNot: "to eventually not",
                 description: description
             )

Example/Pods/Nimble/Sources/Nimble/Matchers/BeAKindOf.swift

@@ -59,8 +59,8 @@ public func beAKindOf(_ expectedClass: AnyClass) -> Predicate<NSObject> {
 
 extension NMBObjCMatcher {
     @objc public class func beAKindOfMatcher(_ expected: AnyClass) -> NMBMatcher {
-        return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in
-            return try! beAKindOf(expected).matches(actualExpression, failureMessage: failureMessage)
+        return NMBPredicate { actualExpression in
+            return try beAKindOf(expected).satisfies(actualExpression).toObjectiveC()
         }
     }
 }

Example/Pods/Nimble/Sources/Nimble/Matchers/BeAnInstanceOf.swift

@@ -48,8 +48,8 @@ public func beAnInstanceOf(_ expectedClass: AnyClass) -> Predicate<NSObject> {
 #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
 extension NMBObjCMatcher {
     @objc public class func beAnInstanceOfMatcher(_ expected: AnyClass) -> NMBMatcher {
-        return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in
-            return try! beAnInstanceOf(expected).matches(actualExpression, failureMessage: failureMessage)
+        return NMBPredicate { actualExpression in
+            return try beAnInstanceOf(expected).satisfies(actualExpression).toObjectiveC()
         }
     }
 }

Example/Pods/Nimble/Sources/Nimble/Matchers/BeCloseTo.swift

@@ -43,22 +43,34 @@ public class NMBObjCBeCloseToMatcher: NSObject, NMBMatcher {
         _delta = within
     }
 
-    @objc public func matches(_ actualExpression: @escaping () -> NSObject!, failureMessage: FailureMessage, location: SourceLocation) -> Bool {
+    @objc public func matches(_ actualExpression: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool {
         let actualBlock: () -> NMBDoubleConvertible? = ({
             return actualExpression() as? NMBDoubleConvertible
         })
         let expr = Expression(expression: actualBlock, location: location)
         let matcher = beCloseTo(self._expected, within: self._delta)
-        return try! matcher.matches(expr, failureMessage: failureMessage)
+
+        do {
+            return try matcher.matches(expr, failureMessage: failureMessage)
+        } catch let error {
+            failureMessage.stringValue = "unexpected error thrown: <\(error)>"
+            return false
+        }
     }
 
-    @objc public func doesNotMatch(_ actualExpression: @escaping () -> NSObject!, failureMessage: FailureMessage, location: SourceLocation) -> Bool {
+    @objc public func doesNotMatch(_ actualExpression: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool {
         let actualBlock: () -> NMBDoubleConvertible? = ({
             return actualExpression() as? NMBDoubleConvertible
         })
         let expr = Expression(expression: actualBlock, location: location)
         let matcher = beCloseTo(self._expected, within: self._delta)
-        return try! matcher.doesNotMatch(expr, failureMessage: failureMessage)
+
+        do {
+            return try matcher.doesNotMatch(expr, failureMessage: failureMessage)
+        } catch let error {
+            failureMessage.stringValue = "unexpected error thrown: <\(error)>"
+            return false
+        }
     }
 
     @objc public var within: (CDouble) -> NMBObjCBeCloseToMatcher {

Example/Pods/Nimble/Sources/Nimble/Matchers/BeEmpty.swift

@@ -66,14 +66,14 @@ extension NMBObjCMatcher {
     @objc public class func beEmptyMatcher() -> NMBPredicate {
         return NMBPredicate { actualExpression in
             let location = actualExpression.location
-            let actualValue = try! actualExpression.evaluate()
+            let actualValue = try actualExpression.evaluate()
 
             if let value = actualValue as? NMBCollection {
                 let expr = Expression(expression: ({ value as NMBCollection }), location: location)
-                return try! beEmpty().satisfies(expr).toObjectiveC()
+                return try beEmpty().satisfies(expr).toObjectiveC()
             } else if let value = actualValue as? NSString {
                 let expr = Expression(expression: ({ value as String }), location: location)
-                return try! beEmpty().satisfies(expr).toObjectiveC()
+                return try beEmpty().satisfies(expr).toObjectiveC()
             } else if let actualValue = actualValue {
                 // swiftlint:disable:next line_length
                 let badTypeErrorMsg = "be empty (only works for NSArrays, NSSets, NSIndexSets, NSDictionaries, NSHashTables, and NSStrings)"

Example/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThan.swift

@@ -13,13 +13,13 @@ public func beGreaterThan<T: Comparable>(_ expectedValue: T?) -> Predicate<T> {
 
 /// A Nimble matcher that succeeds when the actual value is greater than the expected value.
 public func beGreaterThan(_ expectedValue: NMBComparable?) -> Predicate<NMBComparable> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        failureMessage.postfixMessage = "be greater than <\(stringify(expectedValue))>"
+    let errorMessage = "be greater than <\(stringify(expectedValue))>"
+    return Predicate.simple(errorMessage) { actualExpression in
         let actualValue = try actualExpression.evaluate()
         let matches = actualValue != nil
             && actualValue!.NMB_compare(expectedValue) == ComparisonResult.orderedDescending
-        return matches
-    }.requireNonNil
+        return PredicateStatus(bool: matches)
+    }
 }
 
 public func ><T: Comparable>(lhs: Expectation<T>, rhs: T) {
@@ -35,7 +35,7 @@ extension NMBObjCMatcher {
     @objc public class func beGreaterThanMatcher(_ expected: NMBComparable?) -> NMBObjCMatcher {
         return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in
             let expr = actualExpression.cast { $0 as? NMBComparable }
-            return try! beGreaterThan(expected).matches(expr, failureMessage: failureMessage)
+            return try beGreaterThan(expected).matches(expr, failureMessage: failureMessage)
         }
     }
 }

Example/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift

@@ -3,25 +3,25 @@ import Foundation
 /// A Nimble matcher that succeeds when the actual value is greater than
 /// or equal to the expected value.
 public func beGreaterThanOrEqualTo<T: Comparable>(_ expectedValue: T?) -> Predicate<T> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        failureMessage.postfixMessage = "be greater than or equal to <\(stringify(expectedValue))>"
+    let message = "be greater than or equal to <\(stringify(expectedValue))>"
+    return Predicate.simple(message) { actualExpression in
         let actualValue = try actualExpression.evaluate()
         if let actual = actualValue, let expected = expectedValue {
-            return actual >= expected
+            return PredicateStatus(bool: actual >= expected)
         }
-        return false
-    }.requireNonNil
+        return .fail
+    }
 }
 
 /// A Nimble matcher that succeeds when the actual value is greater than
 /// or equal to the expected value.
 public func beGreaterThanOrEqualTo<T: NMBComparable>(_ expectedValue: T?) -> Predicate<T> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        failureMessage.postfixMessage = "be greater than or equal to <\(stringify(expectedValue))>"
+    let message = "be greater than or equal to <\(stringify(expectedValue))>"
+    return Predicate.simple(message) { actualExpression in
         let actualValue = try actualExpression.evaluate()
         let matches = actualValue != nil && actualValue!.NMB_compare(expectedValue) != ComparisonResult.orderedAscending
-        return matches
-    }.requireNonNil
+        return PredicateStatus(bool: matches)
+    }
 }
 
 public func >=<T: Comparable>(lhs: Expectation<T>, rhs: T) {
@@ -37,7 +37,7 @@ extension NMBObjCMatcher {
     @objc public class func beGreaterThanOrEqualToMatcher(_ expected: NMBComparable?) -> NMBObjCMatcher {
         return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in
             let expr = actualExpression.cast { $0 as? NMBComparable }
-            return try! beGreaterThanOrEqualTo(expected).matches(expr, failureMessage: failureMessage)
+            return try beGreaterThanOrEqualTo(expected).matches(expr, failureMessage: failureMessage)
         }
     }
 }

Example/Pods/Nimble/Sources/Nimble/Matchers/BeIdenticalTo.swift

@@ -3,20 +3,27 @@ import Foundation
 /// A Nimble matcher that succeeds when the actual value is the same instance
 /// as the expected instance.
 public func beIdenticalTo(_ expected: Any?) -> Predicate<Any> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
+    return Predicate.define { actualExpression in
         #if os(Linux)
             let actual = try actualExpression.evaluate() as? AnyObject
         #else
             let actual = try actualExpression.evaluate() as AnyObject?
         #endif
-        failureMessage.actualValue = "\(identityAsString(actual))"
-        failureMessage.postfixMessage = "be identical to \(identityAsString(expected))"
+
+        let bool: Bool
         #if os(Linux)
-            return actual === (expected as? AnyObject) && actual !== nil
+            bool = actual === (expected as? AnyObject) && actual !== nil
         #else
-            return actual === (expected as AnyObject?) && actual !== nil
+            bool = actual === (expected as AnyObject?) && actual !== nil
         #endif
-    }.requireNonNil
+        return PredicateResult(
+            bool: bool,
+            message: .expectedCustomValueTo(
+                "be identical to \(identityAsString(expected))",
+                "\(identityAsString(actual))"
+            )
+        )
+    }
 }
 
 public func === (lhs: Expectation<Any>, rhs: Any?) {
@@ -39,7 +46,7 @@ extension NMBObjCMatcher {
     @objc public class func beIdenticalToMatcher(_ expected: NSObject?) -> NMBObjCMatcher {
         return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in
             let aExpr = actualExpression.cast { $0 as Any? }
-            return try! beIdenticalTo(expected).matches(aExpr, failureMessage: failureMessage)
+            return try beIdenticalTo(expected).matches(aExpr, failureMessage: failureMessage)
         }
     }
 }

Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThan.swift

@@ -2,23 +2,23 @@ import Foundation
 
 /// A Nimble matcher that succeeds when the actual value is less than the expected value.
 public func beLessThan<T: Comparable>(_ expectedValue: T?) -> Predicate<T> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        failureMessage.postfixMessage = "be less than <\(stringify(expectedValue))>"
+    let message = "be less than <\(stringify(expectedValue))>"
+    return Predicate.simple(message) { actualExpression in
         if let actual = try actualExpression.evaluate(), let expected = expectedValue {
-            return actual < expected
+            return PredicateStatus(bool: actual < expected)
         }
-        return false
-    }.requireNonNil
+        return .fail
+    }
 }
 
 /// A Nimble matcher that succeeds when the actual value is less than the expected value.
 public func beLessThan(_ expectedValue: NMBComparable?) -> Predicate<NMBComparable> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        failureMessage.postfixMessage = "be less than <\(stringify(expectedValue))>"
+    let message = "be less than <\(stringify(expectedValue))>"
+    return Predicate.simple(message) { actualExpression in
         let actualValue = try actualExpression.evaluate()
         let matches = actualValue != nil && actualValue!.NMB_compare(expectedValue) == ComparisonResult.orderedAscending
-        return matches
-    }.requireNonNil
+        return PredicateStatus(bool: matches)
+    }
 }
 
 public func <<T: Comparable>(lhs: Expectation<T>, rhs: T) {
@@ -34,7 +34,7 @@ extension NMBObjCMatcher {
     @objc public class func beLessThanMatcher(_ expected: NMBComparable?) -> NMBObjCMatcher {
         return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in
             let expr = actualExpression.cast { $0 as? NMBComparable }
-            return try! beLessThan(expected).matches(expr, failureMessage: failureMessage)
+            return try beLessThan(expected).matches(expr, failureMessage: failureMessage)
         }
     }
 }

Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThanOrEqual.swift

@@ -3,23 +3,22 @@ import Foundation
 /// A Nimble matcher that succeeds when the actual value is less than
 /// or equal to the expected value.
 public func beLessThanOrEqualTo<T: Comparable>(_ expectedValue: T?) -> Predicate<T> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        failureMessage.postfixMessage = "be less than or equal to <\(stringify(expectedValue))>"
+    return Predicate.simple("be less than or equal to <\(stringify(expectedValue))>") { actualExpression in
         if let actual = try actualExpression.evaluate(), let expected = expectedValue {
-            return actual <= expected
+            return PredicateStatus(bool: actual <= expected)
         }
-        return false
-    }.requireNonNil
+        return .fail
+    }
 }
 
 /// A Nimble matcher that succeeds when the actual value is less than
 /// or equal to the expected value.
 public func beLessThanOrEqualTo<T: NMBComparable>(_ expectedValue: T?) -> Predicate<T> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        failureMessage.postfixMessage = "be less than or equal to <\(stringify(expectedValue))>"
+    return Predicate.simple("be less than or equal to <\(stringify(expectedValue))>") { actualExpression in
         let actualValue = try actualExpression.evaluate()
-        return actualValue != nil && actualValue!.NMB_compare(expectedValue) != ComparisonResult.orderedDescending
-    }.requireNonNil
+        let matches = actualValue.map { $0.NMB_compare(expectedValue) != .orderedDescending } ?? false
+        return PredicateStatus(bool: matches)
+    }
 }
 
 public func <=<T: Comparable>(lhs: Expectation<T>, rhs: T) {
@@ -35,7 +34,7 @@ extension NMBObjCMatcher {
     @objc public class func beLessThanOrEqualToMatcher(_ expected: NMBComparable?) -> NMBObjCMatcher {
         return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in
             let expr = actualExpression.cast { $0 as? NMBComparable }
-            return try! beLessThanOrEqualTo(expected).matches(expr, failureMessage: failureMessage)
+            return try beLessThanOrEqualTo(expected).matches(expr, failureMessage: failureMessage)
         }
     }
 }

Example/Pods/Nimble/Sources/Nimble/Matchers/BeLogical.swift

@@ -139,28 +139,28 @@ extension NMBObjCMatcher {
     @objc public class func beTruthyMatcher() -> NMBObjCMatcher {
         return NMBObjCMatcher { actualExpression, failureMessage in
             let expr = actualExpression.cast { ($0 as? NSNumber)?.boolValue ?? false }
-            return try! beTruthy().matches(expr, failureMessage: failureMessage)
+            return try beTruthy().matches(expr, failureMessage: failureMessage)
         }
     }
 
     @objc public class func beFalsyMatcher() -> NMBObjCMatcher {
         return NMBObjCMatcher { actualExpression, failureMessage in
             let expr = actualExpression.cast { ($0 as? NSNumber)?.boolValue ?? false }
-            return try! beFalsy().matches(expr, failureMessage: failureMessage)
+            return try beFalsy().matches(expr, failureMessage: failureMessage)
         }
     }
 
     @objc public class func beTrueMatcher() -> NMBObjCMatcher {
         return NMBObjCMatcher { actualExpression, failureMessage in
             let expr = actualExpression.cast { ($0 as? NSNumber)?.boolValue ?? false }
-            return try! beTrue().matches(expr, failureMessage: failureMessage)
+            return try beTrue().matches(expr, failureMessage: failureMessage)
         }
     }
 
     @objc public class func beFalseMatcher() -> NMBObjCMatcher {
         return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in
             let expr = actualExpression.cast { ($0 as? NSNumber)?.boolValue ?? false }
-            return try! beFalse().matches(expr, failureMessage: failureMessage)
+            return try beFalse().matches(expr, failureMessage: failureMessage)
         }
     }
 }

Example/Pods/Nimble/Sources/Nimble/Matchers/BeNil.swift

@@ -12,7 +12,7 @@ public func beNil<T>() -> Predicate<T> {
 extension NMBObjCMatcher {
     @objc public class func beNilMatcher() -> NMBObjCMatcher {
         return NMBObjCMatcher { actualExpression, failureMessage in
-            return try! beNil().matches(actualExpression, failureMessage: failureMessage)
+            return try beNil().matches(actualExpression, failureMessage: failureMessage)
         }
     }
 }

Example/Pods/Nimble/Sources/Nimble/Matchers/BeVoid.swift

@@ -2,10 +2,9 @@ import Foundation
 
 /// A Nimble matcher that succeeds when the actual value is Void.
 public func beVoid() -> Predicate<()> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        failureMessage.postfixMessage = "be void"
+    return Predicate.simpleNilable("be void") { actualExpression in
         let actualValue: ()? = try actualExpression.evaluate()
-        return actualValue != nil
+        return PredicateStatus(bool: actualValue != nil)
     }
 }
 

Example/Pods/Nimble/Sources/Nimble/Matchers/BeginWith.swift

@@ -46,13 +46,13 @@ public func beginWith(_ startingSubstring: String) -> Predicate<String> {
 extension NMBObjCMatcher {
     @objc public class func beginWithMatcher(_ expected: Any) -> NMBObjCMatcher {
         return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in
-            let actual = try! actualExpression.evaluate()
+            let actual = try actualExpression.evaluate()
             if (actual as? String) != nil {
                 let expr = actualExpression.cast { $0 as? String }
-                return try! beginWith(expected as! String).matches(expr, failureMessage: failureMessage)
+                return try beginWith(expected as! String).matches(expr, failureMessage: failureMessage)
             } else {
                 let expr = actualExpression.cast { $0 as? NMBOrderedCollection }
-                return try! beginWith(expected).matches(expr, failureMessage: failureMessage)
+                return try beginWith(expected).matches(expr, failureMessage: failureMessage)
             }
         }
     }

Example/Pods/Nimble/Sources/Nimble/Matchers/Contain.swift

@@ -8,15 +8,15 @@ public func contain<S: Sequence, T: Equatable>(_ items: T...) -> Predicate<S>
 
 public func contain<S: Sequence, T: Equatable>(_ items: [T]) -> Predicate<S>
     where S.Iterator.Element == T {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        failureMessage.postfixMessage = "contain <\(arrayAsString(items))>"
+    return Predicate.simple("contain <\(arrayAsString(items))>") { actualExpression in
         if let actual = try actualExpression.evaluate() {
-            return items.all {
+            let matches = items.all {
                 return actual.contains($0)
             }
+            return PredicateStatus(bool: matches)
         }
-        return false
-    }.requireNonNil
+        return .fail
+    }
 }
 
 /// A Nimble matcher that succeeds when the actual string contains the expected substring.
@@ -25,16 +25,16 @@ public func contain(_ substrings: String...) -> Predicate<String> {
 }
 
 public func contain(_ substrings: [String]) -> Predicate<String> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        failureMessage.postfixMessage = "contain <\(arrayAsString(substrings))>"
+    return Predicate.simple("contain <\(arrayAsString(substrings))>") { actualExpression in
         if let actual = try actualExpression.evaluate() {
-            return substrings.all {
+            let matches = substrings.all {
                 let range = actual.range(of: $0)
                 return range != nil && !range!.isEmpty
             }
+            return PredicateStatus(bool: matches)
         }
-        return false
-    }.requireNonNil
+        return .fail
+    }
 }
 
 /// A Nimble matcher that succeeds when the actual string contains the expected substring.
@@ -43,13 +43,13 @@ public func contain(_ substrings: NSString...) -> Predicate<NSString> {
 }
 
 public func contain(_ substrings: [NSString]) -> Predicate<NSString> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        failureMessage.postfixMessage = "contain <\(arrayAsString(substrings))>"
+    return Predicate.simple("contain <\(arrayAsString(substrings))>") { actualExpression in
         if let actual = try actualExpression.evaluate() {
-            return substrings.all { actual.range(of: $0.description).length != 0 }
+            let matches = substrings.all { actual.range(of: $0.description).length != 0 }
+            return PredicateStatus(bool: matches)
         }
-        return false
-    }.requireNonNil
+        return .fail
+    }
 }
 
 /// A Nimble matcher that succeeds when the actual collection contains the expected object.
@@ -58,13 +58,13 @@ public func contain(_ items: Any?...) -> Predicate<NMBContainer> {
 }
 
 public func contain(_ items: [Any?]) -> Predicate<NMBContainer> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        failureMessage.postfixMessage = "contain <\(arrayAsString(items))>"
-        guard let actual = try actualExpression.evaluate() else { return false }
-        return items.all { item in
-            return item != nil && actual.contains(item!)
+    return Predicate.simple("contain <\(arrayAsString(items))>") { actualExpression in
+        guard let actual = try actualExpression.evaluate() else { return .fail }
+        let matches = items.all { item in
+            return item.map { actual.contains($0) } ?? false
         }
-    }.requireNonNil
+        return PredicateStatus(bool: matches)
+    }
 }
 
 #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
@@ -72,16 +72,16 @@ extension NMBObjCMatcher {
     @objc public class func containMatcher(_ expected: [NSObject]) -> NMBObjCMatcher {
         return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in
             let location = actualExpression.location
-            let actualValue = try! actualExpression.evaluate()
+            let actualValue = try actualExpression.evaluate()
             if let value = actualValue as? NMBContainer {
                 let expr = Expression(expression: ({ value as NMBContainer }), location: location)
 
                 // A straightforward cast on the array causes this to crash, so we have to cast the individual items
                 let expectedOptionals: [Any?] = expected.map({ $0 as Any? })
-                return try! contain(expectedOptionals).matches(expr, failureMessage: failureMessage)
+                return try contain(expectedOptionals).matches(expr, failureMessage: failureMessage)
             } else if let value = actualValue as? NSString {
                 let expr = Expression(expression: ({ value as String }), location: location)
-                return try! contain(expected as! [String]).matches(expr, failureMessage: failureMessage)
+                return try contain(expected as! [String]).matches(expr, failureMessage: failureMessage)
             } else if actualValue != nil {
                 // swiftlint:disable:next line_length
                 failureMessage.postfixMessage = "contain <\(arrayAsString(expected))> (only works for NSArrays, NSSets, NSHashTables, and NSStrings)"

Example/Pods/Nimble/Sources/Nimble/Matchers/ContainElementSatisfying.swift

@@ -2,34 +2,33 @@ import Foundation
 
 public func containElementSatisfying<S: Sequence, T>(_ predicate: @escaping ((T) -> Bool), _ predicateDescription: String = "") -> Predicate<S> where S.Iterator.Element == T {
 
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        failureMessage.actualValue = nil
-
+    return Predicate.define { actualExpression in
+        let message: ExpectationMessage
         if predicateDescription == "" {
-            failureMessage.postfixMessage = "find object in collection that satisfies predicate"
+            message = .expectedTo("find object in collection that satisfies predicate")
         } else {
-            failureMessage.postfixMessage = "find object in collection \(predicateDescription)"
+            message = .expectedTo("find object in collection \(predicateDescription)")
         }
 
         if let sequence = try actualExpression.evaluate() {
             for object in sequence {
                 if predicate(object) {
-                    return true
+                    return PredicateResult(bool: true, message: message)
                 }
             }
 
-            return false
+            return PredicateResult(bool: false, message: message)
         }
 
-        return false
-    }.requireNonNil
+        return PredicateResult(status: .fail, message: message)
+    }
 }
 
 #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
     extension NMBObjCMatcher {
         @objc public class func containElementSatisfyingMatcher(_ predicate: @escaping ((NSObject) -> Bool)) -> NMBObjCMatcher {
             return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in
-                let value = try! actualExpression.evaluate()
+                let value = try actualExpression.evaluate()
                 guard let enumeration = value as? NSFastEnumeration else {
                     // swiftlint:disable:next line_length
                     failureMessage.postfixMessage = "containElementSatisfying must be provided an NSFastEnumeration object"
@@ -51,8 +50,7 @@ public func containElementSatisfying<S: Sequence, T>(_ predicate: @escaping ((T)
                 }
 
                 failureMessage.actualValue = nil
-                failureMessage.postfixMessage = ""
-                failureMessage.to = "to find object in collection that satisfies predicate"
+                failureMessage.postfixMessage = "find object in collection that satisfies predicate"
                 return false
             }
         }

Example/Pods/Nimble/Sources/Nimble/Matchers/EndWith.swift

@@ -4,9 +4,7 @@ import Foundation
 /// is equal to the expected value.
 public func endWith<S: Sequence, T: Equatable>(_ endingElement: T) -> Predicate<S>
     where S.Iterator.Element == T {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        failureMessage.postfixMessage = "end with <\(endingElement)>"
-
+    return Predicate.simple("end with <\(endingElement)>") { actualExpression in
         if let actualValue = try actualExpression.evaluate() {
             var actualGenerator = actualValue.makeIterator()
             var lastItem: T?
@@ -16,55 +14,53 @@ public func endWith<S: Sequence, T: Equatable>(_ endingElement: T) -> Predicate<
                 item = actualGenerator.next()
             } while(item != nil)
 
-            return lastItem == endingElement
+            return PredicateStatus(bool: lastItem == endingElement)
         }
-        return false
-    }.requireNonNil
+        return .fail
+    }
 }
 
 /// A Nimble matcher that succeeds when the actual collection's last element
 /// is equal to the expected object.
 public func endWith(_ endingElement: Any) -> Predicate<NMBOrderedCollection> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        failureMessage.postfixMessage = "end with <\(endingElement)>"
-        guard let collection = try actualExpression.evaluate() else { return false }
-        guard collection.count > 0 else { return false }
+    return Predicate.simple("end with <\(endingElement)>") { actualExpression in
+        guard let collection = try actualExpression.evaluate() else { return .fail }
+        guard collection.count > 0 else { return PredicateStatus(bool: false) }
         #if os(Linux)
             guard let collectionValue = collection.object(at: collection.count - 1) as? NSObject else {
-                return false
+                return .fail
             }
         #else
             let collectionValue = collection.object(at: collection.count - 1) as AnyObject
         #endif
 
-        return collectionValue.isEqual(endingElement)
-    }.requireNonNil
+        return PredicateStatus(bool: collectionValue.isEqual(endingElement))
+    }
 }
 
 /// A Nimble matcher that succeeds when the actual string contains the expected substring
 /// where the expected substring's location is the actual string's length minus the
 /// expected substring's length.
 public func endWith(_ endingSubstring: String) -> Predicate<String> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        failureMessage.postfixMessage = "end with <\(endingSubstring)>"
+    return Predicate.simple("end with <\(endingSubstring)>") { actualExpression in
         if let collection = try actualExpression.evaluate() {
-            return collection.hasSuffix(endingSubstring)
+            return PredicateStatus(bool: collection.hasSuffix(endingSubstring))
         }
-        return false
-    }.requireNonNil
+        return .fail
+    }
 }
 
 #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
 extension NMBObjCMatcher {
     @objc public class func endWithMatcher(_ expected: Any) -> NMBObjCMatcher {
         return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in
-            let actual = try! actualExpression.evaluate()
+            let actual = try actualExpression.evaluate()
             if (actual as? String) != nil {
                 let expr = actualExpression.cast { $0 as? String }
-                return try! endWith(expected as! String).matches(expr, failureMessage: failureMessage)
+                return try endWith(expected as! String).matches(expr, failureMessage: failureMessage)
             } else {
                 let expr = actualExpression.cast { $0 as? NMBOrderedCollection }
-                return try! endWith(expected).matches(expr, failureMessage: failureMessage)
+                return try endWith(expected).matches(expr, failureMessage: failureMessage)
             }
         }
     }

Example/Pods/Nimble/Sources/Nimble/Matchers/Equal.swift

@@ -212,8 +212,8 @@ public func !=<T, C: Equatable>(lhs: Expectation<[T: C]>, rhs: [T: C]?) {
 #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
 extension NMBObjCMatcher {
     @objc public class func equalMatcher(_ expected: NSObject) -> NMBMatcher {
-        return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in
-            return try! equal(expected).matches(actualExpression, failureMessage: failureMessage)
+        return NMBPredicate { actualExpression in
+            return try equal(expected).satisfies(actualExpression).toObjectiveC()
         }
     }
 }

Example/Pods/Nimble/Sources/Nimble/Matchers/HaveCount.swift

@@ -8,33 +8,39 @@ import Foundation
 /// A Nimble matcher that succeeds when the actual Collection's count equals
 /// the expected value
 public func haveCount<T: Collection>(_ expectedValue: T.IndexDistance) -> Predicate<T> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
+    return Predicate.define { actualExpression in
         if let actualValue = try actualExpression.evaluate() {
-            // swiftlint:disable:next line_length
-            failureMessage.postfixMessage = "have \(prettyCollectionType(actualValue)) with count \(stringify(expectedValue))"
+            let message = ExpectationMessage
+                .expectedCustomValueTo(
+                    "have \(prettyCollectionType(actualValue)) with count \(stringify(expectedValue))",
+                    "\(actualValue.count)"
+                )
+                .appended(details: "Actual Value: \(stringify(actualValue))")
+
             let result = expectedValue == actualValue.count
-            failureMessage.actualValue = "\(actualValue.count)"
-            failureMessage.extendedMessage = "Actual Value: \(stringify(actualValue))"
-            return result
+            return PredicateResult(bool: result, message: message)
         } else {
-            return false
+            return PredicateResult(status: .fail, message: .fail(""))
         }
-    }.requireNonNil
+    }
 }
 
 /// A Nimble matcher that succeeds when the actual collection's count equals
 /// the expected value
 public func haveCount(_ expectedValue: Int) -> Predicate<NMBCollection> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
+    return Predicate { actualExpression in
         if let actualValue = try actualExpression.evaluate() {
-            // swiftlint:disable:next line_length
-            failureMessage.postfixMessage = "have \(prettyCollectionType(actualValue)) with count \(stringify(expectedValue))"
+            let message = ExpectationMessage
+                .expectedCustomValueTo(
+                    "have \(prettyCollectionType(actualValue)) with count \(stringify(expectedValue))",
+                    "\(actualValue.count)"
+                )
+                .appended(details: "Actual Value: \(stringify(actualValue))")
+
             let result = expectedValue == actualValue.count
-            failureMessage.actualValue = "\(actualValue.count)"
-            failureMessage.extendedMessage = "Actual Value: \(stringify(actualValue))"
-            return result
+            return PredicateResult(bool: result, message: message)
         } else {
-            return false
+            return PredicateResult(status: .fail, message: .fail(""))
         }
     }
 }
@@ -44,10 +50,10 @@ extension NMBObjCMatcher {
     @objc public class func haveCountMatcher(_ expected: NSNumber) -> NMBObjCMatcher {
         return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in
             let location = actualExpression.location
-            let actualValue = try! actualExpression.evaluate()
+            let actualValue = try actualExpression.evaluate()
             if let value = actualValue as? NMBCollection {
                 let expr = Expression(expression: ({ value as NMBCollection}), location: location)
-                return try! haveCount(expected.intValue).matches(expr, failureMessage: failureMessage)
+                return try haveCount(expected.intValue).matches(expr, failureMessage: failureMessage)
             } else if let actualValue = actualValue {
                 failureMessage.postfixMessage = "get type of NSArray, NSSet, NSDictionary, or NSHashTable"
                 failureMessage.actualValue = "\(String(describing: type(of: actualValue)))"

Example/Pods/Nimble/Sources/Nimble/Matchers/Match.swift

@@ -3,26 +3,25 @@ import Foundation
 /// A Nimble matcher that succeeds when the actual string satisfies the regular expression
 /// described by the expected string.
 public func match(_ expectedValue: String?) -> Predicate<String> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        failureMessage.postfixMessage = "match <\(stringify(expectedValue))>"
-
+    return Predicate.simple("match <\(stringify(expectedValue))>") { actualExpression in
         if let actual = try actualExpression.evaluate() {
             if let regexp = expectedValue {
-                return actual.range(of: regexp, options: .regularExpression) != nil
+                let bool = actual.range(of: regexp, options: .regularExpression) != nil
+                return PredicateStatus(bool: bool)
             }
         }
 
-        return false
-    }.requireNonNil
+        return .fail
+    }
 }
 
 #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
 
 extension NMBObjCMatcher {
     @objc public class func matchMatcher(_ expected: NSString) -> NMBMatcher {
-        return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in
+        return NMBPredicate { actualExpression in
             let actual = actualExpression.cast { $0 as? String }
-            return try! match(expected.description).matches(actual, failureMessage: failureMessage)
+            return try match(expected.description).satisfies(actual).toObjectiveC()
         }
     }
 }

Example/Pods/Nimble/Sources/Nimble/Matchers/MatchError.swift

@@ -6,16 +6,24 @@ import Foundation
 /// Errors are tried to be compared by their implementation of Equatable,
 /// otherwise they fallback to comparison by _domain and _code.
 public func matchError<T: Error>(_ error: T) -> Predicate<Error> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        let actualError: Error? = try actualExpression.evaluate()
+    return Predicate.define { actualExpression in
+        let actualError = try actualExpression.evaluate()
+
+        let failureMessage = FailureMessage()
+        setFailureMessageForError(
+            failureMessage,
+            postfixMessageVerb: "match",
+            actualError: actualError,
+            error: error
+        )
 
-        setFailureMessageForError(failureMessage, postfixMessageVerb: "match", actualError: actualError, error: error)
         var matches = false
         if let actualError = actualError, errorMatchesExpectedError(actualError, expectedError: error) {
             matches = true
         }
-        return matches
-    }.requireNonNil
+
+        return PredicateResult(bool: matches, message: failureMessage.toExpectationMessage())
+    }
 }
 
 /// A Nimble matcher that succeeds when the actual expression evaluates to an
@@ -24,35 +32,45 @@ public func matchError<T: Error>(_ error: T) -> Predicate<Error> {
 /// Errors are tried to be compared by their implementation of Equatable,
 /// otherwise they fallback to comparision by _domain and _code.
 public func matchError<T: Error & Equatable>(_ error: T) -> Predicate<Error> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        let actualError: Error? = try actualExpression.evaluate()
+    return Predicate.define { actualExpression in
+        let actualError = try actualExpression.evaluate()
 
-        setFailureMessageForError(failureMessage, postfixMessageVerb: "match", actualError: actualError, error: error)
+        let failureMessage = FailureMessage()
+        setFailureMessageForError(
+            failureMessage,
+            postfixMessageVerb: "match",
+            actualError: actualError,
+            error: error
+        )
 
         var matches = false
         if let actualError = actualError as? T, error == actualError {
             matches = true
         }
-        return matches
-    }.requireNonNil
+
+        return PredicateResult(bool: matches, message: failureMessage.toExpectationMessage())
+    }
 }
 
 /// A Nimble matcher that succeeds when the actual expression evaluates to an
 /// error of the specified type
 public func matchError<T: Error>(_ errorType: T.Type) -> Predicate<Error> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-        let actualError: Error? = try actualExpression.evaluate()
+    return Predicate.define { actualExpression in
+        let actualError = try actualExpression.evaluate()
 
+        let failureMessage = FailureMessage()
         setFailureMessageForError(
             failureMessage,
             postfixMessageVerb: "match",
             actualError: actualError,
             errorType: errorType
         )
+
         var matches = false
         if actualError as? T != nil {
             matches = true
         }
-        return matches
-    }.requireNonNil
+
+        return PredicateResult(bool: matches, message: failureMessage.toExpectationMessage())
+    }
 }

Example/Pods/Nimble/Sources/Nimble/Matchers/MatcherProtocols.swift

@@ -31,8 +31,8 @@ extension Matcher {
 #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
 /// Objective-C interface to the Swift variant of Matcher.
 @objc public protocol NMBMatcher {
-    func matches(_ actualBlock: @escaping () -> NSObject!, failureMessage: FailureMessage, location: SourceLocation) -> Bool
-    func doesNotMatch(_ actualBlock: @escaping () -> NSObject!, failureMessage: FailureMessage, location: SourceLocation) -> Bool
+    func matches(_ actualBlock: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool
+    func doesNotMatch(_ actualBlock: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool
 }
 #endif
 

Example/Pods/Nimble/Sources/Nimble/Matchers/PostNotification.swift

@@ -74,7 +74,8 @@ public func postNotifications<T>(
     let collector = NotificationCollector(notificationCenter: center)
     collector.startObserving()
     var once: Bool = false
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
+
+    return Predicate { actualExpression in
         let collectorNotificationsExpression = Expression(memoizedExpression: { _ in
             return collector.observedNotifications
             }, location: actualExpression.location, withoutCaching: true)
@@ -85,12 +86,13 @@ public func postNotifications<T>(
             _ = try actualExpression.evaluate()
         }
 
+        let failureMessage = FailureMessage()
         let match = try notificationsMatcher.matches(collectorNotificationsExpression, failureMessage: failureMessage)
         if collector.observedNotifications.isEmpty {
             failureMessage.actualValue = "no notifications"
         } else {
             failureMessage.actualValue = "<\(stringify(collector.observedNotifications))>"
         }
-        return match
+        return PredicateResult(bool: match, message: failureMessage.toExpectationMessage())
     }
 }

Example/Pods/Nimble/Sources/Nimble/Matchers/Predicate.swift

@@ -82,8 +82,8 @@ extension Predicate {
     }
 }
 
-// Question: Should this be exposed? It's safer to not for now and decide later.
-internal enum ExpectationStyle {
+// The Expectation style intended for comparison to a PredicateStatus.
+public enum ExpectationStyle {
     case toMatch, toNotMatch
 }
 
@@ -91,9 +91,9 @@ internal enum ExpectationStyle {
 /// predicate.
 public struct PredicateResult {
     /// Status indicates if the predicate matches, does not match, or fails.
-    var status: PredicateStatus
+    public var status: PredicateStatus
     /// The error message that can be displayed if it does not match
-    var message: ExpectationMessage
+    public var message: ExpectationMessage
 
     /// Constructs a new PredicateResult with a given status and error message
     public init(status: PredicateStatus, message: ExpectationMessage) {
@@ -108,7 +108,7 @@ public struct PredicateResult {
     }
 
     /// Converts the result to a boolean based on what the expectation intended
-    internal func toBoolean(expectation style: ExpectationStyle) -> Bool {
+    public func toBoolean(expectation style: ExpectationStyle) -> Bool {
         return status.toBoolean(expectation: style)
     }
 }
@@ -242,7 +242,7 @@ extension Predicate {
 }
 
 #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
-public typealias PredicateBlock = (_ actualExpression: Expression<NSObject>) -> NMBPredicateResult
+public typealias PredicateBlock = (_ actualExpression: Expression<NSObject>) throws -> NMBPredicateResult
 
 public class NMBPredicate: NSObject {
     private let predicate: PredicateBlock
@@ -251,20 +251,24 @@ public class NMBPredicate: NSObject {
         self.predicate = predicate
     }
 
-    func satisfies(_ expression: @escaping () -> NSObject!, location: SourceLocation) -> NMBPredicateResult {
+    func satisfies(_ expression: @escaping () throws -> NSObject?, location: SourceLocation) -> NMBPredicateResult {
         let expr = Expression(expression: expression, location: location)
-        return self.predicate(expr)
+        do {
+            return try self.predicate(expr)
+        } catch let error {
+            return PredicateResult(status: .fail, message: .fail("unexpected error thrown: <\(error)>")).toObjectiveC()
+        }
     }
 }
 
 extension NMBPredicate: NMBMatcher {
-    public func matches(_ actualBlock: @escaping () -> NSObject!, failureMessage: FailureMessage, location: SourceLocation) -> Bool {
+    public func matches(_ actualBlock: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool {
         let result = satisfies(actualBlock, location: location).toSwift()
         result.message.update(failureMessage: failureMessage)
         return result.status.toBoolean(expectation: .toMatch)
     }
 
-    public func doesNotMatch(_ actualBlock: @escaping () -> NSObject!, failureMessage: FailureMessage, location: SourceLocation) -> Bool {
+    public func doesNotMatch(_ actualBlock: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool {
         let result = satisfies(actualBlock, location: location).toSwift()
         result.message.update(failureMessage: failureMessage)
         return result.status.toBoolean(expectation: .toNotMatch)

Example/Pods/Nimble/Sources/Nimble/Matchers/RaisesException.swift

@@ -17,8 +17,7 @@ public func raiseException(
     reason: String? = nil,
     userInfo: NSDictionary? = nil,
     closure: ((NSException) -> Void)? = nil) -> Predicate<Any> {
-        return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-
+        return Predicate { actualExpression in
             var exception: NSException?
             let capture = NMBExceptionCapture(handler: ({ e in
                 exception = e
@@ -26,9 +25,9 @@ public func raiseException(
 
             capture.tryBlock {
                 _ = try! actualExpression.evaluate()
-                return
             }
 
+            let failureMessage = FailureMessage()
             setFailureMessageForException(
                 failureMessage,
                 exception: exception,
@@ -37,13 +36,15 @@ public func raiseException(
                 userInfo: userInfo,
                 closure: closure
             )
-            return exceptionMatchesNonNilFieldsOrClosure(
+
+            let matches = exceptionMatchesNonNilFieldsOrClosure(
                 exception,
                 named: named,
                 reason: reason,
                 userInfo: userInfo,
                 closure: closure
             )
+            return PredicateResult(bool: matches, message: failureMessage.toExpectationMessage())
         }
 }
 
@@ -129,19 +130,24 @@ public class NMBObjCRaiseExceptionMatcher: NSObject, NMBMatcher {
         _block = block
     }
 
-    @objc public func matches(_ actualBlock: @escaping () -> NSObject!, failureMessage: FailureMessage, location: SourceLocation) -> Bool {
+    @objc public func matches(_ actualBlock: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool {
         let block: () -> Any? = ({ _ = actualBlock(); return nil })
         let expr = Expression(expression: block, location: location)
 
-        return try! raiseException(
-            named: _name,
-            reason: _reason,
-            userInfo: _userInfo,
-            closure: _block
-        ).matches(expr, failureMessage: failureMessage)
+        do {
+            return try raiseException(
+                named: _name,
+                reason: _reason,
+                userInfo: _userInfo,
+                closure: _block
+            ).matches(expr, failureMessage: failureMessage)
+        } catch let error {
+            failureMessage.stringValue = "unexpected error thrown: <\(error)>"
+            return false
+        }
     }
 
-    @objc public func doesNotMatch(_ actualBlock: @escaping () -> NSObject!, failureMessage: FailureMessage, location: SourceLocation) -> Bool {
+    @objc public func doesNotMatch(_ actualBlock: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool {
         return !matches(actualBlock, failureMessage: failureMessage, location: location)
     }
 

Example/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAllOf.swift

@@ -0,0 +1,76 @@
+import Foundation
+
+/// A Nimble matcher that succeeds when the actual value matches with all of the matchers
+/// provided in the variable list of matchers.
+public func satisfyAllOf<T, U>(_ matchers: U...) -> Predicate<T>
+    where U: Matcher, U.ValueType == T {
+        return satisfyAllOf(matchers.map { $0.predicate })
+}
+
+internal func satisfyAllOf<T>(_ predicates: [Predicate<T>]) -> Predicate<T> {
+	return Predicate.define { actualExpression in
+        var postfixMessages = [String]()
+        var matches = true
+        for predicate in predicates {
+            let result = try predicate.satisfies(actualExpression)
+            if result.toBoolean(expectation: .toNotMatch) {
+                matches = false
+            }
+            postfixMessages.append("{\(result.message.expectedMessage)}")
+        }
+
+        var msg: ExpectationMessage
+        if let actualValue = try actualExpression.evaluate() {
+            msg = .expectedCustomValueTo(
+                "match all of: " + postfixMessages.joined(separator: ", and "),
+                "\(actualValue)"
+            )
+        } else {
+            msg = .expectedActualValueTo(
+                "match all of: " + postfixMessages.joined(separator: ", and ")
+            )
+        }
+
+        return PredicateResult(bool: matches, message: msg)
+    }
+}
+
+public func && <T>(left: Predicate<T>, right: Predicate<T>) -> Predicate<T> {
+    return satisfyAllOf(left, right)
+}
+
+#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+extension NMBObjCMatcher {
+    @objc public class func satisfyAllOfMatcher(_ matchers: [NMBMatcher]) -> NMBPredicate {
+        return NMBPredicate { actualExpression in
+            if matchers.isEmpty {
+                return NMBPredicateResult(
+                    status: NMBPredicateStatus.fail,
+                    message: NMBExpectationMessage(
+                        fail: "satisfyAllOf must be called with at least one matcher"
+                    )
+                )
+            }
+
+            var elementEvaluators = [Predicate<NSObject>]()
+            for matcher in matchers {
+                let elementEvaluator = Predicate<NSObject> { expression in
+                    if let predicate = matcher as? NMBPredicate {
+                        // swiftlint:disable:next line_length
+                        return predicate.satisfies({ try expression.evaluate() }, location: actualExpression.location).toSwift()
+                    } else {
+                        let failureMessage = FailureMessage()
+                        // swiftlint:disable:next line_length
+                        let success = matcher.matches({ try! expression.evaluate() }, failureMessage: failureMessage, location: actualExpression.location)
+                        return PredicateResult(bool: success, message: failureMessage.toExpectationMessage())
+                    }
+                }
+
+                elementEvaluators.append(elementEvaluator)
+            }
+
+            return try satisfyAllOf(elementEvaluators).satisfies(actualExpression).toObjectiveC()
+        }
+    }
+}
+#endif

Example/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAnyOf.swift

@@ -4,33 +4,11 @@ import Foundation
 /// provided in the variable list of matchers. 
 public func satisfyAnyOf<T, U>(_ matchers: U...) -> Predicate<T>
     where U: Matcher, U.ValueType == T {
-    return satisfyAnyOf(matchers)
-}
-
-/// Deprecated. Please use `satisfyAnyOf<T>(_) -> Predicate<T>` instead.
-internal func satisfyAnyOf<T, U>(_ matchers: [U]) -> Predicate<T>
-    where U: Matcher, U.ValueType == T {
-        return NonNilMatcherFunc<T> { actualExpression, failureMessage in
-            let postfixMessages = NSMutableArray()
-            var matches = false
-            for matcher in matchers {
-                if try matcher.matches(actualExpression, failureMessage: failureMessage) {
-                    matches = true
-                }
-                postfixMessages.add(NSString(string: "{\(failureMessage.postfixMessage)}"))
-            }
-
-            failureMessage.postfixMessage = "match one of: " + postfixMessages.componentsJoined(by: ", or ")
-            if let actualValue = try actualExpression.evaluate() {
-                failureMessage.actualValue = "\(actualValue)"
-            }
-
-            return matches
-        }.predicate
+        return satisfyAnyOf(matchers.map { $0.predicate })
 }
 
 internal func satisfyAnyOf<T>(_ predicates: [Predicate<T>]) -> Predicate<T> {
-        return Predicate { actualExpression in
+        return Predicate.define { actualExpression in
             var postfixMessages = [String]()
             var matches = false
             for predicate in predicates {
@@ -53,11 +31,8 @@ internal func satisfyAnyOf<T>(_ predicates: [Predicate<T>]) -> Predicate<T> {
                 )
             }
 
-            return PredicateResult(
-                status: PredicateStatus(bool: matches),
-                message: msg
-            )
-        }.requireNonNil
+            return PredicateResult(bool: matches, message: msg)
+        }
 }
 
 public func || <T>(left: Predicate<T>, right: Predicate<T>) -> Predicate<T> {
@@ -90,7 +65,7 @@ extension NMBObjCMatcher {
                 let elementEvaluator = Predicate<NSObject> { expression in
                     if let predicate = matcher as? NMBPredicate {
                         // swiftlint:disable:next line_length
-                        return predicate.satisfies({ try! expression.evaluate() }, location: actualExpression.location).toSwift()
+                        return predicate.satisfies({ try expression.evaluate() }, location: actualExpression.location).toSwift()
                     } else {
                         let failureMessage = FailureMessage()
                         // swiftlint:disable:next line_length
@@ -102,7 +77,7 @@ extension NMBObjCMatcher {
                 elementEvaluators.append(elementEvaluator)
             }
 
-            return try! satisfyAnyOf(elementEvaluators).satisfies(actualExpression).toObjectiveC()
+            return try satisfyAnyOf(elementEvaluators).satisfies(actualExpression).toObjectiveC()
         }
     }
 }

Example/Pods/Nimble/Sources/Nimble/Matchers/ThrowAssertion.swift

@@ -1,13 +1,11 @@
 import Foundation
 
 public func throwAssertion() -> Predicate<Void> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
+    return Predicate { actualExpression in
     #if arch(x86_64) && (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE
-        failureMessage.postfixMessage = "throw an assertion"
-        failureMessage.actualValue = nil
-
-        var succeeded = true
+        let message = ExpectationMessage.expectedTo("throw an assertion")
 
+        var actualError: Error?
         let caughtException: BadInstructionException? = catchBadInstruction {
             #if os(tvOS)
                 if !NimbleEnvironment.activeInstance.suppressTVOSAssertionWarning {
@@ -27,21 +25,19 @@ public func throwAssertion() -> Predicate<Void> {
             #endif
             do {
                 try actualExpression.evaluate()
-            } catch let error {
-                succeeded = false
-                failureMessage.postfixMessage += "; threw error instead <\(error)>"
+            } catch {
+                actualError = error
             }
         }
 
-        if !succeeded {
-            return false
+        if let actualError = actualError {
+            return PredicateResult(
+                bool: false,
+                message: message.appended(message: "; threw error instead <\(actualError)>")
+            )
+        } else {
+            return PredicateResult(bool: caughtException != nil, message: message)
         }
-
-        if caughtException == nil {
-            return false
-        }
-
-        return true
     #elseif SWIFT_PACKAGE
         fatalError("The throwAssertion Nimble matcher does not currently support Swift CLI." +
             " You can silence this error by placing the test case inside an #if !SWIFT_PACKAGE" +

Example/Pods/Nimble/Sources/Nimble/Matchers/ThrowError.swift

@@ -12,22 +12,19 @@ import Foundation
 /// nil arguments indicates that the matcher should not attempt to match against
 /// that parameter.
 public func throwError() -> Predicate<Any> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-
+    return Predicate { actualExpression in
         var actualError: Error?
         do {
             _ = try actualExpression.evaluate()
-        } catch let catchedError {
-            actualError = catchedError
+        } catch {
+            actualError = error
         }
 
-        failureMessage.postfixMessage = "throw any error"
         if let actualError = actualError {
-            failureMessage.actualValue = "<\(actualError)>"
+            return PredicateResult(bool: true, message: .expectedCustomValueTo("throw any error", "<\(actualError)>"))
         } else {
-            failureMessage.actualValue = "no error"
+            return PredicateResult(bool: false, message: .expectedCustomValueTo("throw any error", "no error"))
         }
-        return actualError != nil
     }
 }
 
@@ -43,15 +40,15 @@ public func throwError() -> Predicate<Any> {
 /// nil arguments indicates that the matcher should not attempt to match against
 /// that parameter.
 public func throwError<T: Error>(_ error: T, closure: ((Error) -> Void)? = nil) -> Predicate<Any> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-
+    return Predicate { actualExpression in
         var actualError: Error?
         do {
             _ = try actualExpression.evaluate()
-        } catch let catchedError {
-            actualError = catchedError
+        } catch {
+            actualError = error
         }
 
+        let failureMessage = FailureMessage()
         setFailureMessageForError(
             failureMessage,
             actualError: actualError,
@@ -59,20 +56,23 @@ public func throwError<T: Error>(_ error: T, closure: ((Error) -> Void)? = nil)
             errorType: nil,
             closure: closure
         )
+
         var matches = false
         if let actualError = actualError, errorMatchesExpectedError(actualError, expectedError: error) {
             matches = true
+
             if let closure = closure {
                 let assertions = gatherFailingExpectations {
                     closure(actualError)
                 }
                 let messages = assertions.map { $0.message }
-                if messages.count > 0 {
+                if !messages.isEmpty {
                     matches = false
                 }
             }
         }
-        return matches
+
+        return PredicateResult(bool: matches, message: failureMessage.toExpectationMessage())
     }
 }
 
@@ -88,15 +88,15 @@ public func throwError<T: Error>(_ error: T, closure: ((Error) -> Void)? = nil)
 /// nil arguments indicates that the matcher should not attempt to match against
 /// that parameter.
 public func throwError<T: Error & Equatable>(_ error: T, closure: ((T) -> Void)? = nil) -> Predicate<Any> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-
+    return Predicate { actualExpression in
         var actualError: Error?
         do {
             _ = try actualExpression.evaluate()
-        } catch let catchedError {
-            actualError = catchedError
+        } catch {
+            actualError = error
         }
 
+        let failureMessage = FailureMessage()
         setFailureMessageForError(
             failureMessage,
             actualError: actualError,
@@ -104,6 +104,7 @@ public func throwError<T: Error & Equatable>(_ error: T, closure: ((T) -> Void)?
             errorType: nil,
             closure: closure
         )
+
         var matches = false
         if let actualError = actualError as? T, error == actualError {
             matches = true
@@ -113,12 +114,13 @@ public func throwError<T: Error & Equatable>(_ error: T, closure: ((T) -> Void)?
                     closure(actualError)
                 }
                 let messages = assertions.map { $0.message }
-                if messages.count > 0 {
+                if !messages.isEmpty {
                     matches = false
                 }
             }
         }
-        return matches
+
+        return PredicateResult(bool: matches, message: failureMessage.toExpectationMessage())
     }
 }
 
@@ -136,15 +138,15 @@ public func throwError<T: Error & Equatable>(_ error: T, closure: ((T) -> Void)?
 public func throwError<T: Error>(
     errorType: T.Type,
     closure: ((T) -> Void)? = nil) -> Predicate<Any> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-
+    return Predicate { actualExpression in
         var actualError: Error?
         do {
             _ = try actualExpression.evaluate()
-        } catch let catchedError {
-            actualError = catchedError
+        } catch {
+            actualError = error
         }
 
+        let failureMessage = FailureMessage()
         setFailureMessageForError(
             failureMessage,
             actualError: actualError,
@@ -152,16 +154,18 @@ public func throwError<T: Error>(
             errorType: errorType,
             closure: closure
         )
+
         var matches = false
         if let actualError = actualError {
             matches = true
+
             if let actualError = actualError as? T {
                 if let closure = closure {
                     let assertions = gatherFailingExpectations {
                         closure(actualError)
                     }
                     let messages = assertions.map { $0.message }
-                    if messages.count > 0 {
+                    if !messages.isEmpty {
                         matches = false
                     }
                 }
@@ -176,14 +180,14 @@ public func throwError<T: Error>(
                         }
                     }
                     let messages = assertions.map { $0.message }
-                    if messages.count > 0 {
+                    if !messages.isEmpty {
                         matches = false
                     }
                 }
             }
         }
 
-        return matches
+        return PredicateResult(bool: matches, message: failureMessage.toExpectationMessage())
     }
 }
 
@@ -195,15 +199,15 @@ public func throwError<T: Error>(
 ///
 /// The closure only gets called when an error was thrown.
 public func throwError(closure: @escaping ((Error) -> Void)) -> Predicate<Any> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-
+    return Predicate { actualExpression in
         var actualError: Error?
         do {
             _ = try actualExpression.evaluate()
-        } catch let catchedError {
-            actualError = catchedError
+        } catch {
+            actualError = error
         }
 
+        let failureMessage = FailureMessage()
         setFailureMessageForError(failureMessage, actualError: actualError, closure: closure)
 
         var matches = false
@@ -214,11 +218,12 @@ public func throwError(closure: @escaping ((Error) -> Void)) -> Predicate<Any> {
                 closure(actualError)
             }
             let messages = assertions.map { $0.message }
-            if messages.count > 0 {
+            if !messages.isEmpty {
                 matches = false
             }
         }
-        return matches
+
+        return PredicateResult(bool: matches, message: failureMessage.toExpectationMessage())
     }
 }
 
@@ -230,15 +235,15 @@ public func throwError(closure: @escaping ((Error) -> Void)) -> Predicate<Any> {
 ///
 /// The closure only gets called when an error was thrown.
 public func throwError<T: Error>(closure: @escaping ((T) -> Void)) -> Predicate<Any> {
-    return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in
-
+    return Predicate { actualExpression in
         var actualError: Error?
         do {
             _ = try actualExpression.evaluate()
-        } catch let catchedError {
-            actualError = catchedError
+        } catch {
+            actualError = error
         }
 
+        let failureMessage = FailureMessage()
         setFailureMessageForError(failureMessage, actualError: actualError, closure: closure)
 
         var matches = false
@@ -249,10 +254,11 @@ public func throwError<T: Error>(closure: @escaping ((T) -> Void)) -> Predicate<
                 closure(actualError)
             }
             let messages = assertions.map { $0.message }
-            if messages.count > 0 {
+            if !messages.isEmpty {
                 matches = false
             }
         }
-        return matches
+
+        return PredicateResult(bool: matches, message: failureMessage.toExpectationMessage())
     }
 }

Example/Pods/Nimble/Sources/Nimble/Utils/Await.swift

@@ -263,7 +263,11 @@ internal class AwaitPromiseBuilder<T> {
             self.trigger.timeoutSource.resume()
             while self.promise.asyncResult.isIncomplete() {
                 // Stopping the run loop does not work unless we run only 1 mode
+                #if swift(>=4.2)
+                _ = RunLoop.current.run(mode: .default, before: .distantFuture)
+                #else
                 _ = RunLoop.current.run(mode: .defaultRunLoopMode, before: .distantFuture)
+                #endif
             }
 
             self.trigger.timeoutSource.cancel()

Example/Pods/Nimble/Sources/Nimble/Utils/Stringers.swift

@@ -144,7 +144,9 @@ extension Data: TestOutputStringConvertible {
 ///     will return the result of constructing a string from the value.
 ///
 /// - SeeAlso: `TestOutputStringConvertible`
-public func stringify<T>(_ value: T) -> String {
+public func stringify<T>(_ value: T?) -> String {
+    guard let value = value else { return "nil" }
+
     if let value = value as? TestOutputStringConvertible {
         return value.testDescription
     }
@@ -156,14 +158,6 @@ public func stringify<T>(_ value: T) -> String {
     return String(describing: value)
 }
 
-/// -SeeAlso: `stringify<T>(value: T)`
-public func stringify<T>(_ value: T?) -> String {
-    if let unboxed = value {
-        return stringify(unboxed)
-    }
-    return "nil"
-}
-
 #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
 @objc public class NMBStringer: NSObject {
     @objc public class func stringify(_ obj: Any?) -> String {

Example/Pods/Nimble/Sources/NimbleObjectiveC/CurrentTestCaseTracker.h

@@ -1,9 +0,0 @@
-#import <XCTest/XCTest.h>
-#import <Nimble/Nimble-Swift.h>
-
-SWIFT_CLASS("_TtC6Nimble22CurrentTestCaseTracker")
-@interface CurrentTestCaseTracker : NSObject <XCTestObservation>
-+ (CurrentTestCaseTracker *)sharedInstance;
-@end
-
-@interface CurrentTestCaseTracker (Register) @end

Example/Pods/Nimble/Sources/NimbleObjectiveC/DSL.h

@@ -350,6 +350,12 @@ NIMBLE_EXPORT id<NMBMatcher> NMB_satisfyAnyOfWithMatchers(id matchers);
 #define satisfyAnyOf(...) NMB_satisfyAnyOf(__VA_ARGS__)
 #endif
 
+NIMBLE_EXPORT id<NMBMatcher> NMB_satisfyAllOfWithMatchers(id matchers);
+#define NMB_satisfyAllOf(...) NMB_satisfyAllOfWithMatchers(@[__VA_ARGS__])
+#ifndef NIMBLE_DISABLE_SHORT_SYNTAX
+#define satisfyAllOf(...) NMB_satisfyAllOf(__VA_ARGS__)
+#endif
+
 // In order to preserve breakpoint behavior despite using macros to fill in __FILE__ and __LINE__,
 // define a builder that populates __FILE__ and __LINE__, and returns a block that takes timeout
 // and action arguments. See https://github.com/Quick/Quick/pull/185 for details.

Example/Pods/Nimble/Sources/NimbleObjectiveC/DSL.m

@@ -1,13 +1,10 @@
 #import <Nimble/DSL.h>
+
+#if __has_include("Nimble-Swift.h")
+#import "Nimble-Swift.h"
+#else
 #import <Nimble/Nimble-Swift.h>
-
-SWIFT_CLASS("_TtC6Nimble7NMBWait")
-@interface NMBWait : NSObject
-
-+ (void)untilTimeout:(NSTimeInterval)timeout file:(NSString *)file line:(NSUInteger)line action:(void (^ _Nonnull)(void (^ _Nonnull)(void)))action;
-+ (void)untilFile:(NSString *)file line:(NSUInteger)line action:(void (^ _Nonnull)(void (^ _Nonnull)(void)))action;
-
-@end
+#endif
 
 
 NS_ASSUME_NONNULL_BEGIN
@@ -141,6 +138,10 @@ NIMBLE_EXPORT id<NMBMatcher> NMB_satisfyAnyOfWithMatchers(id matchers) {
     return [NMBObjCMatcher satisfyAnyOfMatcher:matchers];
 }
 
+NIMBLE_EXPORT id<NMBMatcher> NMB_satisfyAllOfWithMatchers(id matchers) {
+    return [NMBObjCMatcher satisfyAllOfMatcher:matchers];
+}
+
 NIMBLE_EXPORT NMBObjCRaiseExceptionMatcher *NMB_raiseException() {
     return [NMBObjCMatcher raiseExceptionMatcher];
 }

Example/Pods/Nimble/Sources/NimbleObjectiveC/NMBExceptionCapture.m

@@ -16,7 +16,7 @@
     return self;
 }
 
-- (void)tryBlock:(void(^ _Nonnull)(void))unsafeBlock {
+- (void)tryBlock:(__attribute__((noescape)) void(^ _Nonnull)(void))unsafeBlock {
     @try {
         unsafeBlock();
     }

Example/Pods/Nimble/Sources/NimbleObjectiveC/NMBStringify.m

@@ -1,5 +1,10 @@
 #import "NMBStringify.h"
+
+#if __has_include("Nimble-Swift.h")
+#import "Nimble-Swift.h"
+#else
 #import <Nimble/Nimble-Swift.h>
+#endif
 
 NSString *_Nonnull NMBStringify(id _Nullable anyObject) {
     return [NMBStringer stringify:anyObject];

Example/Pods/Nimble/Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m

@@ -1,7 +1,12 @@
-#import "CurrentTestCaseTracker.h"
 #import <XCTest/XCTest.h>
 #import <objc/runtime.h>
 
+#if __has_include("Nimble-Swift.h")
+#import "Nimble-Swift.h"
+#else
+#import <Nimble/Nimble-Swift.h>
+#endif
+
 #pragma mark - Method Swizzling
 
 /// Swaps the implementations between two instance methods.

Example/Pods/Quick/Sources/Quick/DSL/World+DSL.swift

@@ -85,6 +85,7 @@ extension World {
     }
 #endif
 
+    @nonobjc
     internal func it(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) {
         if beforesCurrentlyExecuting {
             raiseError("'it' cannot be used inside 'beforeEach', 'it' may only be used inside 'context' or 'describe'. ")
@@ -100,18 +101,21 @@ extension World {
         currentExampleGroup.appendExample(example)
     }
 
+    @nonobjc
     internal func fit(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) {
         var focusedFlags = flags
         focusedFlags[Filter.focused] = true
         self.it(description, flags: focusedFlags, file: file, line: line, closure: closure)
     }
 
+    @nonobjc
     internal func xit(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) {
         var pendingFlags = flags
         pendingFlags[Filter.pending] = true
         self.it(description, flags: pendingFlags, file: file, line: line, closure: closure)
     }
 
+    @nonobjc
     internal func itBehavesLike(_ name: String, sharedExampleContext: @escaping SharedExampleContext, flags: FilterFlags, file: String, line: UInt) {
         guard currentExampleMetadata == nil else {
             raiseError("'itBehavesLike' cannot be used inside '\(currentPhase)', 'itBehavesLike' may only be used inside 'context' or 'describe'. ")
@@ -131,6 +135,7 @@ extension World {
         }
     }
 
+    @nonobjc
     internal func fitBehavesLike(_ name: String, sharedExampleContext: @escaping SharedExampleContext, flags: FilterFlags, file: String, line: UInt) {
         var focusedFlags = flags
         focusedFlags[Filter.focused] = true
@@ -169,22 +174,22 @@ extension World {
 
 #if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE
     @objc(itWithDescription:flags:file:line:closure:)
-    private func objc_it(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) {
+    internal func objc_it(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) {
         it(description, flags: flags, file: file, line: line, closure: closure)
     }
 
     @objc(fitWithDescription:flags:file:line:closure:)
-    private func objc_fit(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) {
+    internal func objc_fit(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) {
         fit(description, flags: flags, file: file, line: line, closure: closure)
     }
 
     @objc(xitWithDescription:flags:file:line:closure:)
-    private func objc_xit(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) {
+    internal func objc_xit(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) {
         xit(description, flags: flags, file: file, line: line, closure: closure)
     }
 
     @objc(itBehavesLikeSharedExampleNamed:sharedExampleContext:flags:file:line:)
-    private func objc_itBehavesLike(_ name: String, sharedExampleContext: @escaping SharedExampleContext, flags: FilterFlags, file: String, line: UInt) {
+    internal func objc_itBehavesLike(_ name: String, sharedExampleContext: @escaping SharedExampleContext, flags: FilterFlags, file: String, line: UInt) {
         itBehavesLike(name, sharedExampleContext: sharedExampleContext, flags: flags, file: file, line: line)
     }
 #endif

Example/Pods/Quick/Sources/Quick/Example.swift

@@ -81,6 +81,9 @@ final public class Example: _ExampleBase {
 
         let exampleMetadata = ExampleMetadata(example: self, exampleIndex: numberOfExamplesRun)
         world.currentExampleMetadata = exampleMetadata
+        defer {
+            world.currentExampleMetadata = nil
+        }
 
         world.exampleHooks.executeBefores(exampleMetadata)
         group!.phase = .beforesExecuting

Example/Pods/Quick/Sources/Quick/NSString+C99ExtendedIdentifier.swift

@@ -1,8 +1,7 @@
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 import Foundation
 
-public extension NSString {
-
+extension NSString {
     private static var invalidCharacters: CharacterSet = {
         var invalidCharacters = CharacterSet()
 
@@ -22,12 +21,29 @@ public extension NSString {
         return invalidCharacters
     }()
 
+    /// This API is not meant to be used outside Quick, so will be unavaialbe in
+    /// a next major version.
     @objc(qck_c99ExtendedIdentifier)
-    var c99ExtendedIdentifier: String {
+    public var c99ExtendedIdentifier: String {
         let validComponents = components(separatedBy: NSString.invalidCharacters)
         let result = validComponents.joined(separator: "_")
 
         return result.isEmpty ? "_" : result
     }
 }
+
+/// Extension methods or properties for NSObject subclasses are invisible from
+/// the Objective-C runtime on static linking unless the consumers add `-ObjC`
+/// linker flag, so let's make a wrapper class to mitigate that situation.
+///
+/// See: https://github.com/Quick/Quick/issues/785 and https://github.com/Quick/Quick/pull/803
+@objc
+class QCKObjCStringUtils: NSObject {
+    override private init() {}
+
+    @objc
+    static func c99ExtendedIdentifier(from string: String) -> String {
+        return string.c99ExtendedIdentifier
+    }
+}
 #endif

Example/Pods/Quick/Sources/Quick/World.swift

@@ -160,7 +160,7 @@ final internal class World: _WorldBase {
 
 #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
     @objc(examplesForSpecClass:)
-    private func objc_examples(_ specClass: AnyClass) -> [Example] {
+    internal func objc_examples(_ specClass: AnyClass) -> [Example] {
         return examples(specClass)
     }
 #endif

Example/Pods/Quick/Sources/QuickObjectiveC/Configuration/QuickConfiguration.m

@@ -1,7 +1,12 @@
 #import "QuickConfiguration.h"
-#import "World.h"
 #import <objc/runtime.h>
 
+#if __has_include("Quick-Swift.h")
+#import "Quick-Swift.h"
+#else
+#import <Quick/Quick-Swift.h>
+#endif
+
 typedef void (^QCKClassEnumerationBlock)(Class klass);
 
 /**

Example/Pods/Quick/Sources/QuickObjectiveC/DSL/QCKDSL.m

@@ -1,6 +1,10 @@
 #import "QCKDSL.h"
-#import "World.h"
-#import "World+DSL.h"
+
+#if __has_include("Quick-Swift.h")
+#import "Quick-Swift.h"
+#else
+#import <Quick/Quick-Swift.h>
+#endif
 
 void qck_beforeSuite(QCKDSLEmptyBlock closure) {
     [[World sharedWorld] beforeSuite:closure];

Example/Pods/Quick/Sources/QuickObjectiveC/DSL/World+DSL.h

@@ -1,20 +0,0 @@
-#import <Quick/Quick-Swift.h>
-
-@interface World (SWIFT_EXTENSION(Quick))
-- (void)beforeSuite:(void (^ __nonnull)(void))closure;
-- (void)afterSuite:(void (^ __nonnull)(void))closure;
-- (void)sharedExamples:(NSString * __nonnull)name closure:(void (^ __nonnull)(NSDictionary * __nonnull (^ __nonnull)(void)))closure;
-- (void)describe:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure;
-- (void)context:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure;
-- (void)fdescribe:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure;
-- (void)xdescribe:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure;
-- (void)beforeEach:(void (^ __nonnull)(void))closure;
-- (void)beforeEachWithMetadata:(void (^ __nonnull)(ExampleMetadata * __nonnull))closure;
-- (void)afterEach:(void (^ __nonnull)(void))closure;
-- (void)afterEachWithMetadata:(void (^ __nonnull)(ExampleMetadata * __nonnull))closure;
-- (void)itWithDescription:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSUInteger)line closure:(void (^ __nonnull)(void))closure;
-- (void)fitWithDescription:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSUInteger)line closure:(void (^ __nonnull)(void))closure;
-- (void)xitWithDescription:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSUInteger)line closure:(void (^ __nonnull)(void))closure;
-- (void)itBehavesLikeSharedExampleNamed:(NSString * __nonnull)name sharedExampleContext:(NSDictionary * __nonnull (^ __nonnull)(void))sharedExampleContext flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSUInteger)line;
-- (void)pending:(NSString * __nonnull)description closure:(void (^ __nonnull)(void))closure;
-@end

Example/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.h

@@ -47,4 +47,10 @@
  */
 - (void)spec;
 
+/**
+ Returns the currently executing spec. Use in specs that require XCTestCase
+ methds, e.g. expectationWithDescription.
+*/
+@property (class, nonatomic, readonly) QuickSpec *current;
+
 @end

Example/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.m

@@ -1,7 +1,11 @@
 #import "QuickSpec.h"
 #import "QuickConfiguration.h"
-#import "World.h"
+
+#if __has_include("Quick-Swift.h")
+#import "Quick-Swift.h"
+#else
 #import <Quick/Quick-Swift.h>
+#endif
 
 static QuickSpec *currentSpec = nil;
 
@@ -75,6 +79,10 @@ static QuickSpec *currentSpec = nil;
 
 - (void)spec { }
 
++ (QuickSpec*) current {
+    return currentSpec;
+}
+
 #pragma mark - Internal Methods
 
 /**
@@ -101,8 +109,8 @@ static QuickSpec *currentSpec = nil;
     });
 
     const char *types = [[NSString stringWithFormat:@"%s%s%s", @encode(void), @encode(id), @encode(SEL)] UTF8String];
-    
-    NSString *originalName = example.name.qck_c99ExtendedIdentifier;
+
+    NSString *originalName = [QCKObjCStringUtils c99ExtendedIdentifierFrom:example.name];
     NSString *selectorName = originalName;
     NSUInteger i = 2;
     

Example/Pods/Quick/Sources/QuickObjectiveC/World.h

@@ -1,18 +0,0 @@
-#import <Quick/Quick-Swift.h>
-
-@class ExampleGroup;
-@class ExampleMetadata;
-
-SWIFT_CLASS("_TtC5Quick5World")
-@interface World
-
-@property (nonatomic) ExampleGroup * __nullable currentExampleGroup;
-@property (nonatomic) ExampleMetadata * __nullable currentExampleMetadata;
-@property (nonatomic) BOOL isRunningAdditionalSuites;
-+ (World * __nonnull)sharedWorld;
-- (void)configure:(void (^ __nonnull)(Configuration * __nonnull))closure;
-- (void)finalizeConfiguration;
-- (ExampleGroup * __nonnull)rootExampleGroupForSpecClass:(Class __nonnull)cls;
-- (NSArray * __nonnull)examplesForSpecClass:(Class __nonnull)specClass;
-- (void)performWithCurrentExampleGroup:(ExampleGroup * __nonnull)group closure:(void (^ __nonnull)(void))closure;
-@end

Example/Pods/Quick/Sources/QuickObjectiveC/XCTestSuite+QuickTestSuiteBuilder.m

@@ -1,6 +1,11 @@
 #import <XCTest/XCTest.h>
 #import <objc/runtime.h>
+
+#if __has_include("Quick-Swift.h")
+#import "Quick-Swift.h"
+#else
 #import <Quick/Quick-Swift.h>
+#endif
 
 @interface XCTestSuite (QuickTestSuiteBuilder)
 @end

Example/Pods/Target Support Files/Nimble/Info.plist

@@ -15,7 +15,7 @@
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
-  <string>7.0.3</string>
+  <string>7.3.1</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>

Example/Pods/Target Support Files/Nimble/Nimble.xcconfig

@@ -1,12 +1,12 @@
-CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/Nimble
+APPLICATION_EXTENSION_API_ONLY = YES
+CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Nimble
 ENABLE_BITCODE = NO
 FRAMEWORK_SEARCH_PATHS = $(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
-OTHER_LDFLAGS = -weak-lswiftXCTest -weak_framework "XCTest"
+OTHER_LDFLAGS = $(inherited) -Xlinker -no_application_extension -weak-lswiftXCTest -weak_framework "XCTest"
 OTHER_SWIFT_FLAGS = $(inherited) -suppress-warnings $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/Nimble
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}

Example/Pods/Target Support Files/Pods-SwiftAudio_Example/Pods-SwiftAudio_Example-frameworks.sh

@@ -1,15 +1,28 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
+    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # frameworks to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
+COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 
+# Used as a return value for each invocation of `strip_invalid_archs` function.
+STRIP_BINARY_RETVAL=0
+
 # This protects against multiple targets copying the same framework dependency at the same time. The solution
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
+# Copies and strips a vendored framework
 install_framework()
 {
   if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
@@ -58,21 +71,40 @@ install_framework()
   fi
 }
 
-# Copies the dSYM of a vendored framework
+# Copies and strips a vendored dSYM
 install_dsym() {
   local source="$1"
   if [ -r "$source" ]; then
-    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\""
-    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}"
+    # Copy the dSYM into a the targets temp dir.
+    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\""
+    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}"
+
+    local basename
+    basename="$(basename -s .framework.dSYM "$source")"
+    binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}"
+
+    # Strip invalid architectures so "fat" simulator / device frameworks work on device
+    if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then
+      strip_invalid_archs "$binary"
+    fi
+
+    if [[ $STRIP_BINARY_RETVAL == 1 ]]; then
+      # Move the stripped file into its final destination.
+      echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\""
+      rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}"
+    else
+      # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing.
+      touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM"
+    fi
   fi
 }
 
 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
     # Use the current code_sign_identitiy
     echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
 
     if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
       code_sign_cmd="$code_sign_cmd &"
@@ -85,10 +117,18 @@ code_sign_if_enabled() {
 # Strip invalid architectures
 strip_invalid_archs() {
   binary="$1"
-  # Get architectures for current file
-  archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
+  # Get architectures for current target binary
+  binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)"
+  # Intersect them with the architectures we are building for
+  intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)"
+  # If there are no archs supported by this binary then warn the user
+  if [[ -z "$intersected_archs" ]]; then
+    echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)."
+    STRIP_BINARY_RETVAL=0
+    return
+  fi
   stripped=""
-  for arch in $archs; do
+  for arch in $binary_archs; do
     if ! [[ "${ARCHS}" == *"$arch"* ]]; then
       # Strip non-valid architectures in-place
       lipo -remove "$arch" -output "$binary" "$binary" || exit 1
@@ -98,6 +138,7 @@ strip_invalid_archs() {
   if [[ "$stripped" ]]; then
     echo "Stripped $binary of architectures:$stripped"
   fi
+  STRIP_BINARY_RETVAL=1
 }
 
 

Example/Pods/Target Support Files/Pods-SwiftAudio_Example/Pods-SwiftAudio_Example-resources.sh

@@ -1,5 +1,13 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
+    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # resources to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 
@@ -12,7 +20,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
-case "${TARGETED_DEVICE_FAMILY}" in
+case "${TARGETED_DEVICE_FAMILY:-}" in
   1,2)
     TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
     ;;
@@ -92,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"
 
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
 then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
   OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@@ -102,5 +110,9 @@ then
     fi
   done <<<"$OTHER_XCASSETS"
 
-  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  else
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
+  fi
 fi

Example/Pods/Target Support Files/Pods-SwiftAudio_Example/Pods-SwiftAudio_Example.debug.xcconfig

@@ -1,11 +1,11 @@
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/SwiftAudio"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/SwiftAudio"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/SwiftAudio/SwiftAudio.framework/Headers"
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/SwiftAudio/SwiftAudio.framework/Headers"
 OTHER_LDFLAGS = $(inherited) -framework "SwiftAudio"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods

Example/Pods/Target Support Files/Pods-SwiftAudio_Example/Pods-SwiftAudio_Example.release.xcconfig

@@ -1,11 +1,11 @@
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/SwiftAudio"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/SwiftAudio"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/SwiftAudio/SwiftAudio.framework/Headers"
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/SwiftAudio/SwiftAudio.framework/Headers"
 OTHER_LDFLAGS = $(inherited) -framework "SwiftAudio"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods

Example/Pods/Target Support Files/Pods-SwiftAudio_Tests/Pods-SwiftAudio_Tests-frameworks.sh

@@ -1,15 +1,28 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
+    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # frameworks to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
+COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 
+# Used as a return value for each invocation of `strip_invalid_archs` function.
+STRIP_BINARY_RETVAL=0
+
 # This protects against multiple targets copying the same framework dependency at the same time. The solution
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
+# Copies and strips a vendored framework
 install_framework()
 {
   if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
@@ -58,21 +71,40 @@ install_framework()
   fi
 }
 
-# Copies the dSYM of a vendored framework
+# Copies and strips a vendored dSYM
 install_dsym() {
   local source="$1"
   if [ -r "$source" ]; then
-    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\""
-    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}"
+    # Copy the dSYM into a the targets temp dir.
+    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\""
+    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}"
+
+    local basename
+    basename="$(basename -s .framework.dSYM "$source")"
+    binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}"
+
+    # Strip invalid architectures so "fat" simulator / device frameworks work on device
+    if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then
+      strip_invalid_archs "$binary"
+    fi
+
+    if [[ $STRIP_BINARY_RETVAL == 1 ]]; then
+      # Move the stripped file into its final destination.
+      echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\""
+      rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}"
+    else
+      # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing.
+      touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM"
+    fi
   fi
 }
 
 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
     # Use the current code_sign_identitiy
     echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
 
     if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
       code_sign_cmd="$code_sign_cmd &"
@@ -85,10 +117,18 @@ code_sign_if_enabled() {
 # Strip invalid architectures
 strip_invalid_archs() {
   binary="$1"
-  # Get architectures for current file
-  archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
+  # Get architectures for current target binary
+  binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)"
+  # Intersect them with the architectures we are building for
+  intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)"
+  # If there are no archs supported by this binary then warn the user
+  if [[ -z "$intersected_archs" ]]; then
+    echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)."
+    STRIP_BINARY_RETVAL=0
+    return
+  fi
   stripped=""
-  for arch in $archs; do
+  for arch in $binary_archs; do
     if ! [[ "${ARCHS}" == *"$arch"* ]]; then
       # Strip non-valid architectures in-place
       lipo -remove "$arch" -output "$binary" "$binary" || exit 1
@@ -98,6 +138,7 @@ strip_invalid_archs() {
   if [[ "$stripped" ]]; then
     echo "Stripped $binary of architectures:$stripped"
   fi
+  STRIP_BINARY_RETVAL=1
 }
 
 

Example/Pods/Target Support Files/Pods-SwiftAudio_Tests/Pods-SwiftAudio_Tests-resources.sh

@@ -1,5 +1,13 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
+    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # resources to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 
@@ -12,7 +20,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
-case "${TARGETED_DEVICE_FAMILY}" in
+case "${TARGETED_DEVICE_FAMILY:-}" in
   1,2)
     TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
     ;;
@@ -92,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"
 
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
 then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
   OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@@ -102,5 +110,9 @@ then
     fi
   done <<<"$OTHER_XCASSETS"
 
-  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  else
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
+  fi
 fi

Example/Pods/Target Support Files/Pods-SwiftAudio_Tests/Pods-SwiftAudio_Tests.debug.xcconfig

@@ -1,11 +1,11 @@
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
-FRAMEWORK_SEARCH_PATHS = $(inherited) $(PLATFORM_DIR)/Developer/Library/Frameworks "$PODS_CONFIGURATION_BUILD_DIR/Nimble" "$PODS_CONFIGURATION_BUILD_DIR/Quick" "$PODS_CONFIGURATION_BUILD_DIR/SwiftAudio"
+FRAMEWORK_SEARCH_PATHS = $(inherited) $(PLATFORM_DIR)/Developer/Library/Frameworks "${PODS_CONFIGURATION_BUILD_DIR}/Nimble" "${PODS_CONFIGURATION_BUILD_DIR}/Quick" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftAudio"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Nimble/Nimble.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/Quick/Quick.framework/Headers" $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/SwiftAudio/SwiftAudio.framework/Headers"
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Nimble/Nimble.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Quick/Quick.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/SwiftAudio/SwiftAudio.framework/Headers"
 OTHER_LDFLAGS = $(inherited) -framework "Nimble" -framework "Quick"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods

Example/Pods/Target Support Files/Pods-SwiftAudio_Tests/Pods-SwiftAudio_Tests.release.xcconfig

@@ -1,11 +1,11 @@
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
-FRAMEWORK_SEARCH_PATHS = $(inherited) $(PLATFORM_DIR)/Developer/Library/Frameworks "$PODS_CONFIGURATION_BUILD_DIR/Nimble" "$PODS_CONFIGURATION_BUILD_DIR/Quick" "$PODS_CONFIGURATION_BUILD_DIR/SwiftAudio"
+FRAMEWORK_SEARCH_PATHS = $(inherited) $(PLATFORM_DIR)/Developer/Library/Frameworks "${PODS_CONFIGURATION_BUILD_DIR}/Nimble" "${PODS_CONFIGURATION_BUILD_DIR}/Quick" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftAudio"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Nimble/Nimble.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/Quick/Quick.framework/Headers" $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/SwiftAudio/SwiftAudio.framework/Headers"
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Nimble/Nimble.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Quick/Quick.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/SwiftAudio/SwiftAudio.framework/Headers"
 OTHER_LDFLAGS = $(inherited) -framework "Nimble" -framework "Quick"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods

Example/Pods/Target Support Files/Quick/Info.plist

@@ -15,7 +15,7 @@
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.2.0</string>
+  <string>1.3.2</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>

Example/Pods/Target Support Files/Quick/Quick.xcconfig

@@ -1,12 +1,12 @@
-CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/Quick
+APPLICATION_EXTENSION_API_ONLY = YES
+CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Quick
 ENABLE_BITCODE = NO
 FRAMEWORK_SEARCH_PATHS = $(inherited)  "$(PLATFORM_DIR)/Developer/Library/Frameworks"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
-OTHER_LDFLAGS = -framework "XCTest"
+OTHER_LDFLAGS = $(inherited) -Xlinker -no_application_extension -framework "XCTest"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/Quick
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}

Example/Pods/Target Support Files/SwiftAudio/Info.plist

@@ -15,7 +15,7 @@
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
-  <string>0.1.0</string>
+  <string>0.3.3</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>

Example/Pods/Target Support Files/SwiftAudio/SwiftAudio.xcconfig

@@ -1,9 +1,8 @@
-CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/SwiftAudio
+CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/SwiftAudio
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/../..
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}

Example/SwiftAudio.xcodeproj/project.pbxproj

@@ -8,6 +8,19 @@
 
 /* Begin PBXBuildFile section */
 		02EAB7FA622CF9CCD4F328C7 /* Pods_SwiftAudio_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9CEE0D1B64E6BEF775F214D /* Pods_SwiftAudio_Tests.framework */; };
+		070713072067EB4F00F789B3 /* Double + Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 070713062067EB4F00F789B3 /* Double + Extensions.swift */; };
+		070713092067EFFB00F789B3 /* AudioController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 070713082067EFFB00F789B3 /* AudioController.swift */; };
+		0707130B2067F2E000F789B3 /* QueueViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0707130A2067F2E000F789B3 /* QueueViewController.swift */; };
+		0707130F2067F40A00F789B3 /* QueueTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0707130D2067F40A00F789B3 /* QueueTableViewCell.swift */; };
+		070713102067F40A00F789B3 /* QueueTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0707130E2067F40A00F789B3 /* QueueTableViewCell.xib */; };
+		0708ED6C2116DA4C00EB29BD /* AudioSessionControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0708ED6B2116DA4B00EB29BD /* AudioSessionControllerTests.swift */; };
+		0708ED702116E89900EB29BD /* Source.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0708ED6F2116E89900EB29BD /* Source.swift */; };
+		0708ED722116E91D00EB29BD /* Source.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0708ED6F2116E89900EB29BD /* Source.swift */; };
+		0708ED742116EE0100EB29BD /* AudioPlayerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0708ED732116EE0100EB29BD /* AudioPlayerTests.swift */; };
+		0708ED79211732F500EB29BD /* TestSound.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 0708ED78211732F500EB29BD /* TestSound.m4a */; };
+		0708ED7A211732F500EB29BD /* TestSound.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 0708ED78211732F500EB29BD /* TestSound.m4a */; };
+		07194D212127F6DB002EA8C8 /* ShortTestSound.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 07194D1F2127F283002EA8C8 /* ShortTestSound.m4a */; };
+		07194D222127F6E9002EA8C8 /* ShortTestSound.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 07194D1F2127F283002EA8C8 /* ShortTestSound.m4a */; };
 		074A6483205C155E0083D868 /* AVPlayerTimeObserverTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 074A6482205C155E0083D868 /* AVPlayerTimeObserverTests.swift */; };
 		074A6485205C29920083D868 /* AVPlayerItemNotificationObserverTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 074A6484205C29920083D868 /* AVPlayerItemNotificationObserverTests.swift */; };
 		074A6487205E59B60083D868 /* AVPlayerWrapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 074A6486205E59B60083D868 /* AVPlayerWrapperTests.swift */; };
@@ -15,6 +28,10 @@
 		07732653205EB1B500C4D1CD /* nasa_throttle_up.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 07732652205EB1B500C4D1CD /* nasa_throttle_up.mp3 */; };
 		07732654205ECA8B00C4D1CD /* WAV-MP3.wav in Resources */ = {isa = PBXBuildFile; fileRef = 07732650205EACA300C4D1CD /* WAV-MP3.wav */; };
 		07732655205ECE1C00C4D1CD /* nasa_throttle_up.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 07732652205EB1B500C4D1CD /* nasa_throttle_up.mp3 */; };
+		0775575920668B020002C6A1 /* QueueManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0775575820668B020002C6A1 /* QueueManagerTests.swift */; };
+		078C908F210D263200555E80 /* AVPlayerItemObserverTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 078C908D210D25F700555E80 /* AVPlayerItemObserverTests.swift */; };
+		07CC171C213E912E005F880E /* SimpleAudioPlayerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07CC171A213E912A005F880E /* SimpleAudioPlayerTests.swift */; };
+		07DBB1E1212C17E600BB4278 /* QueuedAudioPlayerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07DBB1E0212C17E600BB4278 /* QueuedAudioPlayerTests.swift */; };
 		607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD51AFB9204008FA782 /* AppDelegate.swift */; };
 		607FACD81AFB9204008FA782 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* ViewController.swift */; };
 		607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; };
@@ -35,11 +52,25 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		070713062067EB4F00F789B3 /* Double + Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Double + Extensions.swift"; sourceTree = "<group>"; };
+		070713082067EFFB00F789B3 /* AudioController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioController.swift; sourceTree = "<group>"; };
+		0707130A2067F2E000F789B3 /* QueueViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QueueViewController.swift; sourceTree = "<group>"; };
+		0707130D2067F40A00F789B3 /* QueueTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QueueTableViewCell.swift; sourceTree = "<group>"; };
+		0707130E2067F40A00F789B3 /* QueueTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = QueueTableViewCell.xib; sourceTree = "<group>"; };
+		0708ED6B2116DA4B00EB29BD /* AudioSessionControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioSessionControllerTests.swift; sourceTree = "<group>"; };
+		0708ED6F2116E89900EB29BD /* Source.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Source.swift; sourceTree = "<group>"; };
+		0708ED732116EE0100EB29BD /* AudioPlayerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioPlayerTests.swift; sourceTree = "<group>"; };
+		0708ED78211732F500EB29BD /* TestSound.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = TestSound.m4a; sourceTree = "<group>"; };
+		07194D1F2127F283002EA8C8 /* ShortTestSound.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = ShortTestSound.m4a; sourceTree = "<group>"; };
 		074A6482205C155E0083D868 /* AVPlayerTimeObserverTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVPlayerTimeObserverTests.swift; sourceTree = "<group>"; };
 		074A6484205C29920083D868 /* AVPlayerItemNotificationObserverTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVPlayerItemNotificationObserverTests.swift; sourceTree = "<group>"; };
 		074A6486205E59B60083D868 /* AVPlayerWrapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVPlayerWrapperTests.swift; sourceTree = "<group>"; };
 		07732650205EACA300C4D1CD /* WAV-MP3.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = "WAV-MP3.wav"; sourceTree = "<group>"; };
 		07732652205EB1B500C4D1CD /* nasa_throttle_up.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = nasa_throttle_up.mp3; sourceTree = "<group>"; };
+		0775575820668B020002C6A1 /* QueueManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QueueManagerTests.swift; sourceTree = "<group>"; };
+		078C908D210D25F700555E80 /* AVPlayerItemObserverTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVPlayerItemObserverTests.swift; sourceTree = "<group>"; };
+		07CC171A213E912A005F880E /* SimpleAudioPlayerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimpleAudioPlayerTests.swift; sourceTree = "<group>"; };
+		07DBB1E0212C17E600BB4278 /* QueuedAudioPlayerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QueuedAudioPlayerTests.swift; sourceTree = "<group>"; };
 		521F3AEC1228A2FA2637355F /* Pods-SwiftAudio_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftAudio_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SwiftAudio_Tests/Pods-SwiftAudio_Tests.debug.xcconfig"; sourceTree = "<group>"; };
 		607FACD01AFB9204008FA782 /* SwiftAudio_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftAudio_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -53,7 +84,7 @@
 		607FACEB1AFB9204008FA782 /* AVPlayerObserverTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVPlayerObserverTests.swift; sourceTree = "<group>"; };
 		768DA07BCD292FA8C3F43CF5 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
 		928EC55949C3B1093DA7BC4C /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
-		B88D29AD5BC56C1834C04294 /* SwiftAudio.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = SwiftAudio.podspec; path = ../SwiftAudio.podspec; sourceTree = "<group>"; };
+		B88D29AD5BC56C1834C04294 /* SwiftAudio.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = SwiftAudio.podspec; path = ../SwiftAudio.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		C344B34C66182CD1C5AD6DD2 /* Pods-SwiftAudio_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftAudio_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SwiftAudio_Example/Pods-SwiftAudio_Example.debug.xcconfig"; sourceTree = "<group>"; };
 		C4C4423F4BAFCE03507BC386 /* Pods-SwiftAudio_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftAudio_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-SwiftAudio_Tests/Pods-SwiftAudio_Tests.release.xcconfig"; sourceTree = "<group>"; };
 		C8489AD5161CEA9C48D7DF42 /* Pods_SwiftAudio_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SwiftAudio_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -81,6 +112,18 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		0708ED712116E91300EB29BD /* Source */ = {
+			isa = PBXGroup;
+			children = (
+				07194D1F2127F283002EA8C8 /* ShortTestSound.m4a */,
+				0708ED6F2116E89900EB29BD /* Source.swift */,
+				07732650205EACA300C4D1CD /* WAV-MP3.wav */,
+				07732652205EB1B500C4D1CD /* nasa_throttle_up.mp3 */,
+				0708ED78211732F500EB29BD /* TestSound.m4a */,
+			);
+			path = Source;
+			sourceTree = "<group>";
+		};
 		607FACC71AFB9204008FA782 = {
 			isa = PBXGroup;
 			children = (
@@ -106,7 +149,12 @@
 			isa = PBXGroup;
 			children = (
 				607FACD51AFB9204008FA782 /* AppDelegate.swift */,
+				070713082067EFFB00F789B3 /* AudioController.swift */,
 				607FACD71AFB9204008FA782 /* ViewController.swift */,
+				0707130A2067F2E000F789B3 /* QueueViewController.swift */,
+				070713062067EB4F00F789B3 /* Double + Extensions.swift */,
+				0707130D2067F40A00F789B3 /* QueueTableViewCell.swift */,
+				0707130E2067F40A00F789B3 /* QueueTableViewCell.xib */,
 				607FACD91AFB9204008FA782 /* Main.storyboard */,
 				607FACDC1AFB9204008FA782 /* Images.xcassets */,
 				607FACDE1AFB9204008FA782 /* LaunchScreen.xib */,
@@ -127,12 +175,17 @@
 		607FACE81AFB9204008FA782 /* Tests */ = {
 			isa = PBXGroup;
 			children = (
+				0708ED732116EE0100EB29BD /* AudioPlayerTests.swift */,
 				607FACEB1AFB9204008FA782 /* AVPlayerObserverTests.swift */,
 				074A6482205C155E0083D868 /* AVPlayerTimeObserverTests.swift */,
 				074A6484205C29920083D868 /* AVPlayerItemNotificationObserverTests.swift */,
 				074A6486205E59B60083D868 /* AVPlayerWrapperTests.swift */,
-				07732650205EACA300C4D1CD /* WAV-MP3.wav */,
-				07732652205EB1B500C4D1CD /* nasa_throttle_up.mp3 */,
+				0775575820668B020002C6A1 /* QueueManagerTests.swift */,
+				078C908D210D25F700555E80 /* AVPlayerItemObserverTests.swift */,
+				0708ED6B2116DA4B00EB29BD /* AudioSessionControllerTests.swift */,
+				07DBB1E0212C17E600BB4278 /* QueuedAudioPlayerTests.swift */,
+				07CC171A213E912A005F880E /* SimpleAudioPlayerTests.swift */,
+				0708ED712116E91300EB29BD /* Source */,
 				607FACE91AFB9204008FA782 /* Supporting Files */,
 			);
 			path = Tests;
@@ -188,7 +241,6 @@
 				607FACCD1AFB9204008FA782 /* Frameworks */,
 				607FACCE1AFB9204008FA782 /* Resources */,
 				92F611A7E298DE7BCA0B0B61 /* [CP] Embed Pods Frameworks */,
-				D90D8AB1C4A6EFC8D653227D /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -208,7 +260,6 @@
 				607FACE21AFB9204008FA782 /* Frameworks */,
 				607FACE31AFB9204008FA782 /* Resources */,
 				D41B1A785DE273F72BD47633 /* [CP] Embed Pods Frameworks */,
-				EF21C94415B1482F4674E093 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -275,6 +326,9 @@
 				607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */,
 				607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */,
 				07732655205ECE1C00C4D1CD /* nasa_throttle_up.mp3 in Resources */,
+				07194D222127F6E9002EA8C8 /* ShortTestSound.m4a in Resources */,
+				0708ED79211732F500EB29BD /* TestSound.m4a in Resources */,
+				070713102067F40A00F789B3 /* QueueTableViewCell.xib in Resources */,
 				07732654205ECA8B00C4D1CD /* WAV-MP3.wav in Resources */,
 				607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */,
 			);
@@ -284,6 +338,8 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				07194D212127F6DB002EA8C8 /* ShortTestSound.m4a in Resources */,
+				0708ED7A211732F500EB29BD /* TestSound.m4a in Resources */,
 				07732653205EB1B500C4D1CD /* nasa_throttle_up.mp3 in Resources */,
 				07732651205EACA300C4D1CD /* WAV-MP3.wav in Resources */,
 			);
@@ -348,36 +404,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwiftAudio_Tests/Pods-SwiftAudio_Tests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D90D8AB1C4A6EFC8D653227D /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwiftAudio_Example/Pods-SwiftAudio_Example-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		EF21C94415B1482F4674E093 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwiftAudio_Tests/Pods-SwiftAudio_Tests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		F22DFA58013500305552C406 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -403,7 +429,12 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				0707130B2067F2E000F789B3 /* QueueViewController.swift in Sources */,
+				070713072067EB4F00F789B3 /* Double + Extensions.swift in Sources */,
 				607FACD81AFB9204008FA782 /* ViewController.swift in Sources */,
+				0708ED722116E91D00EB29BD /* Source.swift in Sources */,
+				0707130F2067F40A00F789B3 /* QueueTableViewCell.swift in Sources */,
+				070713092067EFFB00F789B3 /* AudioController.swift in Sources */,
 				607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -412,7 +443,14 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				0708ED702116E89900EB29BD /* Source.swift in Sources */,
+				0708ED742116EE0100EB29BD /* AudioPlayerTests.swift in Sources */,
+				07CC171C213E912E005F880E /* SimpleAudioPlayerTests.swift in Sources */,
+				0775575920668B020002C6A1 /* QueueManagerTests.swift in Sources */,
 				074A6483205C155E0083D868 /* AVPlayerTimeObserverTests.swift in Sources */,
+				078C908F210D263200555E80 /* AVPlayerItemObserverTests.swift in Sources */,
+				0708ED6C2116DA4C00EB29BD /* AudioSessionControllerTests.swift in Sources */,
+				07DBB1E1212C17E600BB4278 /* QueuedAudioPlayerTests.swift in Sources */,
 				074A6485205C29920083D868 /* AVPlayerItemNotificationObserverTests.swift in Sources */,
 				607FACEC1AFB9204008FA782 /* AVPlayerObserverTests.swift in Sources */,
 				074A6487205E59B60083D868 /* AVPlayerWrapperTests.swift in Sources */,

Example/SwiftAudio.xcodeproj/xcshareddata/xcschemes/SwiftAudio-Example.xcscheme

@@ -40,7 +40,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
+      codeCoverageEnabled = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -70,7 +70,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Example/SwiftAudio.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Example/SwiftAudio/AudioController.swift

@@ -0,0 +1,38 @@
+//
+//  AudioController.swift
+//  SwiftAudio_Example
+//
+//  Created by Jørgen Henrichsen on 25/03/2018.
+//  Copyright © 2018 CocoaPods. All rights reserved.
+//
+
+import Foundation
+import SwiftAudio
+
+
+class AudioController {
+    
+    static let shared = AudioController()
+    let player = QueuedAudioPlayer()
+    let audioSessionController = AudioSessionController.shared
+    
+    let sources: [AudioItem] = [
+        DefaultAudioItem(audioUrl: "https://p.scdn.co/mp3-preview/67b51d90ffddd6bb3f095059997021b589845f81?cid=d8a5ed958d274c2e8ee717e6a4b0971d", artist: "Bon Iver", title: "33 \"GOD\"", albumTitle: "22, A Million", sourceType: .stream, artwork: #imageLiteral(resourceName: "22AMI")),
+        DefaultAudioItem(audioUrl: "https://p.scdn.co/mp3-preview/081447adc23dad4f79ba4f1082615d1c56edf5e1?cid=d8a5ed958d274c2e8ee717e6a4b0971d", artist: "Bon Iver", title: "8 (circle)", albumTitle: "22, A Million", sourceType: .stream, artwork: #imageLiteral(resourceName: "22AMI")),
+        DefaultAudioItem(audioUrl: "https://p.scdn.co/mp3-preview/6f9999d909b017eabef97234dd7a206355720d9d?cid=d8a5ed958d274c2e8ee717e6a4b0971d", artist: "Bon Iver", title: "715 - CRΣΣKS", albumTitle: "22, A Million", sourceType: .stream, artwork: #imageLiteral(resourceName: "22AMI")),
+        DefaultAudioItem(audioUrl: "https://p.scdn.co/mp3-preview/bf9bdd403c67fdbe06a582e7b292487c8cfd1f7e?cid=d8a5ed958d274c2e8ee717e6a4b0971d", artist: "Bon Iver", title: "____45_____", albumTitle: "22, A Million", sourceType: .stream, artwork: #imageLiteral(resourceName: "22AMI"))
+    ]
+    
+    init() {
+        player.remoteCommands = [
+            .stop,
+            .togglePlayPause,
+            .next,
+            .previous,
+            .changePlaybackPosition
+        ]
+        try? audioSessionController.set(category: .playback)
+        try? player.add(items: sources, playWhenReady: false)
+    }
+    
+}

Example/SwiftAudio/Base.lproj/Main.storyboard

@@ -22,64 +22,173 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ExO-ir-bnt">
-                                <rect key="frame" x="168" y="20" width="38" height="30"/>
-                                <state key="normal" title="PlayA"/>
+                            <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="RX3-VR-CL6">
+                                <rect key="frame" x="32" y="533" width="311" height="34"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9Q1-U9-TUC">
+                                        <rect key="frame" x="0.0" y="0.0" width="103.5" height="34"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                        <state key="normal" title="Prev"/>
+                                        <connections>
+                                            <action selector="previous:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="fFb-iW-sFr"/>
+                                        </connections>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EOo-zV-6l2">
+                                        <rect key="frame" x="103.5" y="0.0" width="104" height="34"/>
+                                        <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
+                                        <state key="normal" title="Play"/>
+                                        <connections>
+                                            <action selector="togglePlay:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="oYu-xi-n6T"/>
+                                        </connections>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nhf-qB-91A">
+                                        <rect key="frame" x="207.5" y="0.0" width="103.5" height="34"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                        <state key="normal" title="Next"/>
+                                        <connections>
+                                            <action selector="next:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="Tha-3J-gVM"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="34" id="T4q-HG-vqM"/>
+                                </constraints>
+                            </stackView>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l9B-hM-Ajc">
+                                <rect key="frame" x="302" y="20" width="57" height="34"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                                <state key="normal" title="Queue"/>
                                 <connections>
-                                    <action selector="playA:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="KZw-pL-C6H"/>
+                                    <segue destination="vDz-qW-uY8" kind="presentation" identifier="QueueSegue" id="eke-1c-Fsm"/>
                                 </connections>
                             </button>
-                            <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="RWN-If-dGG">
-                                <rect key="frame" x="14" y="318.5" width="347" height="31"/>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="FCd-3e-22D">
+                                <rect key="frame" x="67" y="84" width="240" height="240"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="343" id="CD7-DZ-gUR"/>
+                                    <constraint firstAttribute="width" constant="240" id="5Sj-BZ-sg4"/>
+                                    <constraint firstAttribute="height" constant="240" id="Hij-Yw-6Lg"/>
                                 </constraints>
+                            </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="00:00" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3CL-8o-zYW">
+                                <rect key="frame" x="16" y="462" width="39" height="17"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <color key="textColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="00:00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RVb-HZ-QCX">
+                                <rect key="frame" x="320" y="462" width="39" height="17"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <color key="textColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="RWN-If-dGG">
+                                <rect key="frame" x="14" y="424" width="347" height="31"/>
+                                <color key="tintColor" red="1" green="0.83234566450000003" blue="0.47320586440000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="maximumTrackTintColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="thumbTintColor" red="1" green="0.83234566450000003" blue="0.47320586440000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <connections>
                                     <action selector="scrubbing:" destination="vXZ-lx-hvc" eventType="touchUpOutside" id="HeH-aB-VXZ"/>
                                     <action selector="scrubbing:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="NfP-3T-dnw"/>
+                                    <action selector="scrubbingValueChanged:" destination="vXZ-lx-hvc" eventType="valueChanged" id="MLD-nW-rXm"/>
                                     <action selector="startScrubbing:" destination="vXZ-lx-hvc" eventType="touchDown" id="lD9-dR-QTO"/>
                                 </connections>
                             </slider>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EOo-zV-6l2">
-                                <rect key="frame" x="164" y="494" width="46" height="30"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="30" id="9sD-FT-FL0"/>
-                                </constraints>
-                                <state key="normal" title="Play"/>
-                                <connections>
-                                    <action selector="togglePlay:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="oYu-xi-n6T"/>
-                                </connections>
-                            </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TPr-Wm-k0L">
-                                <rect key="frame" x="168" y="58" width="39" height="30"/>
-                                <state key="normal" title="PlayB"/>
-                                <connections>
-                                    <action selector="playA:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="LEW-J0-qbI"/>
-                                    <action selector="playB:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="OhP-ri-ZWx"/>
-                                </connections>
-                            </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dfk-yr-rwm">
+                                <rect key="frame" x="16" y="354" width="343" height="21.5"/>
+                                <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
+                                <color key="textColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Artist" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T7Y-1Q-7UU">
+                                <rect key="frame" x="16" y="379.5" width="343" height="19.5"/>
+                                <fontDescription key="fontDescription" type="system" weight="thin" pointSize="16"/>
+                                <color key="textColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" red="0.12984204290000001" green="0.12984612579999999" blue="0.12984395030000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="tintColor" red="1" green="0.83234566450000003" blue="0.47320586440000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstAttribute="trailingMargin" secondItem="EOo-zV-6l2" secondAttribute="trailing" constant="149" id="71L-Hv-1br"/>
-                            <constraint firstItem="RWN-If-dGG" firstAttribute="centerY" secondItem="kh9-bI-dsS" secondAttribute="centerY" id="Ee0-Yx-h5a"/>
-                            <constraint firstItem="RWN-If-dGG" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="EzW-Sk-mlN"/>
-                            <constraint firstItem="EOo-zV-6l2" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" constant="148" id="OKq-yH-xWk"/>
-                            <constraint firstItem="TPr-Wm-k0L" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="OaA-Nd-ZGX"/>
-                            <constraint firstItem="ExO-ir-bnt" firstAttribute="top" secondItem="jyV-Pf-zRb" secondAttribute="bottom" id="VtX-IN-h4a"/>
-                            <constraint firstItem="2fi-mo-0CV" firstAttribute="top" secondItem="EOo-zV-6l2" secondAttribute="bottom" constant="143" id="m8i-yM-pER"/>
-                            <constraint firstItem="ExO-ir-bnt" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="mc2-i7-c1f"/>
-                            <constraint firstItem="TPr-Wm-k0L" firstAttribute="top" secondItem="ExO-ir-bnt" secondAttribute="bottom" constant="8" id="voY-Ue-QrT"/>
+                            <constraint firstItem="T7Y-1Q-7UU" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" id="0eh-sL-186"/>
+                            <constraint firstItem="l9B-hM-Ajc" firstAttribute="trailing" secondItem="kh9-bI-dsS" secondAttribute="trailingMargin" id="54L-0h-0ba"/>
+                            <constraint firstItem="l9B-hM-Ajc" firstAttribute="top" secondItem="jyV-Pf-zRb" secondAttribute="bottom" id="9Uh-K9-988"/>
+                            <constraint firstItem="RVb-HZ-QCX" firstAttribute="trailing" secondItem="kh9-bI-dsS" secondAttribute="trailingMargin" id="BhV-UD-qhh"/>
+                            <constraint firstItem="FCd-3e-22D" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="GhI-f1-DkR"/>
+                            <constraint firstItem="T7Y-1Q-7UU" firstAttribute="trailing" secondItem="kh9-bI-dsS" secondAttribute="trailingMargin" id="HoH-i0-yof"/>
+                            <constraint firstItem="RWN-If-dGG" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" id="Nw7-WM-LFd"/>
+                            <constraint firstItem="RX3-VR-CL6" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="O0h-NL-iXW"/>
+                            <constraint firstItem="dfk-yr-rwm" firstAttribute="top" secondItem="FCd-3e-22D" secondAttribute="bottom" constant="30" id="W4w-6K-AW8"/>
+                            <constraint firstItem="RWN-If-dGG" firstAttribute="top" secondItem="T7Y-1Q-7UU" secondAttribute="bottom" constant="25" id="XgV-XL-QCL"/>
+                            <constraint firstItem="dfk-yr-rwm" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" id="YUE-uf-Rp1"/>
+                            <constraint firstItem="RVb-HZ-QCX" firstAttribute="top" secondItem="RWN-If-dGG" secondAttribute="bottom" constant="8" id="ZkD-u2-Zbr"/>
+                            <constraint firstItem="T7Y-1Q-7UU" firstAttribute="top" secondItem="dfk-yr-rwm" secondAttribute="bottom" constant="4" id="baR-zV-tgo"/>
+                            <constraint firstItem="RWN-If-dGG" firstAttribute="trailing" secondItem="kh9-bI-dsS" secondAttribute="trailingMargin" id="eNt-u9-qot"/>
+                            <constraint firstItem="RX3-VR-CL6" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" constant="16" id="hEd-b2-Ggo"/>
+                            <constraint firstItem="FCd-3e-22D" firstAttribute="top" secondItem="l9B-hM-Ajc" secondAttribute="bottom" constant="30" id="ikz-ZP-jNM"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="RX3-VR-CL6" secondAttribute="trailing" constant="16" id="kSP-Mq-R5P"/>
+                            <constraint firstItem="dfk-yr-rwm" firstAttribute="trailing" secondItem="kh9-bI-dsS" secondAttribute="trailingMargin" id="m6u-7a-ffF"/>
+                            <constraint firstItem="3CL-8o-zYW" firstAttribute="top" secondItem="RWN-If-dGG" secondAttribute="bottom" constant="8" id="sGK-bn-zxD"/>
+                            <constraint firstItem="2fi-mo-0CV" firstAttribute="top" secondItem="RX3-VR-CL6" secondAttribute="bottom" constant="100" id="vd2-dd-hVu"/>
+                            <constraint firstItem="3CL-8o-zYW" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" id="wOy-Rx-rvK"/>
                         </constraints>
                     </view>
                     <connections>
+                        <outlet property="artistLabel" destination="T7Y-1Q-7UU" id="b5S-lt-PqG"/>
+                        <outlet property="elapsedTimeLabel" destination="3CL-8o-zYW" id="7Wg-7X-Vrd"/>
+                        <outlet property="imageView" destination="FCd-3e-22D" id="gKL-za-haV"/>
                         <outlet property="playButton" destination="EOo-zV-6l2" id="2d1-ad-s1k"/>
+                        <outlet property="remainingTimeLabel" destination="RVb-HZ-QCX" id="8hp-CK-XjF"/>
                         <outlet property="slider" destination="RWN-If-dGG" id="Yxw-Gf-bR3"/>
+                        <outlet property="titleLabel" destination="dfk-yr-rwm" id="Hk3-m5-IOi"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="117.59999999999999" y="118.29085457271366"/>
         </scene>
+        <!--Queue View Controller-->
+        <scene sceneID="5Fm-oE-9Zc">
+            <objects>
+                <viewController id="vDz-qW-uY8" customClass="QueueViewController" customModule="SwiftAudio_Example" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="kv3-s6-lb0"/>
+                        <viewControllerLayoutGuide type="bottom" id="Fhe-7w-8BG"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="y7Y-Gm-oyZ">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dzA-9p-ejh">
+                                <rect key="frame" x="310" y="20" width="49" height="34"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                                <state key="normal" title="Close"/>
+                                <connections>
+                                    <action selector="closeButton:" destination="vDz-qW-uY8" eventType="touchUpInside" id="0TB-bG-he7"/>
+                                </connections>
+                            </button>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="HPi-Pd-J9K">
+                                <rect key="frame" x="0.0" y="74" width="375" height="593"/>
+                                <color key="backgroundColor" red="0.12984204290000001" green="0.12984612579999999" blue="0.12984395030000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            </tableView>
+                        </subviews>
+                        <color key="backgroundColor" red="0.12984204290000001" green="0.12984612579999999" blue="0.12984395030000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="tintColor" red="1" green="0.1857388616" blue="0.57339501380000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="HPi-Pd-J9K" secondAttribute="trailing" id="CdI-lT-19N"/>
+                            <constraint firstItem="Fhe-7w-8BG" firstAttribute="top" secondItem="HPi-Pd-J9K" secondAttribute="bottom" id="Gb9-C1-ajx"/>
+                            <constraint firstItem="HPi-Pd-J9K" firstAttribute="leading" secondItem="y7Y-Gm-oyZ" secondAttribute="leading" id="aN2-LD-yxR"/>
+                            <constraint firstItem="HPi-Pd-J9K" firstAttribute="top" secondItem="dzA-9p-ejh" secondAttribute="bottom" constant="20" id="aSx-t1-T3e"/>
+                            <constraint firstItem="dzA-9p-ejh" firstAttribute="top" secondItem="kv3-s6-lb0" secondAttribute="bottom" id="nAL-i2-VQS"/>
+                            <constraint firstAttribute="trailing" secondItem="dzA-9p-ejh" secondAttribute="trailing" constant="16" id="qrg-S3-JJ2"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="tableView" destination="HPi-Pd-J9K" id="P8P-at-xLc"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="zk4-9r-5Oh" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="917.60000000000002" y="117.39130434782609"/>
+        </scene>
     </scenes>
 </document>

Example/SwiftAudio/Double + Extensions.swift

@@ -0,0 +1,25 @@
+//
+//  Double + Extensions.swift
+//  SwiftAudio_Example
+//
+//  Created by Jørgen Henrichsen on 25/03/2018.
+//  Copyright © 2018 CocoaPods. All rights reserved.
+//
+
+import Foundation
+
+extension Double {
+    
+    private var formatter: DateComponentsFormatter {
+        let formatter = DateComponentsFormatter()
+        formatter.allowedUnits = [.minute, .second]
+        formatter.unitsStyle = .positional
+        formatter.zeroFormattingBehavior = .pad
+        return formatter
+    }
+    
+    func secondsToString() -> String {
+        return formatter.string(from: self) ?? ""
+    }
+    
+}

Example/SwiftAudio/Images.xcassets/22AMI.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "22AMillion.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Example/SwiftAudio/Info.plist

@@ -35,10 +35,14 @@
 	<array>
 		<string>armv7</string>
 	</array>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleLightContent</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>

Example/SwiftAudio/QueueTableViewCell.swift

@@ -0,0 +1,24 @@
+//
+//  QueueTableViewCell.swift
+//  SwiftAudio_Example
+//
+//  Created by Jørgen Henrichsen on 25/03/2018.
+//  Copyright © 2018 CocoaPods. All rights reserved.
+//
+
+import UIKit
+
+class QueueTableViewCell: UITableViewCell {
+
+    @IBOutlet weak var titleLabel: UILabel!
+    @IBOutlet weak var artistLabel: UILabel!
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+    }
+    
+}

Example/SwiftAudio/QueueTableViewCell.xib

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="QueueTableViewCell" customModule="SwiftAudio_Example" customModuleProvider="target"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="QueueTableViewCell" customModule="SwiftAudio_Example" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="80"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+                <rect key="frame" x="0.0" y="0.0" width="375" height="79.5"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R0I-g7-ETn">
+                        <rect key="frame" x="16" y="16" width="343" height="19.5"/>
+                        <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
+                        <color key="textColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Artist" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jRU-3B-2pA">
+                        <rect key="frame" x="16" y="43.5" width="343" height="19.5"/>
+                        <fontDescription key="fontDescription" type="system" weight="light" pointSize="16"/>
+                        <color key="textColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <color key="backgroundColor" red="0.12984204290000001" green="0.12984612579999999" blue="0.12984395030000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                <constraints>
+                    <constraint firstItem="R0I-g7-ETn" firstAttribute="trailing" secondItem="H2p-sc-9uM" secondAttribute="trailingMargin" id="8gl-XI-iAW"/>
+                    <constraint firstItem="jRU-3B-2pA" firstAttribute="trailing" secondItem="H2p-sc-9uM" secondAttribute="trailingMargin" id="A7F-XO-H0i"/>
+                    <constraint firstItem="jRU-3B-2pA" firstAttribute="top" secondItem="R0I-g7-ETn" secondAttribute="bottom" constant="8" id="Jdu-e3-Oeq"/>
+                    <constraint firstItem="R0I-g7-ETn" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" id="VNU-d7-G4N"/>
+                    <constraint firstAttribute="bottomMargin" secondItem="jRU-3B-2pA" secondAttribute="bottom" constant="6" id="nBr-J4-PUM"/>
+                    <constraint firstItem="R0I-g7-ETn" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="topMargin" constant="5" id="tE6-pp-JML"/>
+                    <constraint firstItem="jRU-3B-2pA" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" id="z3F-hI-GcC"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <connections>
+                <outlet property="artistLabel" destination="jRU-3B-2pA" id="IVV-n5-wmt"/>
+                <outlet property="titleLabel" destination="R0I-g7-ETn" id="ICg-6a-6vz"/>
+            </connections>
+            <point key="canvasLocation" x="34.5" y="54"/>
+        </tableViewCell>
+    </objects>
+</document>

Example/SwiftAudio/QueueViewController.swift

@@ -0,0 +1,84 @@
+//
+//  QueueViewController.swift
+//  SwiftAudio_Example
+//
+//  Created by Jørgen Henrichsen on 25/03/2018.
+//  Copyright © 2018 CocoaPods. All rights reserved.
+//
+
+import UIKit
+import SwiftAudio
+
+
+class QueueViewController: UIViewController {
+    
+    let controller = AudioController.shared
+    @IBOutlet weak var tableView: UITableView!
+    
+    let cellReuseId: String = "QueueCell"
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        tableView.register(UINib.init(nibName: "QueueTableViewCell", bundle: Bundle.main), forCellReuseIdentifier: cellReuseId)
+        tableView.delegate = self
+        tableView.dataSource = self
+    }
+
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
+    @IBAction func closeButton(_ sender: UIButton) {
+        self.dismiss(animated: true, completion: nil)
+    }
+    
+}
+
+extension QueueViewController: UITableViewDataSource, UITableViewDelegate {
+    
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 2
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        switch section {
+        case 0:
+            return 1
+        case 1:
+            return controller.player.nextItems.count ?? 0
+        default:
+            return 0
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseId, for: indexPath) as! QueueTableViewCell
+        
+        let item: AudioItem?
+        switch indexPath.section {
+        case 0:
+            item = controller.player.currentItem
+        case 1:
+            item = controller.player.nextItems[indexPath.row]
+        default:
+            item = nil
+        }
+        
+        if let item = item {
+            cell.titleLabel.text = item.getTitle()
+            cell.artistLabel.text = item.getArtist()
+        }
+        
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+        switch section {
+        case 0: return "Playing Now"
+        case 1: return "Up Next"
+        default: return nil
+        }
+    }
+    
+}

Example/SwiftAudio/ViewController.swift

@@ -16,36 +16,33 @@ class ViewController: UIViewController {
 
     @IBOutlet weak var playButton: UIButton!
     @IBOutlet weak var slider: UISlider!
+    @IBOutlet weak var imageView: UIImageView!
+    @IBOutlet weak var remainingTimeLabel: UILabel!
+    @IBOutlet weak var elapsedTimeLabel: UILabel!
+    @IBOutlet weak var titleLabel: UILabel!
+    @IBOutlet weak var artistLabel: UILabel!
     
     var isScrubbing: Bool = false
-    var audioPlayer: AudioPlayer = AudioPlayer()
-    let audioSessionController: AudioSessionController = AudioSessionController.shared
-    let localSource = DefaultAudioItem(audioUrl: Bundle.main.path(forResource: "WAV-MP3", ofType: "wav")!, artist: "Artist", title: "Title", albumTitle: "Album", sourceType: .file, artwork: #imageLiteral(resourceName: "cover"))
-    let streamSource = DefaultAudioItem(audioUrl: "https://p.scdn.co/mp3-preview/4839b070015ab7d6de9fec1756e1f3096d908fba", artist: "Artist", title: "Title", albumTitle: "Album", sourceType: .stream, artwork: #imageLiteral(resourceName: "cover"))
-    
-    var artwork: MPMediaItemArtwork!
+    let controller = AudioController.shared
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        audioPlayer.delegate = self
-        try? audioSessionController.set(category: .playback)
-        try? audioSessionController.activateSession()
-        let image = #imageLiteral(resourceName: "cover")
-        artwork = MPMediaItemArtwork(boundsSize: image.size, requestHandler: { (size) -> UIImage in
-            return image
-        })
-    }
-    
-    @IBAction func playA(_ sender: Any) {
-        audioPlayer.load(item: localSource)
-    }
-    
-    @IBAction func playB(_ sender: Any) {
-        audioPlayer.load(item: streamSource)
+        controller.player.delegate = self
     }
     
     @IBAction func togglePlay(_ sender: Any) {
-        audioPlayer.togglePlaying()
+        if (!controller.audioSessionController.audioSessionIsActive) {
+            try? controller.audioSessionController.activateSession()
+        }
+        try? controller.player.togglePlaying()
+    }
+    
+    @IBAction func previous(_ sender: Any) {
+        try? controller.player.previous()
+    }
+    
+    @IBAction func next(_ sender: Any) {
+        try? controller.player.next()
     }
     
     @IBAction func startScrubbing(_ sender: UISlider) {
@@ -53,27 +50,41 @@ class ViewController: UIViewController {
     }
     
     @IBAction func scrubbing(_ sender: UISlider) {
-        audioPlayer.seek(to: Double(slider.value))
+        try? controller.player.seek(to: Double(slider.value))
     }
     
-    func update() {
-        slider.maximumValue = Float(audioPlayer.duration)
-        slider.setValue(Float(audioPlayer.currentTime), animated: true)
+    @IBAction func scrubbingValueChanged(_ sender: UISlider) {
+        let value = Double(slider.value)
+        elapsedTimeLabel.text = value.secondsToString()
+        remainingTimeLabel.text = (controller.player.duration - value).secondsToString()
     }
-    
 }
 
 extension ViewController: AudioPlayerDelegate {
     
     func audioPlayer(playerDidChangeState state: AVPlayerWrapperState) {
-        print("AudioPlayer state: ", state.rawValue)
-        self.update()
+        playButton.setTitle(state == .playing ? "Pause" : "Play", for: .normal)
         
-        if state == .playing {
-            playButton.setTitle("Pause", for: .normal)
-        }
-        else {
-            playButton.setTitle("Play", for: .normal)
+        switch state {
+        case .ready:
+            
+            if let item = controller.player.currentItem {
+                titleLabel.text = item.getTitle()
+                artistLabel.text = item.getArtist()
+                item.getArtwork({ (image) in
+                    self.imageView.image = image
+                })
+            }
+            
+            slider.maximumValue = Float(controller.player.duration)
+            slider.setValue(Float(controller.player.currentTime), animated: true)
+            
+            elapsedTimeLabel.text = controller.player.currentTime.secondsToString()
+            remainingTimeLabel.text = (controller.player.duration - controller.player.currentTime).secondsToString()
+            
+        case .loading, .playing, .paused, .idle:
+            slider.maximumValue = Float(controller.player.duration)
+            slider.setValue(Float(controller.player.currentTime), animated: true)
             
         }
     }
@@ -85,6 +96,8 @@ extension ViewController: AudioPlayerDelegate {
     func audioPlayer(secondsElapsed seconds: Double) {
         if !isScrubbing {
             slider.setValue(Float(seconds), animated: false)
+            elapsedTimeLabel.text = controller.player.currentTime.secondsToString()
+            remainingTimeLabel.text = (controller.player.duration - controller.player.currentTime).secondsToString()
         }
     }
     
@@ -96,4 +109,12 @@ extension ViewController: AudioPlayerDelegate {
         isScrubbing = false
     }
     
+    func audioPlayer(didUpdateDuration duration: Double) {
+        slider.maximumValue = Float(controller.player.duration)
+        slider.setValue(Float(controller.player.currentTime), animated: true)
+        
+        elapsedTimeLabel.text = controller.player.currentTime.secondsToString()
+        remainingTimeLabel.text = (controller.player.duration - controller.player.currentTime).secondsToString()
+    }
+    
 }

Example/Tests/AVPlayerItemNotificationObserverTests.swift

@@ -15,7 +15,7 @@ class AVPlayerItemNotificationObserverTests: QuickSpec {
             var observer: AVPlayerItemNotificationObserver!
         
             beforeEach {
-                item = AVPlayerItem(asset: AVURLAsset(url: URL(string: "https://p.scdn.co/mp3-preview/4839b070015ab7d6de9fec1756e1f3096d908fba")!))
+                item = AVPlayerItem(url: URL(fileURLWithPath: Source.path))
                 observer = AVPlayerItemNotificationObserver()
             }
             

Example/Tests/AVPlayerItemObserverTests.swift

@@ -0,0 +1,56 @@
+import Quick
+import Nimble
+import AVFoundation
+
+@testable import SwiftAudio
+
+class AVPlayerItemObserverTests: QuickSpec {
+    
+    override func spec() {
+        
+        describe("An AVPlayerItemObserver") {
+            var observer: AVPlayerItemObserver!
+            beforeEach {
+                observer = AVPlayerItemObserver()
+            }
+            describe("observed item", {
+                context("when observing", {
+                    var item: AVPlayerItem!
+                    beforeEach {
+                        item = AVPlayerItem(url: URL(fileURLWithPath: Source.path))
+                        observer.startObserving(item: item)
+                    }
+                    
+                    it("should exist", closure: {
+                        expect(observer.observingItem).toEventuallyNot(beNil())
+                    })
+                })
+            })
+            
+            describe("observing status", {
+                it("should not be observing", closure: {
+                    expect(observer.isObserving).toEventuallyNot(beTrue())
+                })
+                context("when observing", {
+                    var item: AVPlayerItem!
+                    beforeEach {
+                        item = AVPlayerItem(url: URL(fileURLWithPath: Source.path))
+                        observer.startObserving(item: item)
+                    }
+                    it("should be observing", closure: {
+                        expect(observer.isObserving).toEventually(beTrue())
+                    })
+                })
+            })
+        }
+    }
+}
+
+class AVPlayerItemObserverDelegateHolder: AVPlayerItemObserverDelegate {
+    
+    var updateDuration: ((_ duration: Double) -> Void)?
+    
+    func item(didUpdateDuration duration: Double) {
+        updateDuration?(duration)
+    }
+}

Example/Tests/AVPlayerObserverTests.swift

@@ -34,7 +34,7 @@ class AVPlayerObserverTests: QuickSpec, AVPlayerObserverDelegate {
                 
                 context("when player has started", {
                     beforeEach {
-                        player.replaceCurrentItem(with: AVPlayerItem(asset: AVURLAsset(url: URL(string: "https://p.scdn.co/mp3-preview/4839b070015ab7d6de9fec1756e1f3096d908fba")!)))
+                        player.replaceCurrentItem(with: AVPlayerItem(url: URL(fileURLWithPath: Source.path)))
                         player.play()
                     }
                     
@@ -43,6 +43,16 @@ class AVPlayerObserverTests: QuickSpec, AVPlayerObserverDelegate {
                         expect(self.timeControlStatus).toEventuallyNot(beNil())
                     })
                 })
+                
+                context("when observing again", {
+                    beforeEach {
+                        observer.startObserving()
+                    }
+                    
+                    it("should be observing", closure: {
+                        expect(observer.isObserving).toEventually(beTrue())
+                    })
+                })
             })
             
         }

Example/Tests/AVPlayerWrapperTests.swift

@@ -6,12 +6,8 @@ import Nimble
 
 class AVPlayerWrapperTests: QuickSpec {
 
-
     override func spec() {
 
-        let source = Bundle.main.path(forResource: "WAV-MP3", ofType: "wav")!
-        let shortSource = Bundle.main.path(forResource: "nasa_throttle_up", ofType: "mp3")!
-
         describe("An AVPlayerWrapper") {
 
             var wrapper: AVPlayerWrapper!
@@ -19,30 +15,81 @@ class AVPlayerWrapperTests: QuickSpec {
             beforeEach {
                 wrapper = AVPlayerWrapper()
                 wrapper.automaticallyWaitsToMinimizeStalling = false
+                wrapper.bufferDuration = 0.0001
                 wrapper.volume = 0.0
             }
+            
+            context("when calling play() with no item", {
+                var err: APError.PlaybackError?
+                
+                beforeEach {
+                    do {
+                        try wrapper.play()
+                    }
+                    catch {
+                        if let error = error as? APError.PlaybackError {
+                            err = error
+                        }
+                    }
+                }
+                
+                it("should throw a noItemLoaded error", closure: {
+                    expect(err).toNot(beNil())
+                    expect(err).to(equal(APError.PlaybackError.noLoadedItem))
+                })
+            })
+            
+            context("when calling pause() with no item", {
+                var err: APError.PlaybackError?
+                
+                beforeEach {
+                    do {
+                        try wrapper.pause()
+                    }
+                    catch {
+                        if let error = error as? APError.PlaybackError {
+                            err = error
+                        }
+                    }
+                }
+                
+                it("should throw a noItemLoaded error", closure: {
+                    expect(err).toNot(beNil())
+                    expect(err).to(equal(APError.PlaybackError.noLoadedItem))
+                })
+            })
 
             describe("its state", {
-
-                context("when doing nothing", {
-                    it("should be idle", closure: {
-                        expect(wrapper.state).to(equal(AVPlayerWrapperState.idle))
-                    })
+                it("should be idle", closure: {
+                    expect(wrapper.state).to(equal(AVPlayerWrapperState.idle))
                 })
 
                 context("when loading a source", {
                     beforeEach {
-                        try? wrapper.load(fromFilePath: source, playWhenReady: false)
+                        try? wrapper.load(fromFilePath: Source.path, playWhenReady: false)
                     }
+                    
+                    it("should be loading", closure: {
+                        expect(wrapper.state).to(equal(AVPlayerWrapperState.loading))
+                    })
 
                     it("should eventually be ready", closure: {
                         expect(wrapper.state).toEventually(equal(AVPlayerWrapperState.ready))
                     })
                 })
+                
+                context("when playing with no source", {
+                    beforeEach {
+                        try? wrapper.play()
+                    }
+                    it("should be idle", closure: {
+                        expect(wrapper.state).to(equal(AVPlayerWrapperState.idle))
+                    })
+                })
 
                 context("when playing a source", {
                     beforeEach {
-                        try? wrapper.load(fromFilePath: source, playWhenReady: true)
+                        try? wrapper.load(fromFilePath: Source.path, playWhenReady: true)
                     }
 
                     it("should eventually be playing", closure: {
@@ -53,7 +100,7 @@ class AVPlayerWrapperTests: QuickSpec {
 
                 context("when pausing the source", {
 
-                    let holder = AudioPlayerDelegateHolder()
+                    let holder = AVPlayerWrapperDelegateHolder()
 
                     beforeEach {
                         wrapper.delegate = holder
@@ -62,22 +109,37 @@ class AVPlayerWrapperTests: QuickSpec {
                                 try? wrapper.pause()
                             }
                         }
-                        try? wrapper.load(fromFilePath: source, playWhenReady: true)
+                        try? wrapper.load(fromFilePath: Source.path, playWhenReady: true)
                     }
 
                     it("should eventually be paused", closure: {
                         expect(wrapper.state).toEventually(equal(AVPlayerWrapperState.paused))
                     })
-
+                })
+                
+                context("when toggling the source from play", {
+                    let holder = AVPlayerWrapperDelegateHolder()
+                    beforeEach {
+                        wrapper.delegate = holder
+                        holder.stateUpdate = { (state) in
+                            if state == .playing {
+                                try? wrapper.togglePlaying()
+                            }
+                        }
+                        try? wrapper.load(fromFilePath: Source.path, playWhenReady: true)
+                    }
+                    it("should eventually be paused", closure: {
+                        expect(wrapper.state).toEventually(equal(AVPlayerWrapperState.paused))
+                    })
                 })
 
                 context("when stopping the source", {
 
-                    var holder: AudioPlayerDelegateHolder!
+                    var holder: AVPlayerWrapperDelegateHolder!
                     var receivedIdleUpdate: Bool = false
 
                     beforeEach {
-                        holder = AudioPlayerDelegateHolder()
+                        holder = AVPlayerWrapperDelegateHolder()
                         wrapper.delegate = holder
                         holder.stateUpdate = { (state) in
                             if state == .playing {
@@ -87,7 +149,7 @@ class AVPlayerWrapperTests: QuickSpec {
                                 receivedIdleUpdate = true
                             }
                         }
-                        try? wrapper.load(fromFilePath: source, playWhenReady: true)
+                        try? wrapper.load(fromFilePath: Source.path, playWhenReady: true)
                     }
 
                     it("should eventually be 'idle'", closure: {
@@ -95,20 +157,69 @@ class AVPlayerWrapperTests: QuickSpec {
                     })
 
                 })
-
+                
+                context("when seeking before loading", {
+                    beforeEach {
+                        try? wrapper.seek(to: 10)
+                    }
+                    it("should be idle", closure: {
+                        expect(wrapper.state).to(equal(AVPlayerWrapperState.idle))
+                    })
+                })
             })
+            
+            describe("its duration", {
+                it("should be 0", closure: {
+                    expect(wrapper.duration).to(equal(0))
+                })
+                
+                context("when loading source", {
+                    beforeEach {
+                        try? wrapper.load(fromFilePath: Source.path, playWhenReady: false)
+                    }
+                    it("should eventually not be 0", closure: {
+                        expect(wrapper.duration).toEventuallyNot(equal(0))
+                    })
+                })
+            })
+            
+            describe("its current time", {
+                it("should be 0", closure: {
+                    expect(wrapper.currentTime).to(equal(0))
+                })
+                
+                context("when seeking to a time", {
+                    let holder = AVPlayerWrapperDelegateHolder()
+                    let seekTime: TimeInterval = 0.5
+                    beforeEach {
+                        wrapper.delegate = holder
+                        holder.stateUpdate = { (state) in
+                            if state == .ready && wrapper.duration != 0 {
+                                try? wrapper.seek(to: seekTime)
+                            }
+                        }
+                        try? wrapper.load(fromFilePath: Source.path, playWhenReady: false)
+                    }
+                    
+                    it("should eventually be equal to the seeked time", closure: {
+                        expect(wrapper.currentTime).toEventually(equal(seekTime))
+                    })
+                })
+            })
+            
         }
 
     }
 
 }
 
-class AudioPlayerDelegateHolder: AVPlayerWrapperDelegate {
+class AVPlayerWrapperDelegateHolder: AVPlayerWrapperDelegate {
 
     
     
     var state: AVPlayerWrapperState? {
         didSet {
+            print(state)
             if let state = state {
                 self.stateUpdate?(state)
             }
@@ -138,4 +249,11 @@ class AudioPlayerDelegateHolder: AVPlayerWrapperDelegate {
          
     }
     
+    func AVWrapper(didUpdateDuration duration: Double) {
+        if let state = self.state {
+            self.stateUpdate?(state)
+
+        }
+    }
+    
 }

Example/Tests/AudioPlayerTests.swift

@@ -0,0 +1,185 @@
+import Quick
+import Nimble
+
+@testable import SwiftAudio
+
+class AudioPlayerTests: QuickSpec {
+    
+    override func spec() {
+        describe("An AudioPlayer") {
+            var audioPlayer: AudioPlayer!
+            
+            beforeEach {
+                audioPlayer = AudioPlayer()
+                audioPlayer.automaticallyWaitsToMinimizeStalling = false
+                audioPlayer.bufferDuration = 0.0001
+                audioPlayer.volume = 0
+            }
+            
+            describe("its state", {
+                
+                it("should be idle", closure: {
+                    expect(audioPlayer.playerState).to(equal(AudioPlayerState.idle))
+                })
+                
+                context("when audio item is loaded", {
+                    beforeEach {
+                        try? audioPlayer.loadItem(Source.getAudioItem(), playWhenReady: false)
+                    }
+                    
+                    it("it should eventually be ready", closure: {
+                        expect(audioPlayer.playerState).toEventually(equal(AudioPlayerState.ready))
+                    })
+                })
+                
+                context("when an item is loaded (playWhenReady=true)", {
+                    beforeEach {
+                        try? audioPlayer.loadItem(Source.getAudioItem(), playWhenReady: true)
+                    }
+                    
+                    it("it should eventually be playing", closure: {
+                        expect(audioPlayer.playerState).toEventually(equal(AudioPlayerState.playing))
+                    })
+                })
+                
+                context("when playing an item", {
+                    var holder: AudioPlayerDelegateHolder!
+                    beforeEach {
+                        holder = AudioPlayerDelegateHolder()
+                        audioPlayer.delegate = holder
+                        holder.stateUpdate = { state in
+                            print(state.rawValue)
+                            if state == .ready {
+                                try? audioPlayer.play()
+                            }
+                        }
+                        try? audioPlayer.loadItem(Source.getAudioItem(), playWhenReady: false)
+                    }
+                    
+                    it("should eventually be playing", closure: {
+                        expect(audioPlayer.playerState).toEventually(equal(AudioPlayerState.playing))
+                    })
+                })
+                
+                context("when pausing an item", {
+                    var holder: AudioPlayerDelegateHolder!
+                    beforeEach {
+                        holder = AudioPlayerDelegateHolder()
+                        audioPlayer.delegate = holder
+                        holder.stateUpdate = { (state) in
+                            if state == .playing {
+                                try? audioPlayer.pause()
+                            }
+                        }
+                        try? audioPlayer.loadItem(Source.getAudioItem(), playWhenReady: true)
+                    }
+                    
+                    it("should eventually be paused", closure: {
+                        expect(audioPlayer.playerState).toEventually(equal(AudioPlayerState.paused))
+                    })
+                })
+                
+                context("when stopping an item", {
+                    var holder: AudioPlayerDelegateHolder!
+                    beforeEach {
+                        holder = AudioPlayerDelegateHolder()
+                        audioPlayer.delegate = holder
+                        holder.stateUpdate = { (state) in
+                            if state == .playing {
+                                audioPlayer.stop()
+                            }
+                        }
+                        try? audioPlayer.loadItem(Source.getAudioItem(), playWhenReady: true)
+                    }
+                    
+                    it("should eventually be idle", closure: {
+                        expect(audioPlayer.playerState).toEventually(equal(AudioPlayerState.idle))
+                    })
+                })
+                
+            })
+            
+            describe("its current time", {
+                it("should be 0", closure: {
+                    expect(audioPlayer.currentTime).to(equal(0))
+                })
+                
+                context("when seeking to a time", {
+                    let holder = AudioPlayerDelegateHolder()
+                    let seekTime: TimeInterval = 0.5
+                    beforeEach {
+                        audioPlayer.delegate = holder
+                        holder.stateUpdate = { (state) in
+                            if state == .ready && audioPlayer.duration != 0 {
+                                try? audioPlayer.seek(to: seekTime)
+                            }
+                        }
+                        try? audioPlayer.loadItem(Source.getAudioItem(), playWhenReady: false)
+                    }
+                    
+                    it("should eventually be equal to the seeked time", closure: {
+                        expect(audioPlayer.currentTime).toEventually(equal(seekTime))
+                    })
+                })
+            })
+            
+            describe("its rate", {
+                it("should be 0", closure: {
+                    expect(audioPlayer.rate).to(equal(0))
+                })
+                
+                context("when playing an item", {
+                    beforeEach {
+                        try? audioPlayer.loadItem(Source.getAudioItem(), playWhenReady: true)
+                    }
+                    
+                    it("should eventually be 1.0", closure: {
+                        expect(audioPlayer.rate).toEventually(equal(1.0))
+                    })
+                })
+            })
+        }
+    }
+    
+}
+
+class AudioPlayerDelegateHolder: AudioPlayerDelegate {
+    
+    var stateUpdate: ((_ state: AudioPlayerState) -> Void)?
+    var state: AudioPlayerState? {
+        didSet {
+            if let state = state {
+                stateUpdate?(state)
+            }
+        }
+    }
+    
+    func audioPlayer(playerDidChangeState state: AudioPlayerState) {
+        self.state = state
+    }
+    
+    func audioPlayerItemDidComplete() {
+        
+    }
+    
+    func audioPlayer(secondsElapsed seconds: Double) {
+        
+    }
+    
+    func audioPlayer(failedWithError error: Error?) {
+        
+    }
+    
+    func audioPlayer(seekTo seconds: Int, didFinish: Bool) {
+        
+    }
+    
+    func audioPlayer(didUpdateDuration duration: Double) {
+        if let state = self.state {
+            self.stateUpdate?(state)
+        }
+    }
+    
+}
+
+

Example/Tests/AudioSessionControllerTests.swift

@@ -0,0 +1,86 @@
+import Quick
+import Nimble
+import AVFoundation
+
+@testable import SwiftAudio
+
+class AudioSessionControllerTests: QuickSpec {
+    
+    override func spec() {
+        
+        describe("An AudioSessionController") {
+            let audioSessionController: AudioSessionController = AudioSessionController.shared
+            
+            it("should be inactive", closure: {
+                expect(audioSessionController.audioSessionIsActive).to(beFalse())
+            })
+            
+            context("when session is activated", {
+                beforeEach {
+                    try? audioSessionController.activateSession()
+                }
+                
+                it("should be active", closure: {
+                    expect(audioSessionController.audioSessionIsActive).to(beTrue())
+                })
+                
+                context("when deactivating session", {
+                    beforeEach {
+                        try? audioSessionController.deactivateSession()
+                    }
+                    
+                    it("should be inactive", closure: {
+                        expect(audioSessionController.audioSessionIsActive).to(beFalse())
+                    })
+                })
+            })
+            
+            describe("its isObservingForInterruptions", {
+                it("should be true", closure: {
+                    expect(audioSessionController.isObservingForInterruptions).to(beTrue())
+                })
+                
+                context("when isObservingForInterruptions is set to false", {
+                    beforeEach {
+                        audioSessionController.isObservingForInterruptions = false
+                    }
+                    
+                    it("should be false", closure: {
+                        expect(audioSessionController.isObservingForInterruptions).to(beFalse())
+                    })
+                })
+            })
+            
+            describe("its delegate", {
+                context("when a interruption arrives", {
+                    var delegate: AudioSessionControllerDelegateImplementation!
+                    beforeEach {
+                        let notification = Notification(name: .AVAudioSessionInterruption, object: nil, userInfo: [
+                            AVAudioSessionInterruptionTypeKey: UInt(0)
+                            ])
+                        delegate = AudioSessionControllerDelegateImplementation()
+                        audioSessionController.delegate = delegate
+                        audioSessionController.handleInterruption(notification: notification)
+                    }
+                    
+                    it("should eventually be updated with the interruption type", closure: {
+                        expect(delegate.interruptionType).toEventuallyNot(beNil())
+                    })
+                    
+                })
+            })
+            
+        }
+        
+    }
+    
+}
+
+class AudioSessionControllerDelegateImplementation: AudioSessionControllerDelegate {
+    
+    var interruptionType: AVAudioSessionInterruptionType? = nil
+    
+    func handleInterruption(type: AVAudioSessionInterruptionType) {
+        self.interruptionType = type
+    }
+}