Merge branch 'develop' into feature/issue_1166_cloud_app_transport

# Conflicts:
#	SmartDeviceLink-iOS.podspec
#	SmartDeviceLink-iOS.xcodeproj/project.pbxproj
#	SmartDeviceLink.podspec
#	SmartDeviceLink/SDLFunctionID.m
#	SmartDeviceLink/SDLNames.h
#	SmartDeviceLink/SDLNames.m
#	SmartDeviceLink/SDLNotificationConstants.h
#	SmartDeviceLink/SDLNotificationConstants.m
#	SmartDeviceLink/SDLNotificationDispatcher.m
#	SmartDeviceLink/SDLProxyListener.h
#	SmartDeviceLink/SmartDeviceLink.h
#	SmartDeviceLinkTests/DevAPISpecs/SDLNotificationDispatcherSpec.m
#	SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m

1 files changed, 35 insertions, 1 deletions

diff --git a/SmartDeviceLink.podspec b/SmartDeviceLink.podspec
index 48a7ee29a..bcc25538b 100644
--- a/SmartDeviceLink.podspec
+++ b/SmartDeviceLink.podspec
@@ -28,6 +28,12 @@ sdefault.public_header_files = [
 'SmartDeviceLink/SDLAlertManeuver.h',
 'SmartDeviceLink/SDLAlertManeuverResponse.h',
 'SmartDeviceLink/SDLAlertResponse.h',
+'SmartDeviceLink/SDLAppServiceCapability.h',
+'SmartDeviceLink/SDLAppServiceData.h',
+'SmartDeviceLink/SDLAppServiceManifest.h',
+'SmartDeviceLink/SDLAppServiceRecord.h',
+'SmartDeviceLink/SDLAppServicesCapabilities.h',
+'SmartDeviceLink/SDLAppServiceType.h',
 'SmartDeviceLink/SDLButtonPressResponse.h',
 'SmartDeviceLink/SDLAmbientLightStatus.h',
 'SmartDeviceLink/SDLAppHMIType.h',
@@ -89,6 +95,7 @@ sdefault.public_header_files = [
 'SmartDeviceLink/SDLDialNumberResponse.h',
 'SmartDeviceLink/SDLDIDResult.h',
 'SmartDeviceLink/SDLDimension.h',
+'SmartDeviceLink/SDLDirection.h',
 'SmartDeviceLink/SDLDisplayCapabilities.h',
 'SmartDeviceLink/SDLDisplayMode.h',
 'SmartDeviceLink/SDLDisplayType.h',
@@ -114,12 +121,17 @@ sdefault.public_header_files = [
 'SmartDeviceLink/SDLFuelCutoffStatus.h',
 'SmartDeviceLink/SDLFuelRange.h',
 'SmartDeviceLink/SDLFuelType.h',
+'SmartDeviceLink/SDLFunctionID.h',
 'SmartDeviceLink/SDLGenericResponse.h',
+'SmartDeviceLink/SDLGetAppServiceData.h',
+'SmartDeviceLink/SDLGetAppServiceDataResponse.h',
 'SmartDeviceLink/SDLGetDTCs.h',
 'SmartDeviceLink/SDLGetCloudAppProperties.h',
 'SmartDeviceLink/SDLGetCloudAppPropertiesResponse.h',
-'SmartDeviceLink/SDLGetInteriorVehicleData.h',
 'SmartDeviceLink/SDLGetDTCsResponse.h',
+'SmartDeviceLink/SDLGetFile.h',
+'SmartDeviceLink/SDLGetFileResponse.h',
+'SmartDeviceLink/SDLGetInteriorVehicleData.h',
 'SmartDeviceLink/SDLGetInteriorVehicleDataResponse.h',
 'SmartDeviceLink/SDLGetSystemCapability.h',
 'SmartDeviceLink/SDLGetSystemCapabilityResponse.h',
@@ -188,6 +200,9 @@ sdefault.public_header_files = [
 'SmartDeviceLink/SDLMassageMode.h',
 'SmartDeviceLink/SDLMassageZone.h',
 'SmartDeviceLink/SDLMediaClockFormat.h',
+'SmartDeviceLink/SDLMediaServiceData.h',
+'SmartDeviceLink/SDLMediaServiceManifest.h',
+'SmartDeviceLink/SDLMediaType.h',
 'SmartDeviceLink/SDLMenuCell.h',
 'SmartDeviceLink/SDLMenuParams.h',
 'SmartDeviceLink/SDLMetadataTags.h',
@@ -195,10 +210,16 @@ sdefault.public_header_files = [
 'SmartDeviceLink/SDLModuleData.h',
 'SmartDeviceLink/SDLModuleType.h',
 'SmartDeviceLink/SDLMyKey.h',
+'SmartDeviceLink/SDLNavigationAction.h',
 'SmartDeviceLink/SDLNavigationCapability.h',
+'SmartDeviceLink/SDLNavigationInstruction.h',
+'SmartDeviceLink/SDLNavigationJunction.h',
+'SmartDeviceLink/SDLNavigationServiceData.h',
+'SmartDeviceLink/SDLNavigationServiceManifest.h',
 'SmartDeviceLink/SDLNotificationConstants.h',
 'SmartDeviceLink/SDLOasisAddress.h',
 'SmartDeviceLink/SDLOnAppInterfaceUnregistered.h',
+'SmartDeviceLink/SDLOnAppServiceData.h',
 'SmartDeviceLink/SDLOnAudioPassThru.h',
 'SmartDeviceLink/SDLOnButtonEvent.h',
 'SmartDeviceLink/SDLOnButtonPress.h',
@@ -214,12 +235,15 @@ sdefault.public_header_files = [
 'SmartDeviceLink/SDLOnPermissionsChange.h',
 'SmartDeviceLink/SDLOnRCStatus.h',
 'SmartDeviceLink/SDLOnSyncPData.h',
+'SmartDeviceLink/SDLOnSystemCapabilityUpdated.h',
 'SmartDeviceLink/SDLOnSystemRequest.h',
 'SmartDeviceLink/SDLOnTBTClientState.h',
 'SmartDeviceLink/SDLOnTouchEvent.h',
 'SmartDeviceLink/SDLOnVehicleData.h',
 'SmartDeviceLink/SDLOnWayPointChange.h',
 'SmartDeviceLink/SDLParameterPermissions.h',
+'SmartDeviceLink/SDLPerformAppServiceInteraction.h',
+'SmartDeviceLink/SDLPerformAppServiceInteractionResponse.h',
 'SmartDeviceLink/SDLPerformAudioPassThru.h',
 'SmartDeviceLink/SDLPerformAudioPassThruResponse.h',
 'SmartDeviceLink/SDLPerformInteraction.h',
@@ -237,6 +261,8 @@ sdefault.public_header_files = [
 'SmartDeviceLink/SDLPresetBankCapabilities.h',
 'SmartDeviceLink/SDLPrimaryAudioSource.h',
 'SmartDeviceLink/SDLPRNDL.h',
+'SmartDeviceLink/SDLPublishAppService.h',
+'SmartDeviceLink/SDLPublishAppServiceResponse.h',
 'SmartDeviceLink/SDLPutFile.h',
 'SmartDeviceLink/SDLPutFileResponse.h',
 'SmartDeviceLink/SDLRadioBand.h',
@@ -256,11 +282,13 @@ sdefault.public_header_files = [
 'SmartDeviceLink/SDLResetGlobalPropertiesResponse.h',
 'SmartDeviceLink/SDLResult.h',
 'SmartDeviceLink/SDLRGBColor.h',
+'SmartDeviceLink/SDLRPCFunctionNames.h',
 'SmartDeviceLink/SDLRPCMessage.h',
 'SmartDeviceLink/SDLRPCMessageType.h',
 'SmartDeviceLink/SDLRPCNotification.h',
 'SmartDeviceLink/SDLRPCNotificationNotification.h',
 'SmartDeviceLink/SDLRPCRequest.h',
+'SmartDeviceLink/SDLRPCRequestNotification.h',
 'SmartDeviceLink/SDLRPCResponse.h',
 'SmartDeviceLink/SDLRPCResponseNotification.h',
 'SmartDeviceLink/SDLRPCStruct.h',
@@ -279,6 +307,7 @@ sdefault.public_header_files = [
 'SmartDeviceLink/SDLSendHapticDataResponse.h',
 'SmartDeviceLink/SDLSendLocation.h',
 'SmartDeviceLink/SDLSendLocationResponse.h',
+'SmartDeviceLink/SDLServiceUpdateReason.h',
 'SmartDeviceLink/SDLSetAppIcon.h',
 'SmartDeviceLink/SDLSetAppIconResponse.h',
 'SmartDeviceLink/SDLSetCloudAppProperties.h',
@@ -328,6 +357,7 @@ sdefault.public_header_files = [
 'SmartDeviceLink/SDLSystemCapabilityManager.h',
 'SmartDeviceLink/SDLSystemCapabilityType.h',
 'SmartDeviceLink/SDLSystemContext.h',
+'SmartDeviceLink/SDLSystemRequest.h',
 'SmartDeviceLink/SDLTBTState.h',
 'SmartDeviceLink/SDLTemperature.h',
 'SmartDeviceLink/SDLTemperatureUnit.h',
@@ -380,6 +410,10 @@ sdefault.public_header_files = [
 'SmartDeviceLink/SDLVrHelpItem.h',
 'SmartDeviceLink/SDLWarningLightStatus.h',
 'SmartDeviceLink/SDLWayPointType.h',
+'SmartDeviceLink/SDLWeatherAlert.h',
+'SmartDeviceLink/SDLWeatherData.h',
+'SmartDeviceLink/SDLWeatherServiceData.h',
+'SmartDeviceLink/SDLWeatherServiceManifest.h',
 'SmartDeviceLink/SDLWiperStatus.h',
 'SmartDeviceLink/SmartDeviceLink.h',
 ]