Update for v4.6.04.6.0-rc.1

22 files changed, 471 insertions, 198 deletions

diff --git a/.clang-format b/.clang-format
index 789e138e6..0cfb649d7 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,5 +1,5 @@
 ---
-Language: Cpp
+Language: ObjC
 
 AccessModifierOffset: -2
 AlignTrailingComments: false
@@ -40,6 +40,5 @@ SpacesInCStyleCastParentheses: false
 SpacesInContainerLiterals: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard: Cpp11
 TabWidth: 8
 UseTab: Never
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1331800f4..ac945407b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+# 4.6.0 Release Candidate 1 Release Notes
+### Bug Fixes
+* Fix setting lifecycle configuration `appType` to `nil`.
+* If an array would return `NSNull`, return an empty array instead.
+* Removed uses of `@import` for compatibility issues.
+* Added some Xcode 8.3 compatibility fixes.
+* Fixed reconnection attempts unable to be stopped, or it would crash.
+* Fix `SDLMenuParams initWithMenuParams:parentId:position:` improperly setting `position`.
+* IAP transport now does read/writes on a background thread.
+
+### Other
+* We now use a new podspec: "SmartDeviceLink", and deprecated the current one ("SmartDeviceLink-iOS"), please update your podfiles. This will be necessary for some features in v5.0.
+
+### Known Issues
+* When an app is connected over USB, the USB is disconnected, then reconnected, the app will crash.
+
 # 4.5.5 Release Notes
 ### Bug Fixes
 * Added a check for if `SDLManager` is already started and prevent starting it again.
diff --git a/README.md b/README.md
index 7ba78f97f..01cba55f8 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ See the [roadmap](https://github.com/smartdevicelink/sdl_ios/wiki/Roadmap) to se
 
 You can install this library using [Cocoapods](https://cocoapods.org/pods/SmartDeviceLink-iOS). You can get started with Cocoapods by [following their install guide](https://guides.cocoapods.org/using/getting-started.html#getting-started), and learn how to use Cocoapods to install dependencies [by following this guide](https://guides.cocoapods.org/using/using-cocoapods.html).
 
-In your podfile, you want to add `pod 'SmartDeviceLink-iOS', '~> 4.5'`. Then run `pod install` inside your terminal. With Cocoapods, we support iOS 6.0+.
+In your podfile, you want to add `pod 'SmartDeviceLink-iOS', '~> 4.6'`. Then run `pod install` inside your terminal. With Cocoapods, we support iOS 6.0+.
 
 ##### Carthage
 
diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec
index 9ede8a5a5..1d8983359 100644
--- a/SmartDeviceLink-iOS.podspec
+++ b/SmartDeviceLink-iOS.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name         = "SmartDeviceLink-iOS"
-s.version      = "4.5.5"
+s.version      = "4.6.0-rc.1"
 s.summary      = "Connect your app with cars!"
 s.homepage     = "https://github.com/smartdevicelink/SmartDeviceLink-iOS"
 s.license      = { :type => "New BSD", :file => "LICENSE" }
diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
index e9422ea73..b57ef732d 100644
--- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
+++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
@@ -1909,6 +1909,7 @@
 		5DBAE0AA1D3588AC00CE00BF /* SDLNotificationDispatcherSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLNotificationDispatcherSpec.m; path = DevAPISpecs/SDLNotificationDispatcherSpec.m; sourceTree = "<group>"; };
 		5DBAE0AC1D368D1A00CE00BF /* SDLResponseDispatcherSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLResponseDispatcherSpec.m; path = DevAPISpecs/SDLResponseDispatcherSpec.m; sourceTree = "<group>"; };
 		5DC978251B7A38640012C2F1 /* SDLGlobalsSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLGlobalsSpec.m; path = UtilitiesSpecs/SDLGlobalsSpec.m; sourceTree = "<group>"; };
+		5DCA93811EE06F790015768E /* SmartDeviceLink.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = SmartDeviceLink.podspec; sourceTree = "<group>"; };
 		5DCC199E1B8221F3004FFAD9 /* SDLURLSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLURLSession.h; sourceTree = "<group>"; };
 		5DCC199F1B8221F3004FFAD9 /* SDLURLSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLURLSession.m; sourceTree = "<group>"; };
 		5DCC19A21B822804004FFAD9 /* SDLURLRequestTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLURLRequestTask.h; sourceTree = "<group>"; };
@@ -3324,6 +3325,7 @@
 				5D1665A41CF5D5DA00CC4CA1 /* DEPENDENCIES.md */,
 				5D1665A51CF5D5DA00CC4CA1 /* LICENSE */,
 				5D1665A61CF5D5DA00CC4CA1 /* README.md */,
+				5DCA93811EE06F790015768E /* SmartDeviceLink.podspec */,
 				5D1665A71CF5D5DA00CC4CA1 /* SmartDeviceLink-iOS.podspec */,
 				5D61FA1E1A84237100846EE7 /* Supporting Files */,
 			);
diff --git a/SmartDeviceLink/SDLIAPSession.m b/SmartDeviceLink/SDLIAPSession.m
index 2048f88de..b561a1017 100644
--- a/SmartDeviceLink/SDLIAPSession.m
+++ b/SmartDeviceLink/SDLIAPSession.m
@@ -8,7 +8,7 @@
 #import "SDLStreamDelegate.h"
 #import "SDLTimer.h"
 
-NSString *const IOStreamThreadName  = @"com.smartdevicelink.iostream";
+NSString *const IOStreamThreadName = @"com.smartdevicelink.iostream";
 NSTimeInterval const streamThreadWaitSecs = 1.0;
 
 @interface SDLIAPSession ()
@@ -86,7 +86,7 @@ NSTimeInterval const streamThreadWaitSecs = 1.0;
 - (void)stop {
     if (self.isDataSession) {
         [self.ioStreamThread cancel];
-        
+
         long lWait = dispatch_semaphore_wait(self.canceledSemaphore, dispatch_time(DISPATCH_TIME_NOW, streamThreadWaitSecs * NSEC_PER_SEC));
         if (lWait == 0) {
             [SDLDebugTool logInfo:@"Stream thread canceled"];
@@ -107,7 +107,7 @@ NSTimeInterval const streamThreadWaitSecs = 1.0;
     return !self.isOutputStreamOpen && !self.isInputStreamOpen;
 }
 
-# pragma mark - data send methods
+#pragma mark - data send methods
 
 - (void)sendData:(NSData *)data {
     // Enqueue the data for transmission on the IO thread
@@ -118,7 +118,7 @@ NSTimeInterval const streamThreadWaitSecs = 1.0;
     NSOutputStream *ostream = self.easession.outputStream;
     NSMutableData *remainder = [self.sendDataQueue frontBuffer];
     BOOL allDataWritten = NO;
-    
+
     if (error != nil && remainder != nil && ostream.streamStatus == NSStreamStatusOpen) {
         NSInteger bytesRemaining = remainder.length;
         NSInteger bytesWritten = [ostream write:remainder.bytes maxLength:bytesRemaining];
@@ -148,7 +148,7 @@ NSTimeInterval const streamThreadWaitSecs = 1.0;
     }
 }
 
-# pragma mark - background I/O for data session
+#pragma mark - background I/O for data session
 
 // Data session I/O thread
 - (void)sdl_accessoryEventLoop {
@@ -158,7 +158,7 @@ NSTimeInterval const streamThreadWaitSecs = 1.0;
         if (!self.easession) {
             return;
         }
-        
+
         [self startStream:self.easession.inputStream];
         [self startStream:self.easession.outputStream];
 
@@ -187,7 +187,7 @@ NSTimeInterval const streamThreadWaitSecs = 1.0;
     if (!self.easession) {
         return;
     }
-    
+
     NSString *closeSessionString = [NSString stringWithFormat:@"Close EASession: %tu", self.easession.accessory.connectionID];
     [SDLDebugTool logInfo:closeSessionString];
 
@@ -211,7 +211,7 @@ NSTimeInterval const streamThreadWaitSecs = 1.0;
 
     // When you disconect the cable you get a stream end event and come here but stream is already in closed state.
     // Still need to remove from run loop.
-    
+
     NSAssert((self.isDataSession && [[NSThread currentThread] isEqual:self.ioStreamThread]) || [NSThread isMainThread], @"stopStream is being called on the wrong thread!!!");
 
     NSUInteger status1 = stream.streamStatus;
@@ -272,16 +272,16 @@ NSTimeInterval const streamThreadWaitSecs = 1.0;
 
 - (SDLStreamHasSpaceHandler)sdl_streamHasSpaceHandler {
     __weak typeof(self) weakSelf = self;
-    
+
     return ^(NSStream *stream) {
         __strong typeof(weakSelf) strongSelf = weakSelf;
-        
-        if (!strongSelf.isDataSession){
+
+        if (!strongSelf.isDataSession) {
             return;
         }
-        
+
         NSError *sendErr = nil;
-        
+
         if (![strongSelf sdl_dequeueAndWriteToOutputStream:&sendErr] && sendErr != nil) {
             [strongSelf sdl_handleOutputStreamWriteError:sendErr];
         }
diff --git a/SmartDeviceLink/SDLIAPTransport.m b/SmartDeviceLink/SDLIAPTransport.m
index 651df5fbb..ea0a0a890 100644
--- a/SmartDeviceLink/SDLIAPTransport.m
+++ b/SmartDeviceLink/SDLIAPTransport.m
@@ -5,13 +5,12 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-#import "EAAccessoryManager+SDLProtocols.h"
 #import "EAAccessory+SDLProtocols.h"
+#import "EAAccessoryManager+SDLProtocols.h"
 #import "SDLDebugTool.h"
 #import "SDLGlobals.h"
 #import "SDLIAPSession.h"
 #import "SDLIAPTransport.h"
-#import "SDLIAPTransport.h"
 #import "SDLSiphonServer.h"
 #import "SDLStreamDelegate.h"
 #import "SDLTimer.h"
@@ -77,7 +76,7 @@ int const streamOpenTimeoutSeconds = 2;
                                              selector:@selector(sdl_applicationWillEnterForeground:)
                                                  name:UIApplicationWillEnterForegroundNotification
                                                object:nil];
-    
+
     [[EAAccessoryManager sharedAccessoryManager] registerForLocalNotifications];
 }
 
@@ -104,9 +103,9 @@ int const streamOpenTimeoutSeconds = 2;
     // Only check for the data session, the control session is handled separately
     EAAccessory *accessory = [notification.userInfo objectForKey:EAAccessoryKey];
     if (accessory.connectionID != self.session.accessory.connectionID) {
-         [SDLDebugTool logInfo:@"Accessory connection ID mismatch!!!" withType:SDLDebugType_Transport_iAP toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName];
+        [SDLDebugTool logInfo:@"Accessory connection ID mismatch!!!" withType:SDLDebugType_Transport_iAP toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName];
     }
-    if ([accessory.serialNumber isEqualToString:self.session.accessory.serialNumber]){
+    if ([accessory.serialNumber isEqualToString:self.session.accessory.serialNumber]) {
         self.sessionSetupInProgress = NO;
         [self disconnect];
         [self.delegate onTransportDisconnected];
@@ -154,7 +153,7 @@ int const streamOpenTimeoutSeconds = 2;
 
 - (BOOL)sdl_connectAccessory:(EAAccessory *)accessory {
     BOOL connecting = NO;
-    
+
     if ([accessory supportsProtocol:controlProtocolString]) {
         [self sdl_createIAPControlSessionWithAccessory:accessory];
         connecting = YES;
@@ -162,7 +161,7 @@ int const streamOpenTimeoutSeconds = 2;
         [self sdl_createIAPDataSessionWithAccessory:accessory forProtocol:legacyProtocolString];
         connecting = YES;
     }
-    
+
     return connecting;
 }
 
@@ -173,11 +172,11 @@ int const streamOpenTimeoutSeconds = 2;
         self.retryCounter++;
         EAAccessory *sdlAccessory = accessory;
         // If we are being called from sdl_connectAccessory, the EAAccessoryDidConnectNotification will contain the SDL accessory to connect to and we can connect without searching the accessory manager's connected accessory list. Otherwise, we fall through to a search.
-        if (sdlAccessory != nil && [self sdl_connectAccessory:sdlAccessory]){
+        if (sdlAccessory != nil && [self sdl_connectAccessory:sdlAccessory]) {
             // Connection underway, exit
             return;
         }
-        
+
         // Determine if we can start a multi-app session or a legacy (single-app) session
         if ((sdlAccessory = [EAAccessoryManager findAccessoryForProtocol:controlProtocolString])) {
             [self sdl_createIAPControlSessionWithAccessory:sdlAccessory];
@@ -188,7 +187,7 @@ int const streamOpenTimeoutSeconds = 2;
             [SDLDebugTool logInfo:@"No accessory supporting a required sync protocol was found."];
             self.sessionSetupInProgress = NO;
         }
-        
+
     } else {
         // We are beyond the number of retries allowed
         [SDLDebugTool logInfo:@"Create session retries exhausted."];
@@ -266,7 +265,7 @@ int const streamOpenTimeoutSeconds = 2;
 - (void)sdl_retryEstablishSession {
     // Current strategy disallows automatic retries.
     self.sessionSetupInProgress = NO;
-    if (self.session != nil){
+    if (self.session != nil) {
         [self.session stop];
         self.session.delegate = nil;
         self.session = nil;
@@ -310,7 +309,7 @@ int const streamOpenTimeoutSeconds = 2;
     if (self.session == nil || !self.session.accessory.connected) {
         return;
     }
-    
+
     [self.session sendData:data];
 }
 
@@ -362,7 +361,7 @@ int const streamOpenTimeoutSeconds = 2;
 
             // Determine protocol string of the data session, then create that data session
             NSString *indexedProtocolString = [NSString stringWithFormat:@"%@%@", indexedProtocolStringPrefix, @(buf[0])];
-            if (accessory.isConnected){
+            if (accessory.isConnected) {
                 dispatch_async(dispatch_get_main_queue(), ^{
                     [strongSelf sdl_createIAPDataSessionWithAccessory:accessory forProtocol:indexedProtocolString];
                 });
@@ -416,7 +415,7 @@ int const streamOpenTimeoutSeconds = 2;
         uint8_t buf[[SDLGlobals globals].maxMTUSize];
         while (istream.streamStatus == NSStreamStatusOpen && istream.hasBytesAvailable) {
             // It is necessary to check the stream status and whether there are bytes available because the dataStreamHasBytesHandler is executed on the IO thread and the accessory disconnect notification arrives on the main thread, causing data to be passed to the delegate while the main thread is tearing down the transport.
-            
+
             NSInteger bytesRead = [istream read:buf maxLength:[SDLGlobals globals].maxMTUSize];
             NSData *dataIn = [NSData dataWithBytes:buf length:bytesRead];
 
diff --git a/SmartDeviceLink/SDLLifecycleManager.m b/SmartDeviceLink/SDLLifecycleManager.m
index 185822148..ae65fd0f6 100644
--- a/SmartDeviceLink/SDLLifecycleManager.m
+++ b/SmartDeviceLink/SDLLifecycleManager.m
@@ -117,7 +117,7 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
         [SDLDebugTool logFormat:@"Warning: SDL has already been started, this attempt will be ignored."];
         return;
     }
-    
+
     self.readyHandler = [readyHandler copy];
 
     [self.lifecycleStateMachine transitionToState:SDLLifecycleStateStarted];
@@ -148,7 +148,7 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
 + (NSDictionary<SDLState *, SDLAllowableStateTransitions *> *)sdl_stateTransitionDictionary {
     return @{
         SDLLifecycleStateStopped: @[SDLLifecycleStateStarted],
-        SDLLifecycleStateStarted : @[SDLLifecycleStateConnected, SDLLifecycleStateStopped, SDLLifecycleStateReconnecting],
+        SDLLifecycleStateStarted: @[SDLLifecycleStateConnected, SDLLifecycleStateStopped, SDLLifecycleStateReconnecting],
         SDLLifecycleStateReconnecting: @[SDLLifecycleStateStarted, SDLLifecycleStateStopped],
         SDLLifecycleStateConnected: @[SDLLifecycleStateStopped, SDLLifecycleStateReconnecting, SDLLifecycleStateRegistered],
         SDLLifecycleStateRegistered: @[SDLLifecycleStateStopped, SDLLifecycleStateReconnecting, SDLLifecycleStateSettingUpManagers],
@@ -161,7 +161,7 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
 }
 
 - (void)didEnterStateStarted {
-    // Start up the internal proxy object
+// Start up the internal proxy object
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
     if (self.configuration.lifecycleConfig.tcpDebugMode) {
@@ -277,7 +277,7 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
            }];
 }
 
-- (void)didEnterStateSettingUpHMI{
+- (void)didEnterStateSettingUpHMI {
     // We want to make sure we've gotten a SDLOnHMIStatus notification
     if (self.hmiLevel == nil) {
         // If nil, return and wait until we get a notification
@@ -420,7 +420,7 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
     return @(++self.lastCorrelationId);
 }
 
-+ (BOOL)sdl_checkNotification:(NSNotification *)notification containsKindOfClass:(Class)class {
++ (BOOL)sdl_checkNotification:(NSNotification *)notification containsKindOfClass:(Class) class {
     NSAssert([notification.userInfo[SDLNotificationUserInfoObject] isKindOfClass:class], @"A notification was sent with an unanticipated object");
     if (![notification.userInfo[SDLNotificationUserInfoObject] isKindOfClass:class]) {
         return NO;
@@ -429,7 +429,7 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
     return YES;
 }
 
-+ (void)sdl_updateLoggingWithFlags : (SDLLogOutput)logFlags {
+    + (void)sdl_updateLoggingWithFlags : (SDLLogOutput)logFlags {
     if (logFlags == SDLLogOutputNone) {
         [SDLDebugTool disable];
         return;
@@ -478,7 +478,7 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
     SDLOnHMIStatus *hmiStatusNotification = notification.notification;
     SDLHMILevel *oldHMILevel = self.hmiLevel;
     self.hmiLevel = hmiStatusNotification.hmiLevel;
-    
+
     if ([self.lifecycleStateMachine isCurrentState:SDLLifecycleStateSettingUpHMI]) {
         [self.lifecycleStateMachine transitionToState:SDLLifecycleStateReady];
     }
diff --git a/SmartDeviceLink/SDLMutableDataQueue.h b/SmartDeviceLink/SDLMutableDataQueue.h
index 1632acf5a..ece0c0e76 100755..100644
--- a/SmartDeviceLink/SDLMutableDataQueue.h
+++ b/SmartDeviceLink/SDLMutableDataQueue.h
@@ -1,6 +1,6 @@
 //
 //  SDLMutableDataQueue.h
-//  
+//
 //
 //  Created by David Switzer on 3/2/17.
 //
@@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
  @return NSMutableData containing the buffer at the head of the queue or nil if
  the queue is empty
  */
-- (NSMutableData  * _Nullable)frontBuffer;
+- (NSMutableData *_Nullable)frontBuffer;
 
 
 /**
@@ -47,12 +47,12 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  Gets the number of buffers currently enqueued
  */
-@property(nonatomic, assign, readonly) NSUInteger count;
+@property (nonatomic, assign, readonly) NSUInteger count;
 
 /**
  A flag indicating whether the buffer at the head of the queue has been dequeued at least once.
  */
-@property(nonatomic, assign, readonly, getter=isFrontBufferDequeued) BOOL frontDequeued;
+@property (nonatomic, assign, readonly, getter=isFrontBufferDequeued) BOOL frontDequeued;
 
 NS_ASSUME_NONNULL_END
 
diff --git a/SmartDeviceLink/SDLMutableDataQueue.m b/SmartDeviceLink/SDLMutableDataQueue.m
index c91b25d85..a2a98f494 100755..100644
--- a/SmartDeviceLink/SDLMutableDataQueue.m
+++ b/SmartDeviceLink/SDLMutableDataQueue.m
@@ -1,6 +1,6 @@
 //
 //  SDLMutableDataQueue.m
-//  
+//
 //
 //  Created by David Switzer on 3/2/17.
 //
@@ -10,10 +10,10 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SDLMutableDataQueue()
+@interface SDLMutableDataQueue ()
 
-@property(nonatomic, strong) NSMutableArray *elements;
-@property(nonatomic, assign, readwrite) BOOL frontDequeued;
+@property (nonatomic, strong) NSMutableArray *elements;
+@property (nonatomic, assign, readwrite) BOOL frontDequeued;
 
 @end
 
@@ -24,48 +24,48 @@ NS_ASSUME_NONNULL_BEGIN
     if (!self) {
         return nil;
     }
-    
+
     _elements = [NSMutableArray array];
-    
+
     return self;
 }
 
 - (void)enqueueBuffer:(NSMutableData *)data {
     // Since this method is being called from the main thread and the dequeue methods are being called from the data session stream thread, we need to put critical sections around the queue members. Use the @synchronized object level lock to do this.
-    @synchronized (self) {
+    @synchronized(self) {
         [self.elements addObject:data];
         self.frontDequeued = NO;
     }
 }
 
-- (NSMutableData  * _Nullable )frontBuffer {
+- (NSMutableData *_Nullable)frontBuffer {
     NSMutableData *dataAtFront = nil;
-    
-    @synchronized (self) {
+
+    @synchronized(self) {
         if (self.elements.count) {
             // The front of the queue is always at index 0
             dataAtFront = self.elements[0];
             self.frontDequeued = YES;
         }
     }
-    
+
     return dataAtFront;
 }
 
 - (void)popBuffer {
-    @synchronized (self) {
+    @synchronized(self) {
         [self.elements removeObjectAtIndex:0];
     }
 }
 
 - (void)removeAllObjects {
-    @synchronized (self) {
+    @synchronized(self) {
         [self.elements removeAllObjects];
     }
 }
 
 - (NSUInteger)count {
-    @synchronized (self) {
+    @synchronized(self) {
         return self.elements.count;
     }
 }
diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m
index 68eb8f6fc..e47c24ba7 100644
--- a/SmartDeviceLink/SDLProxy.m
+++ b/SmartDeviceLink/SDLProxy.m
@@ -23,16 +23,10 @@
 #import "SDLOnHMIStatus.h"
 #import "SDLOnSystemRequest.h"
 #import "SDLPolicyDataParser.h"
-#import "SDLPolicyDataParser.h"
-#import "SDLPolicyDataParser.h"
 #import "SDLProtocol.h"
 #import "SDLProtocolMessage.h"
-#import "SDLProtocolMessage.h"
-#import "SDLProtocolMessage.h"
 #import "SDLPutFile.h"
 #import "SDLRPCPayload.h"
-#import "SDLRPCPayload.h"
-#import "SDLRPCPayload.h"
 #import "SDLRPCResponse.h"
 #import "SDLRegisterAppInterfaceResponse.h"
 #import "SDLRequestType.h"
@@ -49,7 +43,7 @@ typedef NSString SDLVehicleMake;
 typedef void (^URLSessionTaskCompletionHandler)(NSData *data, NSURLResponse *response, NSError *error);
 typedef void (^URLSessionDownloadTaskCompletionHandler)(NSURL *location, NSURLResponse *response, NSError *error);
 
-NSString *const SDLProxyVersion = @"4.5.5";
+NSString *const SDLProxyVersion = @"4.6.0-rc.1";
 const float startSessionTime = 10.0;
 const float notifyProxyClosedDelay = 0.1;
 const int POLICIES_CORRELATION_ID = 65535;
diff --git a/SmartDeviceLink/SDLRPCRequestFactory.m b/SmartDeviceLink/SDLRPCRequestFactory.m
index 6f0d1f566..7f0939bc3 100644
--- a/SmartDeviceLink/SDLRPCRequestFactory.m
+++ b/SmartDeviceLink/SDLRPCRequestFactory.m
@@ -12,7 +12,6 @@
 #import "SDLAlertManeuver.h"
 #import "SDLAppHMIType.h"
 #import "SDLAppInfo.h"
-#import "SDLAppInfo.h"
 #import "SDLChangeRegistration.h"
 #import "SDLCreateInteractionChoiceSet.h"
 #import "SDLDebugTool.h"
diff --git a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
index 1247ad495..4b553dfe2 100644
--- a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
+++ b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
@@ -16,8 +16,8 @@
 #import "SDLSoftButtonCapabilities.h"
 #import "SDLSpeechCapabilities.h"
 #import "SDLSyncMsgVersion.h"
-#import "SDLVrCapabilities.h"
 #import "SDLVehicleType.h"
+#import "SDLVrCapabilities.h"
 
 
 @implementation SDLRegisterAppInterfaceResponse
diff --git a/SmartDeviceLink/SDLStreamingMediaManager.m b/SmartDeviceLink/SDLStreamingMediaManager.m
index 3bf380522..11fa8048e 100644
--- a/SmartDeviceLink/SDLStreamingMediaManager.m
+++ b/SmartDeviceLink/SDLStreamingMediaManager.m
@@ -384,7 +384,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark Callbacks
 
-void sdl_videoEncoderOutputCallback(void * CM_NULLABLE outputCallbackRefCon, void * CM_NULLABLE sourceFrameRefCon, OSStatus status, VTEncodeInfoFlags infoFlags, CM_NULLABLE CMSampleBufferRef sampleBuffer) {
+void sdl_videoEncoderOutputCallback(void *CM_NULLABLE outputCallbackRefCon, void *CM_NULLABLE sourceFrameRefCon, OSStatus status, VTEncodeInfoFlags infoFlags, CM_NULLABLE CMSampleBufferRef sampleBuffer) {
     // If there was an error in the encoding, drop the frame
     if (status != noErr) {
         [SDLDebugTool logFormat:@"Error encoding video, err=%lld", (int64_t)status];
@@ -394,7 +394,7 @@ void sdl_videoEncoderOutputCallback(void * CM_NULLABLE outputCallbackRefCon, voi
     if (outputCallbackRefCon == NULL || sourceFrameRefCon == NULL || sampleBuffer == NULL) {
         return;
     }
-    
+
     SDLStreamingMediaManager *mediaManager = (__bridge SDLStreamingMediaManager *)sourceFrameRefCon;
     NSData *elementaryStreamData = [mediaManager.class sdl_encodeElementaryStreamWithSampleBuffer:sampleBuffer];
 
diff --git a/SmartDeviceLink/SmartDeviceLink.h b/SmartDeviceLink/SmartDeviceLink.h
index 394a7894c..b8fef3aab 100644
--- a/SmartDeviceLink/SmartDeviceLink.h
+++ b/SmartDeviceLink/SmartDeviceLink.h
@@ -214,9 +214,9 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[];
 #import "SDLTouchEvent.h"
 #import "SDLTouchEventCapabilities.h"
 #import "SDLTurn.h"
-#import "SDLVrHelpItem.h"
 #import "SDLVehicleDataResult.h"
 #import "SDLVehicleType.h"
+#import "SDLVrHelpItem.h"
 
 // Enums
 #import "SDLAmbientLightStatus.h"
@@ -279,13 +279,13 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[];
 #import "SDLTouchType.h"
 #import "SDLTriggerSource.h"
 #import "SDLUpdateMode.h"
-#import "SDLVrCapabilities.h"
 #import "SDLVehicleDataActiveStatus.h"
 #import "SDLVehicleDataEventStatus.h"
 #import "SDLVehicleDataNotificationStatus.h"
 #import "SDLVehicleDataResultCode.h"
 #import "SDLVehicleDataStatus.h"
 #import "SDLVehicleDataType.h"
+#import "SDLVrCapabilities.h"
 #import "SDLWarningLightStatus.h"
 #import "SDLWaypointType.h"
 #import "SDLWiperStatus.h"
diff --git a/SmartDeviceLink/SmartDeviceLink.podspec b/SmartDeviceLink/SmartDeviceLink.podspec
new file mode 100644
index 000000000..04e2a3075
--- /dev/null
+++ b/SmartDeviceLink/SmartDeviceLink.podspec
@@ -0,0 +1,289 @@
+Pod::Spec.new do |s|
+
+s.name         = "SmartDeviceLink"
+s.version      = "4.6.0-rc.1"
+s.summary      = "Connect your app with cars!"
+s.homepage     = "https://github.com/smartdevicelink/SmartDeviceLink-iOS"
+s.license      = { :type => "New BSD", :file => "LICENSE" }
+s.author       = { "SmartDeviceLink Team" => "developer@smartdevicelink.com" }
+s.platform     = :ios, "6.0"
+s.source       = { :git => "https://github.com/smartdevicelink/sdl_ios.git", :tag => s.version.to_s }
+s.source_files = "SmartDeviceLink/*.{h,m}"
+s.requires_arc = true
+s.resource_bundles = { 'SmartDeviceLink' => ['SmartDeviceLink/Assets/**/*', 'SmartDeviceLink/iOS 7 Assets/*'] }
+s.public_header_files = [
+'SmartDeviceLink/SmartDeviceLink.h',
+'SmartDeviceLink/SDLJingle.h',
+'SmartDeviceLink/SDLProxy.h',
+'SmartDeviceLink/SDLProxyFactory.h',
+'SmartDeviceLink/SDLProxyListener.h',
+'SmartDeviceLink/SDLSecurityType.h',
+'SmartDeviceLink/SDLStreamingMediaManager.h',
+'SmartDeviceLink/SDLTTSChunkFactory.h',
+'SmartDeviceLink/SDLTouchManager.h',
+'SmartDeviceLink/SDLTouchManagerDelegate.h',
+'SmartDeviceLink/SDLConsoleController.h',
+'SmartDeviceLink/SDLDebugTool.h',
+'SmartDeviceLink/SDLDebugToolConsole.h',
+'SmartDeviceLink/SDLSiphonServer.h',
+'SmartDeviceLink/SDLAbstractTransport.h',
+'SmartDeviceLink/SDLIAPSessionDelegate.h',
+'SmartDeviceLink/SDLIAPTransport.h',
+'SmartDeviceLink/SDLTCPTransport.h',
+'SmartDeviceLink/SDLTransportDelegate.h',
+'SmartDeviceLink/SDLAbstractProtocol.h',
+'SmartDeviceLink/SDLProtocol.h',
+'SmartDeviceLink/SDLProtocolListener.h',
+'SmartDeviceLink/SDLProtocolHeader.h',
+'SmartDeviceLink/SDLProtocolMessage.h',
+'SmartDeviceLink/SDLEnum.h',
+'SmartDeviceLink/SDLRPCMessage.h',
+'SmartDeviceLink/SDLRPCNotification.h',
+'SmartDeviceLink/SDLRPCRequest.h',
+'SmartDeviceLink/SDLRPCResponse.h',
+'SmartDeviceLink/SDLRPCStruct.h',
+'SmartDeviceLink/SDLRPCRequestFactory.h',
+'SmartDeviceLink/SDLAddCommand.h',
+'SmartDeviceLink/SDLAddSubMenu.h',
+'SmartDeviceLink/SDLAlert.h',
+'SmartDeviceLink/SDLAlertManeuver.h',
+'SmartDeviceLink/SDLChangeRegistration.h',
+'SmartDeviceLink/SDLCreateInteractionChoiceSet.h',
+'SmartDeviceLink/SDLDeleteCommand.h',
+'SmartDeviceLink/SDLDeleteFile.h',
+'SmartDeviceLink/SDLDeleteInteractionChoiceSet.h',
+'SmartDeviceLink/SDLDeleteSubMenu.h',
+'SmartDeviceLink/SDLDiagnosticMessage.h',
+'SmartDeviceLink/SDLDialNumber.h',
+'SmartDeviceLink/SDLEncodedSyncPData.h',
+'SmartDeviceLink/SDLEndAudioPassThru.h',
+'SmartDeviceLink/SDLGetDTCs.h',
+'SmartDeviceLink/SDLGetVehicleData.h',
+'SmartDeviceLink/SDLGetWaypoints.h',
+'SmartDeviceLink/SDLListFiles.h',
+'SmartDeviceLink/SDLPerformAudioPassThru.h',
+'SmartDeviceLink/SDLPerformInteraction.h',
+'SmartDeviceLink/SDLPutFile.h',
+'SmartDeviceLink/SDLReadDID.h',
+'SmartDeviceLink/SDLRegisterAppInterface.h',
+'SmartDeviceLink/SDLResetGlobalProperties.h',
+'SmartDeviceLink/SDLScrollableMessage.h',
+'SmartDeviceLink/SDLSendLocation.h',
+'SmartDeviceLink/SDLSetAppIcon.h',
+'SmartDeviceLink/SDLSetDisplayLayout.h',
+'SmartDeviceLink/SDLSetGlobalProperties.h',
+'SmartDeviceLink/SDLSetMediaClockTimer.h',
+'SmartDeviceLink/SDLShow.h',
+'SmartDeviceLink/SDLShowConstantTBT.h',
+'SmartDeviceLink/SDLSlider.h',
+'SmartDeviceLink/SDLSpeak.h',
+'SmartDeviceLink/SDLSubscribeButton.h',
+'SmartDeviceLink/SDLSubscribeVehicleData.h',
+'SmartDeviceLink/SDLSubscribeWaypoints.h',
+'SmartDeviceLink/SDLSyncPData.h',
+'SmartDeviceLink/SDLUnregisterAppInterface.h',
+'SmartDeviceLink/SDLUnsubscribeButton.h',
+'SmartDeviceLink/SDLUnsubscribeVehicleData.h',
+'SmartDeviceLink/SDLUnsubscribeWaypoints.h',
+'SmartDeviceLink/SDLUpdateTurnList.h',
+'SmartDeviceLink/SDLAddCommandResponse.h',
+'SmartDeviceLink/SDLAddSubMenuResponse.h',
+'SmartDeviceLink/SDLAlertManeuverResponse.h',
+'SmartDeviceLink/SDLAlertResponse.h',
+'SmartDeviceLink/SDLChangeRegistrationResponse.h',
+'SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.h',
+'SmartDeviceLink/SDLDeleteCommandResponse.h',
+'SmartDeviceLink/SDLDeleteFileResponse.h',
+'SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.h',
+'SmartDeviceLink/SDLDeleteSubMenuResponse.h',
+'SmartDeviceLink/SDLDiagnosticMessageResponse.h',
+'SmartDeviceLink/SDLDialNumberResponse.h',
+'SmartDeviceLink/SDLEncodedSyncPDataResponse.h',
+'SmartDeviceLink/SDLEndAudioPassThruResponse.h',
+'SmartDeviceLink/SDLGenericResponse.h',
+'SmartDeviceLink/SDLGetDTCsResponse.h',
+'SmartDeviceLink/SDLGetVehicleDataResponse.h',
+'SmartDeviceLink/SDLGetWaypointsResponse.h',
+'SmartDeviceLink/SDLListFilesResponse.h',
+'SmartDeviceLink/SDLPerformAudioPassThruResponse.h',
+'SmartDeviceLink/SDLPerformInteractionResponse.h',
+'SmartDeviceLink/SDLPutFileResponse.h',
+'SmartDeviceLink/SDLReadDIDResponse.h',
+'SmartDeviceLink/SDLRegisterAppInterfaceResponse.h',
+'SmartDeviceLink/SDLResetGlobalPropertiesResponse.h',
+'SmartDeviceLink/SDLScrollableMessageResponse.h',
+'SmartDeviceLink/SDLSendLocationResponse.h',
+'SmartDeviceLink/SDLSetAppIconResponse.h',
+'SmartDeviceLink/SDLSetDisplayLayoutResponse.h',
+'SmartDeviceLink/SDLSetGlobalPropertiesResponse.h',
+'SmartDeviceLink/SDLSetMediaClockTimerResponse.h',
+'SmartDeviceLink/SDLShowConstantTBTResponse.h',
+'SmartDeviceLink/SDLShowResponse.h',
+'SmartDeviceLink/SDLSliderResponse.h',
+'SmartDeviceLink/SDLSpeakResponse.h',
+'SmartDeviceLink/SDLSubscribeButtonResponse.h',
+'SmartDeviceLink/SDLSubscribeVehicleDataResponse.h',
+'SmartDeviceLink/SDLSubscribeWaypointsResponse.h',
+'SmartDeviceLink/SDLSyncPDataResponse.h',
+'SmartDeviceLink/SDLUnregisterAppInterfaceResponse.h',
+'SmartDeviceLink/SDLUnsubscribeButtonResponse.h',
+'SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h',
+'SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h',
+'SmartDeviceLink/SDLUpdateTurnListResponse.h',
+'SmartDeviceLink/SDLOnAppInterfaceUnregistered.h',
+'SmartDeviceLink/SDLOnAudioPassThru.h',
+'SmartDeviceLink/SDLOnButtonEvent.h',
+'SmartDeviceLink/SDLOnButtonPress.h',
+'SmartDeviceLink/SDLOnCommand.h',
+'SmartDeviceLink/SDLOnDriverDistraction.h',
+'SmartDeviceLink/SDLOnEncodedSyncPData.h',
+'SmartDeviceLink/SDLOnHMIStatus.h',
+'SmartDeviceLink/SDLOnHashChange.h',
+'SmartDeviceLink/SDLOnKeyboardInput.h',
+'SmartDeviceLink/SDLOnLanguageChange.h',
+'SmartDeviceLink/SDLOnLockScreenStatus.h',
+'SmartDeviceLink/SDLOnPermissionsChange.h',
+'SmartDeviceLink/SDLOnSyncPData.h',
+'SmartDeviceLink/SDLOnSystemRequest.h',
+'SmartDeviceLink/SDLOnTBTClientState.h',
+'SmartDeviceLink/SDLOnTouchEvent.h',
+'SmartDeviceLink/SDLOnVehicleData.h',
+'SmartDeviceLink/SDLOnWaypointChange.h',
+'SmartDeviceLink/SDLAirbagStatus.h',
+'SmartDeviceLink/SDLAppInfo.h',
+'SmartDeviceLink/SDLAudioPassThruCapabilities.h',
+'SmartDeviceLink/SDLBeltStatus.h',
+'SmartDeviceLink/SDLBodyInformation.h',
+'SmartDeviceLink/SDLButtonCapabilities.h',
+'SmartDeviceLink/SDLChoice.h',
+'SmartDeviceLink/SDLClusterModeStatus.h',
+'SmartDeviceLink/SDLDIDResult.h',
+'SmartDeviceLink/SDLDateTime.h',
+'SmartDeviceLink/SDLDeviceInfo.h',
+'SmartDeviceLink/SDLDeviceStatus.h',
+'SmartDeviceLink/SDLDisplayCapabilities.h',
+'SmartDeviceLink/SDLECallInfo.h',
+'SmartDeviceLink/SDLEmergencyEvent.h',
+'SmartDeviceLink/SDLGPSData.h',
+'SmartDeviceLink/SDLHMICapabilities.h',
+'SmartDeviceLink/SDLHMIPermissions.h',
+'SmartDeviceLink/SDLHeadLampStatus.h',
+'SmartDeviceLink/SDLImage.h',
+'SmartDeviceLink/SDLImageField.h',
+'SmartDeviceLink/SDLImageResolution.h',
+'SmartDeviceLink/SDLKeyboardProperties.h',
+'SmartDeviceLink/SDLMenuParams.h',
+'SmartDeviceLink/SDLMyKey.h',
+'SmartDeviceLink/SDLOasisAddress.h',
+'SmartDeviceLink/SDLParameterPermissions.h',
+'SmartDeviceLink/SDLPermissionItem.h',
+'SmartDeviceLink/SDLPresetBankCapabilities.h',
+'SmartDeviceLink/SDLScreenParams.h',
+'SmartDeviceLink/SDLSingleTireStatus.h',
+'SmartDeviceLink/SDLSoftButton.h',
+'SmartDeviceLink/SDLSoftButtonCapabilities.h',
+'SmartDeviceLink/SDLStartTime.h',
+'SmartDeviceLink/SDLSyncMsgVersion.h',
+'SmartDeviceLink/SDLTTSChunk.h',
+'SmartDeviceLink/SDLTextField.h',
+'SmartDeviceLink/SDLTireStatus.h',
+'SmartDeviceLink/SDLTouchCoord.h',
+'SmartDeviceLink/SDLTouchEvent.h',
+'SmartDeviceLink/SDLTouchEventCapabilities.h',
+'SmartDeviceLink/SDLTurn.h',
+'SmartDeviceLink/SDLVRHelpItem.h',
+'SmartDeviceLink/SDLVehicleDataResult.h',
+'SmartDeviceLink/SDLVehicleType.h',
+'SmartDeviceLink/SDLAmbientLightStatus.h',
+'SmartDeviceLink/SDLAppHMIType.h',
+'SmartDeviceLink/SDLAppInterfaceUnregisteredReason.h',
+'SmartDeviceLink/SDLAudioStreamingState.h',
+'SmartDeviceLink/SDLAudioType.h',
+'SmartDeviceLink/SDLBitsPerSample.h',
+'SmartDeviceLink/SDLButtonEventMode.h',
+'SmartDeviceLink/SDLButtonName.h',
+'SmartDeviceLink/SDLButtonPressMode.h',
+'SmartDeviceLink/SDLCarModeStatus.h',
+'SmartDeviceLink/SDLCharacterSet.h',
+'SmartDeviceLink/SDLCompassDirection.h',
+'SmartDeviceLink/SDLComponentVolumeStatus.h',
+'SmartDeviceLink/SDLDeliveryMode.h',
+'SmartDeviceLink/SDLDeviceLevelStatus.h',
+'SmartDeviceLink/SDLDimension.h',
+'SmartDeviceLink/SDLDisplayType.h',
+'SmartDeviceLink/SDLDriverDistractionState.h',
+'SmartDeviceLink/SDLECallConfirmationStatus.h',
+'SmartDeviceLink/SDLEmergencyEventType.h',
+'SmartDeviceLink/SDLFileType.h',
+'SmartDeviceLink/SDLFuelCutoffStatus.h',
+'SmartDeviceLink/SDLGlobalProperty.h',
+'SmartDeviceLink/SDLHMILevel.h',
+'SmartDeviceLink/SDLHMIZoneCapabilities.h',
+'SmartDeviceLink/SDLIgnitionStableStatus.h',
+'SmartDeviceLink/SDLIgnitionStatus.h',
+'SmartDeviceLink/SDLImageFieldName.h',
+'SmartDeviceLink/SDLImageType.h',
+'SmartDeviceLink/SDLInteractionMode.h',
+'SmartDeviceLink/SDLKeyboardEvent.h',
+'SmartDeviceLink/SDLKeyboardLayout.h',
+'SmartDeviceLink/SDLKeypressMode.h',
+'SmartDeviceLink/SDLLanguage.h',
+'SmartDeviceLink/SDLLayoutMode.h',
+'SmartDeviceLink/SDLLocationCoordinate.h',
+'SmartDeviceLink/SDLLocationDetails.h',
+'SmartDeviceLink/SDLLockScreenStatus.h',
+'SmartDeviceLink/SDLMaintenanceModeStatus.h',
+'SmartDeviceLink/SDLMediaClockFormat.h',
+'SmartDeviceLink/SDLPRNDL.h',
+'SmartDeviceLink/SDLPermissionStatus.h',
+'SmartDeviceLink/SDLPowerModeQualificationStatus.h',
+'SmartDeviceLink/SDLPowerModeStatus.h',
+'SmartDeviceLink/SDLPredefinedLayout.h',
+'SmartDeviceLink/SDLPrerecordedSpeech.h',
+'SmartDeviceLink/SDLPrimaryAudioSource.h',
+'SmartDeviceLink/SDLRPCMessageType.h',
+'SmartDeviceLink/SDLRequestType.h',
+'SmartDeviceLink/SDLResult.h',
+'SmartDeviceLink/SDLSamplingRate.h',
+'SmartDeviceLink/SDLSoftButtonType.h',
+'SmartDeviceLink/SDLSpeechCapabilities.h',
+'SmartDeviceLink/SDLSystemAction.h',
+'SmartDeviceLink/SDLSystemContext.h',
+'SmartDeviceLink/SDLTBTState.h',
+'SmartDeviceLink/SDLTextAlignment.h',
+'SmartDeviceLink/SDLTextFieldName.h',
+'SmartDeviceLink/SDLTimerMode.h',
+'SmartDeviceLink/SDLTouchType.h',
+'SmartDeviceLink/SDLTriggerSource.h',
+'SmartDeviceLink/SDLUpdateMode.h',
+'SmartDeviceLink/SDLVRCapabilities.h',
+'SmartDeviceLink/SDLVehicleDataActiveStatus.h',
+'SmartDeviceLink/SDLVehicleDataEventStatus.h',
+'SmartDeviceLink/SDLVehicleDataNotificationStatus.h',
+'SmartDeviceLink/SDLVehicleDataResultCode.h',
+'SmartDeviceLink/SDLVehicleDataStatus.h',
+'SmartDeviceLink/SDLVehicleDataType.h',
+'SmartDeviceLink/SDLWarningLightStatus.h',
+'SmartDeviceLink/SDLWaypointType.h',
+'SmartDeviceLink/SDLWiperStatus.h',
+'SmartDeviceLink/SDLConfiguration.h',
+'SmartDeviceLink/SDLLifecycleConfiguration.h',
+'SmartDeviceLink/SDLLockScreenConfiguration.h',
+'SmartDeviceLink/SDLArtwork.h',
+'SmartDeviceLink/SDLFile.h',
+'SmartDeviceLink/SDLFileManager.h',
+'SmartDeviceLink/SDLFileManagerConstants.h',
+'SmartDeviceLink/SDLLockScreenViewController.h',
+'SmartDeviceLink/SDLManager.h',
+'SmartDeviceLink/SDLManagerDelegate.h',
+'SmartDeviceLink/SDLPermissionConstants.h',
+'SmartDeviceLink/SDLPermissionManager.h',
+'SmartDeviceLink/NSNumber+NumberType.h',
+'SmartDeviceLink/SDLErrorConstants.h',
+'SmartDeviceLink/SDLNotificationConstants.h',
+'SmartDeviceLink/SDLRequestHandler.h',
+'SmartDeviceLink/SDLRPCNotificationNotification.h',
+'SmartDeviceLink/SDLRPCResponseNotification.h'
+]
+
+end
diff --git a/SmartDeviceLink_Example/Info.plist b/SmartDeviceLink_Example/Info.plist
index 753c2b42c..18aa6f4c6 100644
--- a/SmartDeviceLink_Example/Info.plist
+++ b/SmartDeviceLink_Example/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.5.5</string>
+	<string>4.6.0-rc.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/docs/Classes.html b/docs/Classes.html
index 160cf74d8..c0df22d0f 100644
--- a/docs/Classes.html
+++ b/docs/Classes.html
@@ -254,8 +254,6 @@
   <li><a href="#section-SDLUpdateMode">SDLUpdateMode</a></li>
   <li><a href="#section-SDLUpdateTurnList">SDLUpdateTurnList</a></li>
   <li><a href="#section-SDLUpdateTurnListResponse">SDLUpdateTurnListResponse</a></li>
-  <li><a href="#section-SDLVRCapabilities">SDLVRCapabilities</a></li>
-  <li><a href="#section-SDLVRHelpItem">SDLVRHelpItem</a></li>
   <li><a href="#section-SDLVehicleDataActiveStatus">SDLVehicleDataActiveStatus</a></li>
   <li><a href="#section-SDLVehicleDataEventStatus">SDLVehicleDataEventStatus</a></li>
   <li><a href="#section-SDLVehicleDataNotificationStatus">SDLVehicleDataNotificationStatus</a></li>
@@ -264,6 +262,8 @@
   <li><a href="#section-SDLVehicleDataStatus">SDLVehicleDataStatus</a></li>
   <li><a href="#section-SDLVehicleDataType">SDLVehicleDataType</a></li>
   <li><a href="#section-SDLVehicleType">SDLVehicleType</a></li>
+  <li><a href="#section-SDLVRCapabilities">SDLVRCapabilities</a></li>
+  <li><a href="#section-SDLVRHelpItem">SDLVRHelpItem</a></li>
   <li><a href="#section-SDLWarningLightStatus">SDLWarningLightStatus</a></li>
   <li><a href="#section-SDLWaypointType">SDLWaypointType</a></li>
   <li><a href="#section-SDLWiperStatus">SDLWiperStatus</a></li>
@@ -2519,7 +2519,7 @@ Function Group: ProprietaryData
 
   
   <h4>Swift</h4>
-  <pre class="highlight"><code><span class="kd">class</span> <span class="kt">SDLLifecycleConfiguration</span> <span class="p">:</span> <span class="kt">NSObject</span><span class="p">,</span> <span class="kt">NSCopying</span></code></pre>
+  <pre class="highlight"><code><span class="kd">class</span> <span class="kt">SDLLifecycleConfiguration</span></code></pre>
 
   
   
@@ -5412,39 +5412,6 @@ See SDLSubscribeButton</p>
   
   
   
-  <h3 id="section-SDLVRCapabilities">
-      SDLVRCapabilities
-  </h3>
-  
-  <p>The VR capabilities of the connected SDL platform.</p>
-
-<p>@since SDL 1.0</p>
-
-  <a href="Classes/SDLVRCapabilities.html" class="slightly-smaller">See more</a>
-  
-  
-  <h4>Objective-C</h4>
-  <pre class="highlight"><code><span class="k">@interface</span> <span class="nc">SDLVRCapabilities</span> <span class="p">:</span> <span class="nc">SDLEnum</span></code></pre>
-
-  
-  <h4>Swift</h4>
-  <pre class="highlight"><code><span class="kd">class</span> <span class="kt">SDLVRCapabilities</span> <span class="p">:</span> <span class="kt"><a href="Classes/SDLEnum.html">SDLEnum</a></span></code></pre>
-
-  
-  
-  
-  <h3 id="section-SDLVRHelpItem">
-      SDLVRHelpItem
-  </h3>
-  
-  <p>Undocumented</p>
-
-  <a href="Classes/SDLVRHelpItem.html" class="slightly-smaller">See more</a>
-  
-  
-  
-  
-  
   <h3 id="section-SDLVehicleDataActiveStatus">
       SDLVehicleDataActiveStatus
   </h3>
@@ -5598,6 +5565,39 @@ See SDLSubscribeButton</p>
   
   
   
+  <h3 id="section-SDLVRCapabilities">
+      SDLVRCapabilities
+  </h3>
+  
+  <p>The VR capabilities of the connected SDL platform.</p>
+
+<p>@since SDL 1.0</p>
+
+  <a href="Classes/SDLVRCapabilities.html" class="slightly-smaller">See more</a>
+  
+  
+  <h4>Objective-C</h4>
+  <pre class="highlight"><code><span class="k">@interface</span> <span class="nc">SDLVRCapabilities</span> <span class="p">:</span> <span class="nc">SDLEnum</span></code></pre>
+
+  
+  <h4>Swift</h4>
+  <pre class="highlight"><code><span class="kd">class</span> <span class="kt">SDLVRCapabilities</span> <span class="p">:</span> <span class="kt"><a href="Classes/SDLEnum.html">SDLEnum</a></span></code></pre>
+
+  
+  
+  
+  <h3 id="section-SDLVRHelpItem">
+      SDLVRHelpItem
+  </h3>
+  
+  <p>Undocumented</p>
+
+  <a href="Classes/SDLVRHelpItem.html" class="slightly-smaller">See more</a>
+  
+  
+  
+  
+  
   <h3 id="section-SDLWarningLightStatus">
       SDLWarningLightStatus
   </h3>
diff --git a/docs/Classes/SDLLifecycleConfiguration.html b/docs/Classes/SDLLifecycleConfiguration.html
index 7024465ec..dd5713f27 100644
--- a/docs/Classes/SDLLifecycleConfiguration.html
+++ b/docs/Classes/SDLLifecycleConfiguration.html
@@ -60,7 +60,7 @@
 
   
   <h4>Swift</h4>
-  <pre class="highlight"><code><span class="kd">class</span> <span class="kd">func</span> <span class="nf">defaultConfiguration</span><span class="p">(</span><span class="n">withAppName</span> <span class="nv">appName</span><span class="p">:</span> <span class="kt">String</span><span class="p">,</span> <span class="nv">appId</span><span class="p">:</span> <span class="kt">String</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kt">SDLLifecycleConfiguration</span></code></pre>
+  <pre class="highlight"><code><span class="kd">class</span> <span class="kd">func</span> <span class="nf">defaultConfiguration</span><span class="p">(</span><span class="n">withAppName</span> <span class="nv">appName</span><span class="p">:</span> <span class="kt">Any</span><span class="o">!</span><span class="p">,</span> <span class="nv">appId</span><span class="p">:</span> <span class="kt">Any</span><span class="o">!</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kt">SDLLifecycleConfiguration</span><span class="o">!</span></code></pre>
 
   
   
@@ -96,7 +96,7 @@
 
   
   <h4>Swift</h4>
-  <pre class="highlight"><code><span class="kd">class</span> <span class="kd">func</span> <span class="nf">debugConfiguration</span><span class="p">(</span><span class="n">withAppName</span> <span class="nv">appName</span><span class="p">:</span> <span class="kt">String</span><span class="p">,</span> <span class="nv">appId</span><span class="p">:</span> <span class="kt">String</span><span class="p">,</span> <span class="nv">ipAddress</span><span class="p">:</span> <span class="kt">String</span><span class="p">,</span> <span class="nv">port</span><span class="p">:</span> <span class="kt">UInt16</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kt">SDLLifecycleConfiguration</span></code></pre>
+  <pre class="highlight"><code><span class="kd">class</span> <span class="kd">func</span> <span class="nf">debugConfiguration</span><span class="p">(</span><span class="n">withAppName</span> <span class="nv">appName</span><span class="p">:</span> <span class="kt">Any</span><span class="o">!</span><span class="p">,</span> <span class="nv">appId</span><span class="p">:</span> <span class="kt">Any</span><span class="o">!</span><span class="p">,</span> <span class="nv">ipAddress</span><span class="p">:</span> <span class="kt">Any</span><span class="o">!</span><span class="p">,</span> <span class="nv">port</span><span class="p">:</span> <span class="kt">Any</span><span class="o">!</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kt">SDLLifecycleConfiguration</span><span class="o">!</span></code></pre>
 
   
   
@@ -134,7 +134,7 @@
 
   
   <h4>Swift</h4>
-  <pre class="highlight"><code><span class="k">var</span> <span class="nv">tcpDebugMode</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+  <pre class="highlight"><code><span class="k">var</span> <span class="nv">tcpDebugMode</span><span class="p">:</span> <span class="kt">Int32</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
 
   
   
@@ -152,9 +152,6 @@
     <span class="n">NSString</span> <span class="o">*</span><span class="n">tcpDebugIPAddress</span><span class="p">;</span></code></pre>
 
   
-  <h4>Swift</h4>
-  <pre class="highlight"><code><span class="k">var</span> <span class="nv">tcpDebugIPAddress</span><span class="p">:</span> <span class="kt">String</span><span class="o">!</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
-
   
   
   
@@ -171,7 +168,7 @@
 
   
   <h4>Swift</h4>
-  <pre class="highlight"><code><span class="k">var</span> <span class="nv">tcpDebugPort</span><span class="p">:</span> <span class="kt">UInt16</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+  <pre class="highlight"><code><span class="k">var</span> <span class="nv">tcpDebugPort</span><span class="p">:</span> <span class="kt">Int32</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
 
   
   
@@ -188,9 +185,6 @@
   <pre class="highlight"><code><span class="k">@property</span> <span class="p">(</span><span class="n">readonly</span><span class="p">,</span> <span class="n">copy</span><span class="p">,</span> <span class="n">nonatomic</span><span class="p">)</span> <span class="n">NSString</span> <span class="o">*</span><span class="n">_Nonnull</span> <span class="n">appName</span><span class="p">;</span></code></pre>
 
   
-  <h4>Swift</h4>
-  <pre class="highlight"><code><span class="k">var</span> <span class="nv">appName</span><span class="p">:</span> <span class="kt">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
-
   
   
   
@@ -206,9 +200,6 @@
   <pre class="highlight"><code><span class="k">@property</span> <span class="p">(</span><span class="n">readonly</span><span class="p">,</span> <span class="n">copy</span><span class="p">,</span> <span class="n">nonatomic</span><span class="p">)</span> <span class="n">NSString</span> <span class="o">*</span><span class="n">_Nonnull</span> <span class="n">appId</span><span class="p">;</span></code></pre>
 
   
-  <h4>Swift</h4>
-  <pre class="highlight"><code><span class="k">var</span> <span class="nv">appId</span><span class="p">:</span> <span class="kt">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
-
   
   
   
@@ -224,9 +215,6 @@
   <pre class="highlight"><code><span class="k">@property</span> <span class="p">(</span><span class="n">readwrite</span><span class="p">,</span> <span class="n">copy</span><span class="p">,</span> <span class="n">nonatomic</span><span class="p">,</span> <span class="n">nullable</span><span class="p">)</span> <span class="n">NSString</span> <span class="o">*</span><span class="n">resumeHash</span><span class="p">;</span></code></pre>
 
   
-  <h4>Swift</h4>
-  <pre class="highlight"><code><span class="k">var</span> <span class="nv">resumeHash</span><span class="p">:</span> <span class="kt">String</span><span class="p">?</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
-
   
   
   
@@ -243,7 +231,7 @@
 
   
   <h4>Swift</h4>
-  <pre class="highlight"><code><span class="k">var</span> <span class="nv">isMedia</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+  <pre class="highlight"><code><span class="k">var</span> <span class="nv">isMedia</span><span class="p">:</span> <span class="kt">Int32</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
 
   
   
@@ -279,7 +267,7 @@
 
   
   <h4>Swift</h4>
-  <pre class="highlight"><code><span class="k">var</span> <span class="nv">language</span><span class="p">:</span> <span class="kt"><a href="../Classes/SDLLanguage.html">SDLLanguage</a></span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+  <pre class="highlight"><code><span class="k">var</span> <span class="nv">language</span><span class="p">:</span> <span class="kt"><a href="../Classes/SDLLanguage.html">SDLLanguage</a></span><span class="o">!</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
 
   
   
@@ -297,9 +285,6 @@
     <span class="n">NSArray</span><span class="o">&lt;</span><span class="n"><a href="../Classes/SDLLanguage.html">SDLLanguage</a></span> <span class="o">*&gt;</span> <span class="o">*</span><span class="n">_Nonnull</span> <span class="n">languagesSupported</span><span class="p">;</span></code></pre>
 
   
-  <h4>Swift</h4>
-  <pre class="highlight"><code><span class="k">var</span> <span class="nv">languagesSupported</span><span class="p">:</span> <span class="p">[</span><span class="kt"><a href="../Classes/SDLLanguage.html">SDLLanguage</a></span><span class="p">]</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
-
   
   
   
@@ -333,9 +318,6 @@
   <pre class="highlight"><code><span class="k">@property</span> <span class="p">(</span><span class="n">readwrite</span><span class="p">,</span> <span class="n">copy</span><span class="p">,</span> <span class="n">nonatomic</span><span class="p">,</span> <span class="n">nullable</span><span class="p">)</span> <span class="n">NSString</span> <span class="o">*</span><span class="n">shortAppName</span><span class="p">;</span></code></pre>
 
   
-  <h4>Swift</h4>
-  <pre class="highlight"><code><span class="k">var</span> <span class="nv">shortAppName</span><span class="p">:</span> <span class="kt">String</span><span class="p">?</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
-
   
   
   
@@ -351,9 +333,6 @@
   <pre class="highlight"><code><span class="k">@property</span> <span class="p">(</span><span class="n">readwrite</span><span class="p">,</span> <span class="n">copy</span><span class="p">,</span> <span class="n">nonatomic</span><span class="p">,</span> <span class="n">nullable</span><span class="p">)</span> <span class="n">NSArray</span><span class="o">&lt;</span><span class="n"><a href="../Classes/SDLTTSChunk.html">SDLTTSChunk</a></span> <span class="o">*&gt;</span> <span class="o">*</span><span class="n">ttsName</span><span class="p">;</span></code></pre>
 
   
-  <h4>Swift</h4>
-  <pre class="highlight"><code><span class="k">var</span> <span class="nv">ttsName</span><span class="p">:</span> <span class="p">[</span><span class="kt"><a href="../Classes/SDLTTSChunk.html">SDLTTSChunk</a></span><span class="p">]?</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
-
   
   
   
@@ -370,9 +349,6 @@
     <span class="n">NSArray</span><span class="o">&lt;</span><span class="n">NSString</span> <span class="o">*&gt;</span> <span class="o">*</span><span class="n">voiceRecognitionCommandNames</span><span class="p">;</span></code></pre>
 
   
-  <h4>Swift</h4>
-  <pre class="highlight"><code><span class="k">var</span> <span class="nv">voiceRecognitionCommandNames</span><span class="p">:</span> <span class="p">[</span><span class="kt">String</span><span class="p">]?</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
-
   
   
   
@@ -405,7 +381,7 @@
 
   
   <h4>Swift</h4>
-  <pre class="highlight"><code><span class="k">var</span> <span class="nv">logFlags</span><span class="p">:</span> <span class="kt"><a href="../Enums/SDLLogOutput.html">SDLLogOutput</a></span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+  <pre class="highlight"><code><span class="k">var</span> <span class="nv">logFlags</span><span class="p">:</span> <span class="kt">Int32</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
 
   
   
diff --git a/docs/Classes/SDLLockScreenConfiguration.html b/docs/Classes/SDLLockScreenConfiguration.html
index 13c3bd48b..f91586320 100644
--- a/docs/Classes/SDLLockScreenConfiguration.html
+++ b/docs/Classes/SDLLockScreenConfiguration.html
@@ -34,7 +34,7 @@
 
   
   <h4>Swift</h4>
-  <pre class="highlight"><code><span class="k">var</span> <span class="nv">showInOptionalState</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+  <pre class="highlight"><code><span class="k">var</span> <span class="nv">showInOptionalState</span><span class="p">:</span> <span class="kt">Int32</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
 
   
   
@@ -52,7 +52,7 @@
 
   
   <h4>Swift</h4>
-  <pre class="highlight"><code><span class="k">var</span> <span class="nv">enableAutomaticLockScreen</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+  <pre class="highlight"><code><span class="k">var</span> <span class="nv">enableAutomaticLockScreen</span><span class="p">:</span> <span class="kt">Int32</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
 
   
   
@@ -84,9 +84,6 @@
   <pre class="highlight"><code><span class="k">@property</span> <span class="p">(</span><span class="n">readonly</span><span class="p">,</span> <span class="n">copy</span><span class="p">,</span> <span class="n">nonatomic</span><span class="p">,</span> <span class="n">nullable</span><span class="p">)</span> <span class="n">UIImage</span> <span class="o">*</span><span class="n">appIcon</span><span class="p">;</span></code></pre>
 
   
-  <h4>Swift</h4>
-  <pre class="highlight"><code><span class="kd">@NSCopying</span> <span class="k">var</span> <span class="nv">appIcon</span><span class="p">:</span> <span class="kt">NSImage</span><span class="p">?</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
-
   
   
   
@@ -130,7 +127,7 @@
 
   
   <h4>Swift</h4>
-  <pre class="highlight"><code><span class="kd">class</span> <span class="kd">func</span> <span class="nf">disabled</span><span class="p">()</span> <span class="o">-&gt;</span> <span class="k">Self</span></code></pre>
+  <pre class="highlight"><code><span class="kd">class</span> <span class="kd">func</span> <span class="nf">disabled</span><span class="p">()</span> <span class="o">-&gt;</span> <span class="k">Self</span><span class="o">!</span></code></pre>
 
   
   
@@ -153,7 +150,7 @@
 
   
   <h4>Swift</h4>
-  <pre class="highlight"><code><span class="kd">class</span> <span class="kd">func</span> <span class="nf">enabled</span><span class="p">()</span> <span class="o">-&gt;</span> <span class="k">Self</span></code></pre>
+  <pre class="highlight"><code><span class="kd">class</span> <span class="kd">func</span> <span class="nf">enabled</span><span class="p">()</span> <span class="o">-&gt;</span> <span class="k">Self</span><span class="o">!</span></code></pre>
 
   
   
@@ -178,7 +175,7 @@
 
   
   <h4>Swift</h4>
-  <pre class="highlight"><code><span class="kd">class</span> <span class="kd">func</span> <span class="nf">enabledConfiguration</span><span class="p">(</span><span class="n">withAppIcon</span> <span class="nv">lockScreenAppIcon</span><span class="p">:</span> <span class="kt">Any</span><span class="o">!</span><span class="p">,</span> <span class="n"><a href="../Classes/SDLLockScreenConfiguration.html#/c:objc(cs)SDLLockScreenConfiguration(py)backgroundColor">backgroundColor</a></span> <span class="nv">lockScreenBackgroundColor</span><span class="p">:</span> <span class="kt">Any</span><span class="o">!</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="k">Self</span></code></pre>
+  <pre class="highlight"><code><span class="kd">class</span> <span class="kd">func</span> <span class="nf">enabledConfiguration</span><span class="p">(</span><span class="n">withAppIcon</span> <span class="nv">lockScreenAppIcon</span><span class="p">:</span> <span class="kt">Any</span><span class="o">!</span><span class="p">,</span> <span class="n"><a href="../Classes/SDLLockScreenConfiguration.html#/c:objc(cs)SDLLockScreenConfiguration(py)backgroundColor">backgroundColor</a></span> <span class="nv">lockScreenBackgroundColor</span><span class="p">:</span> <span class="kt">Any</span><span class="o">!</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="k">Self</span><span class="o">!</span></code></pre>
 
   
   
@@ -211,7 +208,7 @@
 
   
   <h4>Swift</h4>
-  <pre class="highlight"><code><span class="kd">class</span> <span class="kd">func</span> <span class="nf">enabledConfiguration</span><span class="p">(</span><span class="n">withViewController</span> <span class="nv">viewController</span><span class="p">:</span> <span class="kt">Any</span><span class="o">!</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="k">Self</span></code></pre>
+  <pre class="highlight"><code><span class="kd">class</span> <span class="kd">func</span> <span class="nf">enabledConfiguration</span><span class="p">(</span><span class="n">withViewController</span> <span class="nv">viewController</span><span class="p">:</span> <span class="kt">Any</span><span class="o">!</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="k">Self</span><span class="o">!</span></code></pre>
 
   
   
diff --git a/docs/Classes/SDLManager.html b/docs/Classes/SDLManager.html
index abd8dde0e..4987c3567 100644
--- a/docs/Classes/SDLManager.html
+++ b/docs/Classes/SDLManager.html
@@ -222,6 +222,8 @@
   
   <p>Stop the manager, it will disconnect if needed and no longer look for a connection. You probably don&rsquo;t need to call this method ever.</p>
 
+<p>If you do call this method, you must wait for SDLManagerDelegate&rsquo;s managerDidDisconnect callback to call startWithReadyHandler:.</p>
+
   
   
   <h4>Objective-C</h4>
diff --git a/docs/undocumented.json b/docs/undocumented.json
index f044b929d..9b7efccd1 100644
--- a/docs/undocumented.json
+++ b/docs/undocumented.json
@@ -2410,49 +2410,49 @@
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLLifecycleConfiguration.h",
-      "line": 21,
+      "line": 19,
       "symbol": "SDLLogOutput",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.enum",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLLifecycleConfiguration.h",
-      "line": 21,
+      "line": 19,
       "symbol": "SDLLogOutput",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.typedef",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLLifecycleConfiguration.h",
-      "line": 22,
+      "line": 20,
       "symbol": "SDLLogOutput.SDLLogOutputNone",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.enumcase",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLLifecycleConfiguration.h",
-      "line": 23,
+      "line": 21,
       "symbol": "SDLLogOutput.SDLLogOutputConsole",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.enumcase",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLLifecycleConfiguration.h",
-      "line": 24,
+      "line": 22,
       "symbol": "SDLLogOutput.SDLLogOutputFile",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.enumcase",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLLifecycleConfiguration.h",
-      "line": 25,
+      "line": 23,
       "symbol": "SDLLogOutput.SDLLogOutputSiphon",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.enumcase",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLLifecycleConfiguration.h",
-      "line": 36,
+      "line": 34,
       "symbol": "SDLLifecycleConfiguration.-init",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
@@ -2501,14 +2501,14 @@
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLLockScreenConfiguration.h",
-      "line": 16,
+      "line": 14,
       "symbol": "SDLLockScreenConfiguration",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.class",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLLockScreenConfiguration.h",
-      "line": 43,
+      "line": 41,
       "symbol": "SDLLockScreenConfiguration.-init",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
@@ -7883,97 +7883,97 @@
       "warning": "undocumented"
     },
     {
-      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVRHelpItem.h",
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVehicleDataResult.h",
+      "line": 10,
+      "symbol": "SDLVehicleDataResult",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.class",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVehicleDataResult.h",
+      "line": 13,
+      "symbol": "SDLVehicleDataResult.-init",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVehicleDataResult.h",
+      "line": 14,
+      "symbol": "SDLVehicleDataResult.-initWithDictionary:",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVehicleDataResult.h",
+      "line": 16,
+      "symbol": "SDLVehicleDataResult.dataType",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVehicleDataResult.h",
+      "line": 17,
+      "symbol": "SDLVehicleDataResult.resultCode",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVrHelpItem.h",
       "line": 9,
       "symbol": "SDLVRHelpItem",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.class",
       "warning": "undocumented"
     },
     {
-      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVRHelpItem.h",
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVrHelpItem.h",
       "line": 12,
       "symbol": "SDLVRHelpItem.-init",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
-      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVRHelpItem.h",
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVrHelpItem.h",
       "line": 13,
       "symbol": "SDLVRHelpItem.-initWithDictionary:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
-      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVRHelpItem.h",
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVrHelpItem.h",
       "line": 15,
       "symbol": "SDLVRHelpItem.-initWithText:image:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
-      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVRHelpItem.h",
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVrHelpItem.h",
       "line": 17,
       "symbol": "SDLVRHelpItem.-initWithText:image:position:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
-      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVRHelpItem.h",
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVrHelpItem.h",
       "line": 19,
       "symbol": "SDLVRHelpItem.text",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
-      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVRHelpItem.h",
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVrHelpItem.h",
       "line": 20,
       "symbol": "SDLVRHelpItem.image",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
-      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVRHelpItem.h",
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVrHelpItem.h",
       "line": 21,
       "symbol": "SDLVRHelpItem.position",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
-      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVehicleDataResult.h",
-      "line": 10,
-      "symbol": "SDLVehicleDataResult",
-      "symbol_kind": "sourcekitten.source.lang.objc.decl.class",
-      "warning": "undocumented"
-    },
-    {
-      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVehicleDataResult.h",
-      "line": 13,
-      "symbol": "SDLVehicleDataResult.-init",
-      "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
-      "warning": "undocumented"
-    },
-    {
-      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVehicleDataResult.h",
-      "line": 14,
-      "symbol": "SDLVehicleDataResult.-initWithDictionary:",
-      "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
-      "warning": "undocumented"
-    },
-    {
-      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVehicleDataResult.h",
-      "line": 16,
-      "symbol": "SDLVehicleDataResult.dataType",
-      "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
-      "warning": "undocumented"
-    },
-    {
-      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLVehicleDataResult.h",
-      "line": 17,
-      "symbol": "SDLVehicleDataResult.resultCode",
-      "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
-      "warning": "undocumented"
-    },
-    {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLWaypointType.h",
       "line": 6,
       "symbol": "SDLWaypointType",