Merge branch 'master' into hotfix/issue_75

31 files changed, 94 insertions, 233 deletions

diff --git a/README.md b/README.md
index 55f898cfc..2f500b5ab 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,8 @@ SmartDeviceLink (SDL) is a standard set of protocols and messages that connect a
   * The optional [SDL Server](https://github.com/smartdevicelink/sdl_server) can be used by Vehicle OEMs to update application policies and gather usage information for connected applications.
   * The [iOS](https://github.com/smartdevicelink/sdl_ios) and [Android](https://github.com/smartdevicelink/sdl_android) libraries are implemented by app developers into their applications to enable command and control via the connected head unit.
 
+<a href="http://www.youtube.com/watch?feature=player_embedded&v=AzdQdSCS24M" target="_blank"><img src="http://i.imgur.com/nm8UujD.png?1" alt="SmartDeviceLink" border="10" /></a>
+
 
 ## Mobile Proxy
 
diff --git a/SmartDeviceLink-iOS/Cartfile.private b/SmartDeviceLink-iOS/Cartfile.private
index ca859a624..47b42c3cd 100644
--- a/SmartDeviceLink-iOS/Cartfile.private
+++ b/SmartDeviceLink-iOS/Cartfile.private
@@ -1,3 +1,3 @@
-github "Quick/Quick" ~> 0.6
-github "Quick/Nimble" "e239824d84105de9e13b815006bc36e938cdd030"
-github "AliSoftware/OHHTTPStubs" ~> 4.2.0
+github "Quick/Quick" ~> 0.9
+github "Quick/Nimble" ~> 3.1
+github "AliSoftware/OHHTTPStubs" ~> 4.7
diff --git a/SmartDeviceLink-iOS/Cartfile.resolved b/SmartDeviceLink-iOS/Cartfile.resolved
index f6dce608d..86ec8ac79 100644
--- a/SmartDeviceLink-iOS/Cartfile.resolved
+++ b/SmartDeviceLink-iOS/Cartfile.resolved
@@ -1,3 +1,3 @@
-github "Quick/Nimble" "e239824d84105de9e13b815006bc36e938cdd030"
-github "AliSoftware/OHHTTPStubs" "4.2.0"
-github "Quick/Quick" "v0.6.0"
+github "Quick/Nimble" "v3.1.0"
+github "AliSoftware/OHHTTPStubs" "4.7.0"
+github "Quick/Quick" "v0.9.0"
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/DSL.h b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/DSL.h
index 551af8856..e4a439063 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/DSL.h
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/DSL.h
@@ -21,6 +21,10 @@ NIMBLE_EXPORT id<NMBMatcher> NMB_equal(id expectedValue);
 NIMBLE_SHORT(id<NMBMatcher> equal(id expectedValue),
              NMB_equal(expectedValue));
 
+NIMBLE_EXPORT id<NMBMatcher> NMB_haveCount(id expectedValue);
+NIMBLE_SHORT(id<NMBMatcher> haveCount(id expectedValue),
+             NMB_haveCount(expectedValue));
+
 NIMBLE_EXPORT NMBObjCBeCloseToMatcher *NMB_beCloseTo(NSNumber *expectedValue);
 NIMBLE_SHORT(NMBObjCBeCloseToMatcher *beCloseTo(id expectedValue),
              NMB_beCloseTo(expectedValue));
@@ -103,12 +107,20 @@ NIMBLE_EXPORT id<NMBMatcher> NMB_allPass(id matcher);
 NIMBLE_SHORT(id<NMBMatcher> allPass(id matcher),
              NMB_allPass(matcher));
 
+NIMBLE_EXPORT id<NMBMatcher> NMB_satisfyAnyOfWithMatchers(id matchers);
+#define NMB_satisfyAnyOf(...) NMB_satisfyAnyOfWithMatchers(@[__VA_ARGS__])
+#ifndef NIMBLE_DISABLE_SHORT_SYNTAX
+#define satisfyAnyOf(...) NMB_satisfyAnyOf(__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.
 typedef void (^NMBWaitUntilTimeoutBlock)(NSTimeInterval timeout, void (^action)(void (^)(void)));
 typedef void (^NMBWaitUntilBlock)(void (^action)(void (^)(void)));
 
+NIMBLE_EXPORT void NMB_failWithMessage(NSString *msg, NSString *file, NSUInteger line);
+
 NIMBLE_EXPORT NMBWaitUntilTimeoutBlock NMB_waitUntilTimeoutBuilder(NSString *file, NSUInteger line);
 NIMBLE_EXPORT NMBWaitUntilBlock NMB_waitUntilBuilder(NSString *file, NSUInteger line);
 
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/NMBExceptionCapture.h b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/NMBExceptionCapture.h
index 8be4a5a69..7e5fb07c3 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/NMBExceptionCapture.h
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/NMBExceptionCapture.h
@@ -1,4 +1,5 @@
 #import <Foundation/Foundation.h>
+#import <dispatch/dispatch.h>
 
 @interface NMBExceptionCapture : NSObject
 
@@ -6,3 +7,5 @@
 - (void)tryBlock:(void(^)())unsafeBlock;
 
 @end
+
+typedef void(^NMBSourceCallbackBlock)(BOOL successful);
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/Nimble-Swift.h b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/Nimble-Swift.h
index 6b083459a..cc3019ae0 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/Nimble-Swift.h
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/Nimble-Swift.h
@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 2.0 (swiftlang-700.0.59 clang-700.0.72)
+// Generated by Apple Swift version 2.1.1 (swiftlang-700.1.101.15 clang-700.1.81)
 #pragma clang diagnostic push
 
 #if defined(__has_include) && __has_include(<swift/objc-prologue.h>)
@@ -112,7 +112,7 @@ SWIFT_CLASS("_TtC6Nimble14FailureMessage")
 
 
 
-/// Protocol for types that support only beEmpty()
+/// Protocol for types that support only beEmpty(), haveCount() matchers
 SWIFT_PROTOCOL("_TtP6Nimble13NMBCollection_")
 @protocol NMBCollection
 @property (nonatomic, readonly) NSInteger count;
@@ -190,6 +190,22 @@ SWIFT_CLASS("_TtC6Nimble14NMBObjCMatcher")
 - (BOOL)doesNotMatch:(NSObject * __null_unspecified (^ __nonnull)(void))actualBlock failureMessage:(FailureMessage * __nonnull)failureMessage location:(SourceLocation * __nonnull)location;
 @end
 
+@class NSNumber;
+
+@interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble))
++ (NMBObjCMatcher * __nonnull)haveCountMatcher:(NSNumber * __nonnull)expected;
+@end
+
+
+@interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble))
++ (NMBObjCMatcher * __nonnull)satisfyAnyOfMatcher:(NSArray<NMBObjCMatcher *> * __nonnull)matchers;
+@end
+
+
+@interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble))
++ (NMBObjCMatcher * __nonnull)endWithMatcher:(id __nonnull)expected;
+@end
+
 
 @interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble))
 + (NMBObjCMatcher * __nonnull)beNilMatcher;
@@ -212,7 +228,7 @@ SWIFT_CLASS("_TtC6Nimble14NMBObjCMatcher")
 
 
 @interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble))
-+ (NMBObjCMatcher * __nonnull)beGreaterThanOrEqualToMatcher:(id <NMBComparable> __nullable)expected;
++ (NMBObjCMatcher * __nonnull)containMatcher:(NSArray<NSObject *> * __nonnull)expected;
 @end
 
 @class NMBObjCRaiseExceptionMatcher;
@@ -262,7 +278,6 @@ SWIFT_CLASS("_TtC6Nimble14NMBObjCMatcher")
 + (NMBObjCMatcher * __nonnull)beLessThanOrEqualToMatcher:(id <NMBComparable> __nullable)expected;
 @end
 
-@class NSNumber;
 
 @interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble))
 + (NMBObjCBeCloseToMatcher * __nonnull)beCloseToMatcher:(NSNumber * __nonnull)expected within:(double)within;
@@ -270,12 +285,7 @@ SWIFT_CLASS("_TtC6Nimble14NMBObjCMatcher")
 
 
 @interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble))
-+ (NMBObjCMatcher * __nonnull)containMatcher:(NSArray<NSObject *> * __nonnull)expected;
-@end
-
-
-@interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble))
-+ (NMBObjCMatcher * __nonnull)endWithMatcher:(id __nonnull)expected;
++ (NMBObjCMatcher * __nonnull)beGreaterThanOrEqualToMatcher:(id <NMBComparable> __nullable)expected;
 @end
 
 
@@ -337,6 +347,10 @@ SWIFT_PROTOCOL("_TtP6Nimble20NMBOrderedCollection_")
 @end
 
 
+@interface NSMapTable (SWIFT_EXTENSION(Nimble)) <NMBCollection>
+@end
+
+
 @interface NSNumber (SWIFT_EXTENSION(Nimble)) <NMBDoubleConvertible>
 @end
 
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/Nimble.h b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/Nimble.h
index 433621887..296760ca7 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/Nimble.h
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/Nimble.h
@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
-#import <Nimble/NMBExceptionCapture.h>
-#import <Nimble/DSL.h>
+#import "NMBExceptionCapture.h"
+#import "DSL.h"
 
 FOUNDATION_EXPORT double NimbleVersionNumber;
-FOUNDATION_EXPORT const unsigned char NimbleVersionString[];
+FOUNDATION_EXPORT const unsigned char NimbleVersionString[];
\ No newline at end of file
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Info.plist b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Info.plist
index b91e50a08..94c91ae0c 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Info.plist
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Info.plist
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftdoc b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftdoc
index ecdb5a69e..4caecf642 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftdoc
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftdoc
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftmodule b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftmodule
index 45c645074..edbe17a17 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftmodule
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftmodule
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftdoc b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftdoc
index 9f13980bb..dac00fed2 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftdoc
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftdoc
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftmodule b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftmodule
index a3d04b5cf..f710dcbc9 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftmodule
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftmodule
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftdoc b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftdoc
index 0af93e7a0..13674c926 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftdoc
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftdoc
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftmodule b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftmodule
index fb6c84ebd..6c83ed1dc 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftmodule
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftmodule
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftdoc b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftdoc
index c5a574ed6..7b3fdcf28 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftdoc
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftdoc
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftmodule b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftmodule
index f12042f42..e1f97eb81 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftmodule
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftmodule
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Nimble b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Nimble
index 6b7c984eb..049b32402 100755
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Nimble
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Nimble
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/_CodeSignature/CodeResources b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/_CodeSignature/CodeResources
index 8a7e67157..0b4c9ddf4 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/_CodeSignature/CodeResources
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/_CodeSignature/CodeResources
@@ -14,7 +14,7 @@
 		</data>
 		<key>Headers/Nimble-Swift.h</key>
 		<data>
-		5/eafmXgULL2D56G12jAMD5cO6o=
+		IqysaLM84ng73FD3OiU/4rUAcrw=
 		</data>
 		<key>Headers/Nimble.h</key>
 		<data>
@@ -22,23 +22,23 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		FGHVVsX+p510d1GOsTFYLbj5z1s=
+		KQTUNHKNb10S92HWhUO4ToOJNss=
 		</data>
 		<key>Modules/Nimble.swiftmodule/arm.swiftdoc</key>
 		<data>
-		lSaVfyH8XbRz0WDbmqKJxc5QtbY=
+		ZoWug5SewWYwcZKS5EP693QQ9qU=
 		</data>
 		<key>Modules/Nimble.swiftmodule/arm.swiftmodule</key>
 		<data>
-		vnsEhtm+gzwpRerpgX5D2/Pt/Rk=
+		4NJ0cyJGTkTdwKyKcq7B4dXmjqU=
 		</data>
 		<key>Modules/Nimble.swiftmodule/arm64.swiftdoc</key>
 		<data>
-		6W52hA33Ca+9qq8Yiql4aY8+0Rk=
+		jheqAz/Tkgr3MUCuVmnG78jFmYQ=
 		</data>
 		<key>Modules/Nimble.swiftmodule/arm64.swiftmodule</key>
 		<data>
-		sEdEu8ni5ADQYbzIvgsWwE32riQ=
+		vlWKD5mD7bSCT8CzPg/zhA+rHiw=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -57,7 +57,7 @@
 		</data>
 		<key>Headers/Nimble-Swift.h</key>
 		<data>
-		5/eafmXgULL2D56G12jAMD5cO6o=
+		IqysaLM84ng73FD3OiU/4rUAcrw=
 		</data>
 		<key>Headers/Nimble.h</key>
 		<data>
@@ -65,19 +65,19 @@
 		</data>
 		<key>Modules/Nimble.swiftmodule/arm.swiftdoc</key>
 		<data>
-		lSaVfyH8XbRz0WDbmqKJxc5QtbY=
+		ZoWug5SewWYwcZKS5EP693QQ9qU=
 		</data>
 		<key>Modules/Nimble.swiftmodule/arm.swiftmodule</key>
 		<data>
-		vnsEhtm+gzwpRerpgX5D2/Pt/Rk=
+		4NJ0cyJGTkTdwKyKcq7B4dXmjqU=
 		</data>
 		<key>Modules/Nimble.swiftmodule/arm64.swiftdoc</key>
 		<data>
-		6W52hA33Ca+9qq8Yiql4aY8+0Rk=
+		jheqAz/Tkgr3MUCuVmnG78jFmYQ=
 		</data>
 		<key>Modules/Nimble.swiftmodule/arm64.swiftmodule</key>
 		<data>
-		sEdEu8ni5ADQYbzIvgsWwE32riQ=
+		vlWKD5mD7bSCT8CzPg/zhA+rHiw=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Headers/Quick-Swift.h b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Headers/Quick-Swift.h
index b5f161df8..5a94f25ff 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Headers/Quick-Swift.h
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Headers/Quick-Swift.h
@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 2.0 (swiftlang-700.0.57.3 clang-700.0.72)
+// Generated by Apple Swift version 2.1.1 (swiftlang-700.1.101.15 clang-700.1.81)
 #pragma clang diagnostic push
 
 #if defined(__has_include) && __has_include(<swift/objc-prologue.h>)
@@ -87,6 +87,8 @@ typedef int swift_int3  __attribute__((__ext_vector_type__(3)));
 typedef int swift_int4  __attribute__((__ext_vector_type__(4)));
 #if defined(__has_feature) && __has_feature(modules)
 @import ObjectiveC;
+@import Foundation;
+@import XCTest;
 #endif
 
 #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch"
@@ -134,8 +136,6 @@ SWIFT_CLASS("_TtC5Quick13Configuration")
 /// whether that example should be excluded from the examples
 /// that are run.
 - (void)exclude:(BOOL (^ __nonnull)(Example * __nonnull))filter;
-
-/// Identical to Quick.Configuration.beforeEach, except the closure is provided with metadata on the example that the closure is being run prior to.
 - (void)beforeEachWithMetadata:(void (^ __nonnull)(ExampleMetadata * __nonnull))closure;
 
 /// Like Quick.DSL.beforeEach, this configures Quick to execute the given closure before each example that is run. The closure passed to this method is executed before each example Quick runs, globally across the test suite. You may call this method multiple times across mulitple +[QuickConfigure configure:] methods in order to define several closures to run before each example.
@@ -149,8 +149,6 @@ SWIFT_CLASS("_TtC5Quick13Configuration")
 /// \param closure The closure to be executed before each example
 /// in the test suite.
 - (void)beforeEach:(void (^ __nonnull)(void))closure;
-
-/// Identical to Quick.Configuration.afterEach, except the closure is provided with metadata on the example that the closure is being run after.
 - (void)afterEachWithMetadata:(void (^ __nonnull)(ExampleMetadata * __nonnull))closure;
 
 /// Like Quick.DSL.afterEach, this configures Quick to execute the given closure after each example that is run. The closure passed to this method is executed after each example Quick runs, globally across the test suite. You may call this method multiple times across mulitple +[QuickConfigure configure:] methods in order to define several closures to run after each example.
@@ -183,7 +181,7 @@ SWIFT_CLASS("_TtC5Quick7Example")
 @property (nonatomic) BOOL isSharedExample;
 
 /// The site at which the example is defined. This must be set correctly in order for Xcode to highlight the correct line in red when reporting a failure.
-@property (nonatomic) Callsite * __nonnull callsite;
+@property (nonatomic, strong) Callsite * __nonnull callsite;
 @property (nonatomic, readonly, copy) NSString * __nonnull description;
 
 /// The example name. A name is a concatenation of the name of the example group the example belongs to, followed by the description of the example itself.
@@ -214,7 +212,7 @@ SWIFT_CLASS("_TtC5Quick15ExampleMetadata")
 @interface ExampleMetadata : NSObject
 
 /// The example for which this metadata was collected.
-@property (nonatomic, readonly) Example * __nonnull example;
+@property (nonatomic, readonly, strong) Example * __nonnull example;
 
 /// The index at which this example was executed in the test suite.
 @property (nonatomic, readonly) NSInteger exampleIndex;
@@ -234,4 +232,29 @@ SWIFT_CLASS("_TtC5Quick6Filter")
 - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
 @end
 
+
+@interface NSBundle (SWIFT_EXTENSION(Quick))
+@end
+
+
+
+/// A base class for a class cluster of Quick test suites, that should correctly build dynamic test suites for XCTest to execute.
+SWIFT_CLASS("_TtC5Quick14QuickTestSuite")
+@interface QuickTestSuite : XCTestSuite
+
+/// Construct a test suite for a specific, selected subset of test cases (rather than the default, which as all test cases).
+///
+/// If this method is called multiple times for the same test case class, e.g..
+///
+/// FooSpec/testFoo
+/// FooSpec/testBar
+///
+/// It is expected that the first call should return a valid test suite, and
+/// all subsequent calls should return <code>nil
+/// </code>.
++ (QuickTestSuite * __nullable)selectedTestSuiteForTestCaseWithName:(NSString * __nonnull)name;
+- (nonnull instancetype)initWithName:(NSString * __nonnull)name OBJC_DESIGNATED_INITIALIZER;
+- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
+@end
+
 #pragma clang diagnostic pop
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Headers/Quick.h b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Headers/Quick.h
index 0c1b72d75..87dad100a 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Headers/Quick.h
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Headers/Quick.h
@@ -6,8 +6,6 @@ FOUNDATION_EXPORT double QuickVersionNumber;
 //! Project version string for Quick.
 FOUNDATION_EXPORT const unsigned char QuickVersionString[];
 
-// In this header, you should import all the public headers of your framework using statements like #import <Quick/PublicHeader.h>
-
-#import <Quick/QuickSpec.h>
-#import <Quick/QCKDSL.h>
-#import <Quick/QuickConfiguration.h>
+#import "QuickSpec.h"
+#import "QCKDSL.h"
+#import "QuickConfiguration.h"
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Info.plist b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Info.plist
index db919ff07..fec3141bb 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Info.plist
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Info.plist
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftdoc b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftdoc
index f3f3fd667..fb2a6444e 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftdoc
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftdoc
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftmodule b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftmodule
index 2af4c8fee..1482eedb9 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftmodule
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftmodule
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftdoc b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftdoc
index 0da84dbc8..1b804226b 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftdoc
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftdoc
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftmodule b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftmodule
index b32b34e8e..166fe09b0 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftmodule
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftmodule
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftdoc b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftdoc
index 7d640c4d8..cce21c570 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftdoc
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftdoc
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftmodule b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftmodule
index 0214177b3..e5fb3d777 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftmodule
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftmodule
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftdoc b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftdoc
index 43d14b64b..8ee7c2567 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftdoc
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftdoc
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftmodule b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftmodule
index d1c23a9b3..f212f8acf 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftmodule
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftmodule
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Quick b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Quick
index e02bac6f8..8306f0026 100755
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Quick
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Quick
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/_CodeSignature/CodeResources b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/_CodeSignature/CodeResources
deleted file mode 100644
index b9fb19d4f..000000000
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/_CodeSignature/CodeResources
+++ /dev/null
@@ -1,191 +0,0 @@
-<?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>files</key>
-	<dict>
-		<key>Headers/QCKDSL.h</key>
-		<data>
-		ZKiC7b5Xxh1q3DnR7Y0VojsEeiQ=
-		</data>
-		<key>Headers/Quick-Swift.h</key>
-		<data>
-		nwK9/gtFsppnJUQpVfJaEI9u1JQ=
-		</data>
-		<key>Headers/Quick.h</key>
-		<data>
-		59agZ84aHaMJ7CsoHmcDe6PDCqc=
-		</data>
-		<key>Headers/QuickConfiguration.h</key>
-		<data>
-		nEtQvPA7W793Xa7hm7CqJF94SiY=
-		</data>
-		<key>Headers/QuickSpec.h</key>
-		<data>
-		JgnCxF7XdP++mBPDkQpO8cfDoKA=
-		</data>
-		<key>Info.plist</key>
-		<data>
-		yZ2Jm1H+bpdPLUxUj2awYiwboN8=
-		</data>
-		<key>Modules/Quick.swiftmodule/arm.swiftdoc</key>
-		<data>
-		jSB7WPmZ7hrMY24i9VtBZRL7id0=
-		</data>
-		<key>Modules/Quick.swiftmodule/arm.swiftmodule</key>
-		<data>
-		ApNzN1mnq3NyTyrXkdhN29RsLM0=
-		</data>
-		<key>Modules/Quick.swiftmodule/arm64.swiftdoc</key>
-		<data>
-		S+mzHjofsaICGrg37LgPK1XYym0=
-		</data>
-		<key>Modules/Quick.swiftmodule/arm64.swiftmodule</key>
-		<data>
-		WtZiJ4VshKV9hXNXM/aPWi6Tt/k=
-		</data>
-		<key>Modules/module.modulemap</key>
-		<data>
-		QfbrXg9M17t7M1mX9Yzh72ZIg20=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>Headers/QCKDSL.h</key>
-		<data>
-		ZKiC7b5Xxh1q3DnR7Y0VojsEeiQ=
-		</data>
-		<key>Headers/Quick-Swift.h</key>
-		<data>
-		nwK9/gtFsppnJUQpVfJaEI9u1JQ=
-		</data>
-		<key>Headers/Quick.h</key>
-		<data>
-		59agZ84aHaMJ7CsoHmcDe6PDCqc=
-		</data>
-		<key>Headers/QuickConfiguration.h</key>
-		<data>
-		nEtQvPA7W793Xa7hm7CqJF94SiY=
-		</data>
-		<key>Headers/QuickSpec.h</key>
-		<data>
-		JgnCxF7XdP++mBPDkQpO8cfDoKA=
-		</data>
-		<key>Modules/Quick.swiftmodule/arm.swiftdoc</key>
-		<data>
-		jSB7WPmZ7hrMY24i9VtBZRL7id0=
-		</data>
-		<key>Modules/Quick.swiftmodule/arm.swiftmodule</key>
-		<data>
-		ApNzN1mnq3NyTyrXkdhN29RsLM0=
-		</data>
-		<key>Modules/Quick.swiftmodule/arm64.swiftdoc</key>
-		<data>
-		S+mzHjofsaICGrg37LgPK1XYym0=
-		</data>
-		<key>Modules/Quick.swiftmodule/arm64.swiftmodule</key>
-		<data>
-		WtZiJ4VshKV9hXNXM/aPWi6Tt/k=
-		</data>
-		<key>Modules/module.modulemap</key>
-		<data>
-		QfbrXg9M17t7M1mX9Yzh72ZIg20=
-		</data>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^</key>
-		<true/>
-		<key>^.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^[^/]+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>