Merge remote-tracking branch 'origin/develop' into feature/streaming_media_manager

* origin/develop:
  Set compressionSession to null so we do not accidentally over-release it.
  Added check for hmi equality and old send delegate if not equal.
  Updated FrameData cases.
  Set swift-version for cocoapods until we can upgrade tests
  Update to v4.5.2
  Run clang-format
  Moved point at which we set the logging to be before we initialize anything within the lifecycle manager.
  Update logger to initialize on lifecycle initialization, not start
  Fixed issue with SDLDebugTool not keeping state with proxy recycle.
  Updated protocol enums to match spec.

# Conflicts:
#	SmartDeviceLink/SDLStreamingMediaManager.m

1 files changed, 3 insertions, 3 deletions

diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m
index eb38ed3ed..7f5de7f92 100644
--- a/SmartDeviceLink/SDLProxy.m
+++ b/SmartDeviceLink/SDLProxy.m
@@ -47,7 +47,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.1";
+NSString *const SDLProxyVersion = @"4.5.2";
 const float startSessionTime = 10.0;
 const float notifyProxyClosedDelay = 0.1;
 const int POLICIES_CORRELATION_ID = 65535;
@@ -203,7 +203,7 @@ static float DefaultConnectionTimeout = 45.0;
     _isConnected = YES;
     [SDLDebugTool logInfo:@"StartSession (request)" withType:SDLDebugType_RPC toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName];
 
-    [self.protocol startServiceWithType:SDLServiceType_RPC];
+    [self.protocol startServiceWithType:SDLServiceTypeRPC];
 
     if (self.startSessionTimer == nil) {
         self.startSessionTimer = [[SDLTimer alloc] initWithDuration:startSessionTime repeat:NO];
@@ -231,7 +231,7 @@ static float DefaultConnectionTimeout = 45.0;
     NSString *logMessage = [NSString stringWithFormat:@"StartSession (response)\nSessionId: %d for serviceType %d", header.sessionID, header.serviceType];
     [SDLDebugTool logInfo:logMessage withType:SDLDebugType_RPC toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName];
 
-    if (header.serviceType == SDLServiceType_RPC) {
+    if (header.serviceType == SDLServiceTypeRPC) {
         [self invokeMethodOnDelegates:@selector(onProxyOpened) withObject:nil];
     }
 }