Remove static OCMock, grab from Carthage

* Update OHHTTPStubs to 4.8.0, Quick to 0.9.1
* Add testing framework dsym files to help debugging if things break

13 files changed, 24 insertions, 535 deletions

diff --git a/SmartDeviceLink-iOS/Cartfile.private b/SmartDeviceLink-iOS/Cartfile.private
index 47b42c3cd..62de95756 100644
--- a/SmartDeviceLink-iOS/Cartfile.private
+++ b/SmartDeviceLink-iOS/Cartfile.private
@@ -1,3 +1,4 @@
 github "Quick/Quick" ~> 0.9
 github "Quick/Nimble" ~> 3.1
 github "AliSoftware/OHHTTPStubs" ~> 4.7
+github "erikdoe/ocmock" ~> 3.2
diff --git a/SmartDeviceLink-iOS/Cartfile.resolved b/SmartDeviceLink-iOS/Cartfile.resolved
index 86ec8ac79..dc517c275 100644
--- a/SmartDeviceLink-iOS/Cartfile.resolved
+++ b/SmartDeviceLink-iOS/Cartfile.resolved
@@ -1,3 +1,4 @@
 github "Quick/Nimble" "v3.1.0"
-github "AliSoftware/OHHTTPStubs" "4.7.0"
-github "Quick/Quick" "v0.9.0"
+github "AliSoftware/OHHTTPStubs" "4.8.0"
+github "Quick/Quick" "v0.9.1"
+github "erikdoe/ocmock" "v3.2.2"
diff --git a/SmartDeviceLink-iOS/Libraries/OCMock/NSNotificationCenter+OCMAdditions.h b/SmartDeviceLink-iOS/Libraries/OCMock/NSNotificationCenter+OCMAdditions.h
deleted file mode 100644
index c20a9c2b2..000000000
--- a/SmartDeviceLink-iOS/Libraries/OCMock/NSNotificationCenter+OCMAdditions.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  Copyright (c) 2009-2014 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-@class OCObserverMockObject;
-
-
-@interface NSNotificationCenter(OCMAdditions)
-
-- (void)addMockObserver:(OCObserverMockObject *)notificationObserver name:(NSString *)notificationName object:(id)notificationSender;
-
-@end
diff --git a/SmartDeviceLink-iOS/Libraries/OCMock/OCMArg.h b/SmartDeviceLink-iOS/Libraries/OCMock/OCMArg.h
deleted file mode 100644
index d53437cb7..000000000
--- a/SmartDeviceLink-iOS/Libraries/OCMock/OCMArg.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright (c) 2009-2014 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface OCMArg : NSObject 
-
-// constraining arguments
-
-+ (id)any;
-+ (SEL)anySelector;
-+ (void *)anyPointer;
-+ (id __autoreleasing *)anyObjectRef;
-+ (id)isNil;
-+ (id)isNotNil;
-+ (id)isEqual:(id)value;
-+ (id)isNotEqual:(id)value;
-+ (id)isKindOfClass:(Class)cls;
-+ (id)checkWithSelector:(SEL)selector onObject:(id)anObject;
-+ (id)checkWithBlock:(BOOL (^)(id obj))block;
-
-// manipulating arguments
-
-+ (id *)setTo:(id)value;
-+ (void *)setToValue:(NSValue *)value;
-
-// internal use only
-
-+ (id)resolveSpecialValues:(NSValue *)value;
-
-@end
-
-#define OCMOCK_ANY [OCMArg any]
-
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-  #define OCMOCK_VALUE(variable) \
-    ({ __typeof__(variable) __v = (variable); [NSValue value:&__v withObjCType:@encode(__typeof__(__v))]; })
-#else
-  #define OCMOCK_VALUE(variable) [NSValue value:&variable withObjCType:@encode(__typeof__(variable))]
-#endif
diff --git a/SmartDeviceLink-iOS/Libraries/OCMock/OCMConstraint.h b/SmartDeviceLink-iOS/Libraries/OCMock/OCMConstraint.h
deleted file mode 100644
index 777966ab7..000000000
--- a/SmartDeviceLink-iOS/Libraries/OCMock/OCMConstraint.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  Copyright (c) 2007-2014 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-
-@interface OCMConstraint : NSObject 
-
-+ (instancetype)constraint;
-- (BOOL)evaluate:(id)value;
-
-// if you are looking for any, isNil, etc, they have moved to OCMArg
-
-// try to use [OCMArg checkWith...] instead of the constraintWith... methods below
-
-+ (instancetype)constraintWithSelector:(SEL)aSelector onObject:(id)anObject;
-+ (instancetype)constraintWithSelector:(SEL)aSelector onObject:(id)anObject withValue:(id)aValue;
-
-
-@end
-
-@interface OCMAnyConstraint : OCMConstraint
-@end
-
-@interface OCMIsNilConstraint : OCMConstraint
-@end
-
-@interface OCMIsNotNilConstraint : OCMConstraint
-@end
-
-@interface OCMIsNotEqualConstraint : OCMConstraint
-{
-	@public
-	id testValue;
-}
-
-@end
-
-@interface OCMInvocationConstraint : OCMConstraint
-{
-	@public
-	NSInvocation *invocation;
-}
-
-@end
-
-@interface OCMBlockConstraint : OCMConstraint
-{
-	BOOL (^block)(id);
-}
-
-- (instancetype)initWithConstraintBlock:(BOOL (^)(id))block;
-
-@end
-
-
-#define CONSTRAINT(aSelector) [OCMConstraint constraintWithSelector:aSelector onObject:self]
-#define CONSTRAINTV(aSelector, aValue) [OCMConstraint constraintWithSelector:aSelector onObject:self withValue:(aValue)]
diff --git a/SmartDeviceLink-iOS/Libraries/OCMock/OCMLocation.h b/SmartDeviceLink-iOS/Libraries/OCMock/OCMLocation.h
deleted file mode 100644
index e510db7aa..000000000
--- a/SmartDeviceLink-iOS/Libraries/OCMock/OCMLocation.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Copyright (c) 2014 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface OCMLocation : NSObject
-{
-    id          testCase;
-    NSString    *file;
-    NSUInteger  line;
-}
-
-+ (instancetype)locationWithTestCase:(id)aTestCase file:(NSString *)aFile line:(NSUInteger)aLine;
-
-- (instancetype)initWithTestCase:(id)aTestCase file:(NSString *)aFile line:(NSUInteger)aLine;
-
-- (id)testCase;
-- (NSString *)file;
-- (NSUInteger)line;
-
-@end
-
-extern OCMLocation *OCMMakeLocation(id testCase, const char *file, int line);
diff --git a/SmartDeviceLink-iOS/Libraries/OCMock/OCMMacroState.h b/SmartDeviceLink-iOS/Libraries/OCMock/OCMMacroState.h
deleted file mode 100644
index 4b2d63508..000000000
--- a/SmartDeviceLink-iOS/Libraries/OCMock/OCMMacroState.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Copyright (c) 2014 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-@class OCMLocation;
-@class OCMRecorder;
-@class OCMStubRecorder;
-@class OCMockObject;
-
-
-@interface OCMMacroState : NSObject
-{
-    OCMRecorder *recorder;
-}
-
-+ (void)beginStubMacro;
-+ (OCMStubRecorder *)endStubMacro;
-
-+ (void)beginExpectMacro;
-+ (OCMStubRecorder *)endExpectMacro;
-
-+ (void)beginVerifyMacroAtLocation:(OCMLocation *)aLocation;
-+ (void)endVerifyMacro;
-
-+ (OCMMacroState *)globalState;
-
-- (OCMRecorder *)recorder;
-
-- (void)switchToClassMethod;
-
-@end
diff --git a/SmartDeviceLink-iOS/Libraries/OCMock/OCMRecorder.h b/SmartDeviceLink-iOS/Libraries/OCMock/OCMRecorder.h
deleted file mode 100644
index f56d2ca4c..000000000
--- a/SmartDeviceLink-iOS/Libraries/OCMock/OCMRecorder.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright (c) 2014 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-@class OCMockObject;
-@class OCMInvocationMatcher;
-
-
-@interface OCMRecorder : NSProxy
-{
-    OCMockObject         *mockObject;
-    OCMInvocationMatcher *invocationMatcher;
-}
-
-- (instancetype)init;
-- (instancetype)initWithMockObject:(OCMockObject *)aMockObject;
-
-- (void)setMockObject:(OCMockObject *)aMockObject;
-
-- (OCMInvocationMatcher *)invocationMatcher;
-
-- (id)classMethod;
-- (id)ignoringNonObjectArgs;
-
-@end
diff --git a/SmartDeviceLink-iOS/Libraries/OCMock/OCMStubRecorder.h b/SmartDeviceLink-iOS/Libraries/OCMock/OCMStubRecorder.h
deleted file mode 100644
index 890c9ef3b..000000000
--- a/SmartDeviceLink-iOS/Libraries/OCMock/OCMStubRecorder.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (c) 2004-2014 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import "OCMRecorder.h"
-
-
-@interface OCMStubRecorder : OCMRecorder
-
-- (id)andReturn:(id)anObject;
-- (id)andReturnValue:(NSValue *)aValue;
-- (id)andThrow:(NSException *)anException;
-- (id)andPost:(NSNotification *)aNotification;
-- (id)andCall:(SEL)selector onObject:(id)anObject;
-- (id)andDo:(void (^)(NSInvocation *invocation))block;
-- (id)andForwardToRealObject;
-
-@end
-
-
-@interface OCMStubRecorder (Properties)
-
-#define andReturn(aValue) _andReturn(({ __typeof__(aValue) _v = (aValue); [NSValue value:&_v withObjCType:@encode(__typeof__(_v))]; }))
-@property (nonatomic, readonly) OCMStubRecorder *(^ _andReturn)(NSValue *);
-
-#define andThrow(anException) _andThrow(anException)
-@property (nonatomic, readonly) OCMStubRecorder *(^ _andThrow)(NSException *);
-
-#define andPost(aNotification) _andPost(aNotification)
-@property (nonatomic, readonly) OCMStubRecorder *(^ _andPost)(NSNotification *);
-
-#define andCall(anObject, aSelector) _andCall(anObject, aSelector)
-@property (nonatomic, readonly) OCMStubRecorder *(^ _andCall)(id, SEL);
-
-#define andDo(aBlock) _andDo(aBlock)
-@property (nonatomic, readonly) OCMStubRecorder *(^ _andDo)(void (^)(NSInvocation *));
-
-#define andForwardToRealObject() _andForwardToRealObject()
-@property (nonatomic, readonly) OCMStubRecorder *(^ _andForwardToRealObject)(void);
-
-@end
-
-
-
diff --git a/SmartDeviceLink-iOS/Libraries/OCMock/OCMock.h b/SmartDeviceLink-iOS/Libraries/OCMock/OCMock.h
deleted file mode 100644
index f0083b350..000000000
--- a/SmartDeviceLink-iOS/Libraries/OCMock/OCMock.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  Copyright (c) 2004-2014 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import <OCMock/OCMockObject.h>
-#import <OCMock/OCMRecorder.h>
-#import <OCMock/OCMStubRecorder.h>
-#import <OCMock/OCMConstraint.h>
-#import <OCMock/OCMArg.h>
-#import <OCMock/OCMLocation.h>
-#import <OCMock/OCMMacroState.h>
-#import <OCMock/NSNotificationCenter+OCMAdditions.h>
-
-
-#define OCMClassMock(cls) [OCMockObject niceMockForClass:cls]
-
-#define OCMStrictClassMock(cls) [OCMockObject mockForClass:cls]
-
-#define OCMProtocolMock(protocol) [OCMockObject niceMockForProtocol:protocol]
-
-#define OCMStrictProtocolMock(protocol) [OCMockObject mockForProtocol:protocol]
-
-#define OCMPartialMock(obj) [OCMockObject partialMockForObject:obj]
-
-#define OCMObserverMock() [OCMockObject observerMock]
-
-
-#define OCMStub(invocation) \
-({ \
-    _OCMSilenceWarnings( \
-        [OCMMacroState beginStubMacro]; \
-        invocation; \
-        [OCMMacroState endStubMacro]; \
-    ); \
-})
-
-#define OCMExpect(invocation) \
-({ \
-    _OCMSilenceWarnings( \
-        [OCMMacroState beginExpectMacro]; \
-        invocation; \
-        [OCMMacroState endExpectMacro]; \
-    ); \
-})
-
-#define ClassMethod(invocation) \
-    _OCMSilenceWarnings( \
-        [[OCMMacroState globalState] switchToClassMethod]; \
-        invocation; \
-    );
-
-
-#define OCMVerifyAll(mock) [mock verifyAtLocation:OCMMakeLocation(self, __FILE__, __LINE__)]
-
-#define OCMVerifyAllWithDelay(mock, delay) [mock verifyWithDelay:delay atLocation:OCMMakeLocation(self, __FILE__, __LINE__)]
-
-#define OCMVerify(invocation) \
-({ \
-    _OCMSilenceWarnings( \
-        [OCMMacroState beginVerifyMacroAtLocation:OCMMakeLocation(self, __FILE__, __LINE__)]; \
-        invocation; \
-        [OCMMacroState endVerifyMacro]; \
-    ); \
-})
-
-#define _OCMSilenceWarnings(macro) \
-({ \
-    _Pragma("clang diagnostic push") \
-    _Pragma("clang diagnostic ignored \"-Wunused-value\"") \
-    macro \
-    _Pragma("clang diagnostic pop") \
-})
diff --git a/SmartDeviceLink-iOS/Libraries/OCMock/OCMockObject.h b/SmartDeviceLink-iOS/Libraries/OCMock/OCMockObject.h
deleted file mode 100644
index 63f2bae2b..000000000
--- a/SmartDeviceLink-iOS/Libraries/OCMock/OCMockObject.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  Copyright (c) 2004-2014 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-@class OCMLocation;
-@class OCMInvocationStub;
-@class OCMStubRecorder;
-@class OCMInvocationMatcher;
-@class OCMInvocationExpectation;
-
-
-@interface OCMockObject : NSProxy
-{
-	BOOL			isNice;
-	BOOL			expectationOrderMatters;
-	NSMutableArray	*stubs;
-	NSMutableArray	*expectations;
-	NSMutableArray	*exceptions;
-    NSMutableArray  *invocations;
-}
-
-+ (id)mockForClass:(Class)aClass;
-+ (id)mockForProtocol:(Protocol *)aProtocol;
-+ (id)partialMockForObject:(NSObject *)anObject;
-
-+ (id)niceMockForClass:(Class)aClass;
-+ (id)niceMockForProtocol:(Protocol *)aProtocol;
-
-+ (id)observerMock;
-
-- (instancetype)init;
-
-- (void)setExpectationOrderMatters:(BOOL)flag;
-
-- (id)stub;
-- (id)expect;
-- (id)reject;
-
-- (id)verify;
-- (id)verifyAtLocation:(OCMLocation *)location;
-
-- (void)verifyWithDelay:(NSTimeInterval)delay;
-- (void)verifyWithDelay:(NSTimeInterval)delay atLocation:(OCMLocation *)location;
-
-- (void)stopMocking;
-
-// internal use only
-
-- (void)addStub:(OCMInvocationStub *)aStub;
-- (void)addExpectation:(OCMInvocationExpectation *)anExpectation;
-
-- (BOOL)handleInvocation:(NSInvocation *)anInvocation;
-- (void)handleUnRecordedInvocation:(NSInvocation *)anInvocation;
-- (BOOL)handleSelector:(SEL)sel;
-
-- (void)verifyInvocation:(OCMInvocationMatcher *)matcher;
-- (void)verifyInvocation:(OCMInvocationMatcher *)matcher atLocation:(OCMLocation *)location;
-
-@end
-
diff --git a/SmartDeviceLink-iOS/Libraries/libOCMock.a b/SmartDeviceLink-iOS/Libraries/libOCMock.a
deleted file mode 100644
index 9bb38e21a..000000000
--- a/SmartDeviceLink-iOS/Libraries/libOCMock.a
+++ /dev/null
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
index 231d00892..3aaca83f4 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
+++ b/SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
@@ -223,7 +223,6 @@
 		162E839C1A9BDE8B00906325 /* SDLRPCRequestSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 162E82BB1A9BDE8A00906325 /* SDLRPCRequestSpec.m */; };
 		162E839D1A9BDE8B00906325 /* SDLRPCResponseSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 162E82BC1A9BDE8A00906325 /* SDLRPCResponseSpec.m */; };
 		162E839E1A9BDE8B00906325 /* SDLRPCStructSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 162E82BD1A9BDE8A00906325 /* SDLRPCStructSpec.m */; };
-		167ED92F1A9BB87900797BE5 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 167ED9241A9BB87900797BE5 /* libOCMock.a */; };
 		167ED93C1A9BCB8A00797BE5 /* SmartDeviceLink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D61FA1C1A84237100846EE7 /* SmartDeviceLink.framework */; };
 		167ED9461A9BCE5D00797BE5 /* SwiftSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 167ED9451A9BCE5D00797BE5 /* SwiftSpec.swift */; };
 		1680B1131A9CD7AD00DBD79E /* SDLProtocolHeaderSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 1680B1061A9CD7AD00DBD79E /* SDLProtocolHeaderSpec.m */; };
@@ -748,6 +747,11 @@
 		5D61FE121A84238C00846EE7 /* SDLWarningLightStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FC251A84238C00846EE7 /* SDLWarningLightStatus.m */; };
 		5D61FE131A84238C00846EE7 /* SDLWiperStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FC261A84238C00846EE7 /* SDLWiperStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5D61FE141A84238C00846EE7 /* SDLWiperStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FC271A84238C00846EE7 /* SDLWiperStatus.m */; };
+		5D86022E1C99AF5100A55266 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D1464351C99AC0900727339 /* OCMock.framework */; };
+		5D86022F1C99AF5900A55266 /* OCMock.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5D1464351C99AC0900727339 /* OCMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		5D8602301C99AF8300A55266 /* Nimble.framework.dSYM in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5D1464311C99AC0000727339 /* Nimble.framework.dSYM */; };
+		5D8602311C99AF8300A55266 /* OCMock.framework.dSYM in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5D1464331C99AC0900727339 /* OCMock.framework.dSYM */; };
+		5D8602321C99AF8300A55266 /* Quick.framework.dSYM in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5D1464341C99AC0900727339 /* Quick.framework.dSYM */; };
 		5D8B174F1AC9D266006A6E1C /* SDLDialNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D8B174D1AC9D266006A6E1C /* SDLDialNumber.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5D8B17501AC9D266006A6E1C /* SDLDialNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D8B174E1AC9D266006A6E1C /* SDLDialNumber.m */; };
 		5D8B17531AC9E11B006A6E1C /* SDLDialNumberResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D8B17511AC9E11B006A6E1C /* SDLDialNumberResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -829,6 +833,7 @@
 			dstSubfolderSpec = 10;
 			files = (
 				5DEE55C61B8666A8004F0D0F /* OHHTTPStubs.framework in CopyFiles */,
+				5D86022F1C99AF5900A55266 /* OCMock.framework in CopyFiles */,
 				5D4AB7A21B21EC16004C1AB0 /* SmartDeviceLink.framework in CopyFiles */,
 				162E81CF1A9BDDD800906325 /* Nimble.framework in CopyFiles */,
 				162E81D01A9BDDD800906325 /* Quick.framework in CopyFiles */,
@@ -852,7 +857,10 @@
 			dstPath = "";
 			dstSubfolderSpec = 16;
 			files = (
+				5D8602301C99AF8300A55266 /* Nimble.framework.dSYM in CopyFiles */,
 				5DEE55C51B864AB3004F0D0F /* OHHTTPStubs.framework.dSYM in CopyFiles */,
+				5D8602311C99AF8300A55266 /* OCMock.framework.dSYM in CopyFiles */,
+				5D8602321C99AF8300A55266 /* Quick.framework.dSYM in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1073,16 +1081,6 @@
 		162E82BB1A9BDE8A00906325 /* SDLRPCRequestSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRPCRequestSpec.m; sourceTree = "<group>"; };
 		162E82BC1A9BDE8A00906325 /* SDLRPCResponseSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRPCResponseSpec.m; sourceTree = "<group>"; };
 		162E82BD1A9BDE8A00906325 /* SDLRPCStructSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRPCStructSpec.m; sourceTree = "<group>"; };
-		167ED9241A9BB87900797BE5 /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libOCMock.a; path = Libraries/libOCMock.a; sourceTree = "<group>"; };
-		167ED9261A9BB87900797BE5 /* NSNotificationCenter+OCMAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNotificationCenter+OCMAdditions.h"; sourceTree = "<group>"; };
-		167ED9271A9BB87900797BE5 /* OCMArg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMArg.h; sourceTree = "<group>"; };
-		167ED9281A9BB87900797BE5 /* OCMConstraint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMConstraint.h; sourceTree = "<group>"; };
-		167ED9291A9BB87900797BE5 /* OCMLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMLocation.h; sourceTree = "<group>"; };
-		167ED92A1A9BB87900797BE5 /* OCMMacroState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMMacroState.h; sourceTree = "<group>"; };
-		167ED92B1A9BB87900797BE5 /* OCMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMock.h; sourceTree = "<group>"; };
-		167ED92C1A9BB87900797BE5 /* OCMockObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMockObject.h; sourceTree = "<group>"; };
-		167ED92D1A9BB87900797BE5 /* OCMRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMRecorder.h; sourceTree = "<group>"; };
-		167ED92E1A9BB87900797BE5 /* OCMStubRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMStubRecorder.h; sourceTree = "<group>"; };
 		167ED9451A9BCE5D00797BE5 /* SwiftSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftSpec.swift; sourceTree = "<group>"; };
 		1680B1061A9CD7AD00DBD79E /* SDLProtocolHeaderSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLProtocolHeaderSpec.m; sourceTree = "<group>"; };
 		1680B1071A9CD7AD00DBD79E /* SDLV1ProtocolHeaderSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLV1ProtocolHeaderSpec.m; sourceTree = "<group>"; };
@@ -1104,6 +1102,10 @@
 		5D0218FD1A8E9E0D00D1BF62 /* ConnectionIAPTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConnectionIAPTableViewController.h; path = SmartDeviceLink_Example/Classes/ConnectionIAPTableViewController.h; sourceTree = SOURCE_ROOT; };
 		5D0218FE1A8E9E0D00D1BF62 /* ConnectionIAPTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ConnectionIAPTableViewController.m; path = SmartDeviceLink_Example/Classes/ConnectionIAPTableViewController.m; sourceTree = SOURCE_ROOT; };
 		5D0219041A8E9F6D00D1BF62 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = SmartDeviceLink_Example/Base.lproj/ConnectionIAPTableViewController.storyboard; sourceTree = SOURCE_ROOT; };
+		5D1464311C99AC0000727339 /* Nimble.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = Nimble.framework.dSYM; path = Carthage/Build/iOS/Nimble.framework.dSYM; sourceTree = "<group>"; };
+		5D1464331C99AC0900727339 /* OCMock.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = OCMock.framework.dSYM; path = Carthage/Build/iOS/OCMock.framework.dSYM; sourceTree = "<group>"; };
+		5D1464341C99AC0900727339 /* Quick.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = Quick.framework.dSYM; path = Carthage/Build/iOS/Quick.framework.dSYM; sourceTree = "<group>"; };
+		5D1464351C99AC0900727339 /* OCMock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OCMock.framework; path = Carthage/Build/iOS/OCMock.framework; sourceTree = "<group>"; };
 		5D4019AF1A76EC350006B0C2 /* SmartDeviceLink-Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "SmartDeviceLink-Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5D4029D31A76F0340006B0C2 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = SmartDeviceLink_Example/Images.xcassets; sourceTree = SOURCE_ROOT; };
 		5D4029D51A76F0410006B0C2 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = SmartDeviceLink_Example/Info.plist; sourceTree = SOURCE_ROOT; };
@@ -1686,9 +1688,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				167ED93C1A9BCB8A00797BE5 /* SmartDeviceLink.framework in Frameworks */,
-				167ED92F1A9BB87900797BE5 /* libOCMock.a in Frameworks */,
 				5DEE55C21B864A7D004F0D0F /* OHHTTPStubs.framework in Frameworks */,
 				162E81CB1A9BDD3F00906325 /* Quick.framework in Frameworks */,
+				5D86022E1C99AF5100A55266 /* OCMock.framework in Frameworks */,
 				162E81CA1A9BDD3F00906325 /* Nimble.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1987,33 +1989,18 @@
 		167ED9231A9BB86300797BE5 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
+				5D1464311C99AC0000727339 /* Nimble.framework.dSYM */,
 				5DEE55C41B864AB3004F0D0F /* OHHTTPStubs.framework.dSYM */,
+				5D1464331C99AC0900727339 /* OCMock.framework.dSYM */,
+				5D1464341C99AC0900727339 /* Quick.framework.dSYM */,
+				5D1464351C99AC0900727339 /* OCMock.framework */,
 				5DEE55C11B864A7D004F0D0F /* OHHTTPStubs.framework */,
 				162E81C81A9BDD3F00906325 /* Nimble.framework */,
 				162E81C91A9BDD3F00906325 /* Quick.framework */,
-				167ED9241A9BB87900797BE5 /* libOCMock.a */,
-				167ED9251A9BB87900797BE5 /* OCMock */,
 			);
 			name = Libraries;
 			sourceTree = "<group>";
 		};
-		167ED9251A9BB87900797BE5 /* OCMock */ = {
-			isa = PBXGroup;
-			children = (
-				167ED9261A9BB87900797BE5 /* NSNotificationCenter+OCMAdditions.h */,
-				167ED9271A9BB87900797BE5 /* OCMArg.h */,
-				167ED9281A9BB87900797BE5 /* OCMConstraint.h */,
-				167ED9291A9BB87900797BE5 /* OCMLocation.h */,
-				167ED92A1A9BB87900797BE5 /* OCMMacroState.h */,
-				167ED92B1A9BB87900797BE5 /* OCMock.h */,
-				167ED92C1A9BB87900797BE5 /* OCMockObject.h */,
-				167ED92D1A9BB87900797BE5 /* OCMRecorder.h */,
-				167ED92E1A9BB87900797BE5 /* OCMStubRecorder.h */,
-			);
-			name = OCMock;
-			path = Libraries/OCMock;
-			sourceTree = "<group>";
-		};
 		1680B1041A9CD7AD00DBD79E /* ProtocolSpecs */ = {
 			isa = PBXGroup;
 			children = (
@@ -4088,10 +4075,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Libraries",
-				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.smartdevicelink.smartdevicelink;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				RUN_CLANG_STATIC_ANALYZER = YES;
@@ -4121,10 +4105,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Libraries",
-				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.smartdevicelink.smartdevicelink;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				RUN_CLANG_STATIC_ANALYZER = YES;
@@ -4155,14 +4136,9 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/Libraries",
 				);
 				INFOPLIST_FILE = SmartDeviceLinkTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Libraries",
-				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
@@ -4192,14 +4168,9 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/Libraries",
 				);
 				INFOPLIST_FILE = SmartDeviceLinkTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Libraries",
-				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",