|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# Conflicts:
# SmartDeviceLink/SDLAbstractProtocol.h
# SmartDeviceLink/SDLAbstractTransport.h
# SmartDeviceLink/SDLAddCommand.h
# SmartDeviceLink/SDLAddSubMenu.h
# SmartDeviceLink/SDLAlert.h
# SmartDeviceLink/SDLAlertManeuver.h
# SmartDeviceLink/SDLAlertResponse.h
# SmartDeviceLink/SDLBodyInformation.h
# SmartDeviceLink/SDLChoice.h
# SmartDeviceLink/SDLDIDResult.h
# SmartDeviceLink/SDLDeviceInfo.h
# SmartDeviceLink/SDLDisplayCapabilities.h
# SmartDeviceLink/SDLGetDTCs.h
# SmartDeviceLink/SDLGetVehicleData.h
# SmartDeviceLink/SDLGetVehicleDataResponse.h
# SmartDeviceLink/SDLGetWaypointsResponse.h
# SmartDeviceLink/SDLHeadLampStatus.h
# SmartDeviceLink/SDLIAPSession.h
# SmartDeviceLink/SDLIAPTransport.h
# SmartDeviceLink/SDLIAPTransport.m
# SmartDeviceLink/SDLImageField.h
# SmartDeviceLink/SDLKeyboardProperties.h
# SmartDeviceLink/SDLListFilesResponse.h
# SmartDeviceLink/SDLLocationDetails.h
# SmartDeviceLink/SDLMenuParams.h
# SmartDeviceLink/SDLObjectWithPriority.h
# SmartDeviceLink/SDLOnButtonEvent.h
# SmartDeviceLink/SDLOnButtonPress.h
# SmartDeviceLink/SDLOnEncodedSyncPData.h
# SmartDeviceLink/SDLOnKeyboardInput.h
# SmartDeviceLink/SDLOnSyncPData.h
# SmartDeviceLink/SDLOnSystemRequest.h
# SmartDeviceLink/SDLOnVehicleData.h
# SmartDeviceLink/SDLPerformAudioPassThru.h
# SmartDeviceLink/SDLPerformInteraction.h
# SmartDeviceLink/SDLPerformInteractionResponse.h
# SmartDeviceLink/SDLProtocol.m
# SmartDeviceLink/SDLProtocolMessage.h
# SmartDeviceLink/SDLProtocolMessage.m
# SmartDeviceLink/SDLProtocolMessageAssembler.h
# SmartDeviceLink/SDLProtocolReceivedMessageRouter.h
# SmartDeviceLink/SDLProtocolReceivedMessageRouter.m
# SmartDeviceLink/SDLProxy.h
# SmartDeviceLink/SDLProxy.m
# SmartDeviceLink/SDLPutFile.h
# SmartDeviceLink/SDLRPCMessage.h
# SmartDeviceLink/SDLRPCPayload.h
# SmartDeviceLink/SDLRPCResponse.h
# SmartDeviceLink/SDLReadDIDResponse.h
# SmartDeviceLink/SDLRegisterAppInterface.h
# SmartDeviceLink/SDLRegisterAppInterfaceResponse.h
# SmartDeviceLink/SDLScreenParams.h
# SmartDeviceLink/SDLScrollableMessage.h
# SmartDeviceLink/SDLSetDisplayLayoutResponse.h
# SmartDeviceLink/SDLSetGlobalProperties.h
# SmartDeviceLink/SDLSetMediaClockTimer.h
# SmartDeviceLink/SDLShow.h
# SmartDeviceLink/SDLShowConstantTBT.h
# SmartDeviceLink/SDLSlider.h
# SmartDeviceLink/SDLSliderResponse.h
# SmartDeviceLink/SDLSoftButton.h
# SmartDeviceLink/SDLSubscribeVehicleData.h
# SmartDeviceLink/SDLSubscribeVehicleDataResponse.h
# SmartDeviceLink/SDLSystemRequest.h
# SmartDeviceLink/SDLTimer.h
# SmartDeviceLink/SDLTimer.m
# SmartDeviceLink/SDLTurn.h
# SmartDeviceLink/SDLUnsubscribeVehicleData.h
# SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h
# SmartDeviceLink/SDLUpdateTurnList.h
# SmartDeviceLink/SDLVehicleType.h
# SmartDeviceLink/SDLVrHelpItem.h
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
feature/issue_425_stringly_typed_enum
* origin/develop: (27 commits)
Revert "Changed deviceScale type to silence build warning"
Changed deviceScale type to silence build warning
Change SDLRPCStruct private method to be a class method
Fixed error reference.
reverting function renaming in SDLRPCMessage.
Removed SDLJsonEncoder/Decoder.
Initial removal of SDLSiphonServer
Fixed issue with not all instances for SDLRPCMessage function rename applied.
reverting function renaming in SDLRPCMessage.
Fixed accidental function renaming.
Update lock screen to work correctly on iOS 6 - 8
Fixed issue with not being able to support both Swift 3 and pre-iOS 10 Objective-C.
Fixed an issue with cocoapods not properly loading icons on pre-iOS 8 devices.
Updated SDLFunctionID to project instead of private.
Update version checking code to use what we already use
Updated assets and support for retrieving bundle images for iOS 6 & 7.
Touched SDL Example Images.xcassets
Remove `.xctool.args` and update README with current testing information
Migrated initWithDictionary to take non-mutable dictionary as parameter.
Updated SDLFunctionID to be private.
...
# Conflicts:
# SmartDeviceLink-iOS.xcodeproj/project.pbxproj
# SmartDeviceLink/SDLAirbagStatus.m
# SmartDeviceLink/SDLAudioPassThruCapabilities.m
# SmartDeviceLink/SDLBeltStatus.m
# SmartDeviceLink/SDLBodyInformation.m
# SmartDeviceLink/SDLButtonCapabilities.m
# SmartDeviceLink/SDLChangeRegistration.m
# SmartDeviceLink/SDLClusterModeStatus.m
# SmartDeviceLink/SDLDIDResult.m
# SmartDeviceLink/SDLDeviceStatus.m
# SmartDeviceLink/SDLDisplayCapabilities.m
# SmartDeviceLink/SDLECallInfo.m
# SmartDeviceLink/SDLEmergencyEvent.m
# SmartDeviceLink/SDLGPSData.m
# SmartDeviceLink/SDLGetVehicleDataResponse.m
# SmartDeviceLink/SDLHMIPermissions.m
# SmartDeviceLink/SDLHeadLampStatus.h
# SmartDeviceLink/SDLHeadLampStatus.m
# SmartDeviceLink/SDLImage.m
# SmartDeviceLink/SDLImageField.m
# SmartDeviceLink/SDLKeyboardProperties.m
# SmartDeviceLink/SDLMyKey.m
# SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
# SmartDeviceLink/SDLOnButtonEvent.m
# SmartDeviceLink/SDLOnButtonPress.m
# SmartDeviceLink/SDLOnCommand.m
# SmartDeviceLink/SDLOnDriverDistraction.m
# SmartDeviceLink/SDLOnHMIStatus.m
# SmartDeviceLink/SDLOnKeyboardInput.m
# SmartDeviceLink/SDLOnLanguageChange.m
# SmartDeviceLink/SDLOnLockScreenStatus.m
# SmartDeviceLink/SDLOnSystemRequest.m
# SmartDeviceLink/SDLOnTBTClientState.m
# SmartDeviceLink/SDLOnTouchEvent.m
# SmartDeviceLink/SDLOnVehicleData.m
# SmartDeviceLink/SDLPerformAudioPassThru.m
# SmartDeviceLink/SDLPerformInteraction.m
# SmartDeviceLink/SDLPerformInteractionResponse.m
# SmartDeviceLink/SDLProxy.m
# SmartDeviceLink/SDLPutFile.m
# SmartDeviceLink/SDLRPCResponse.m
# SmartDeviceLink/SDLRegisterAppInterface.m
# SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
# SmartDeviceLink/SDLResetGlobalProperties.m
# SmartDeviceLink/SDLSetMediaClockTimer.m
# SmartDeviceLink/SDLShow.m
# SmartDeviceLink/SDLSingleTireStatus.m
# SmartDeviceLink/SDLSoftButton.m
# SmartDeviceLink/SDLSubscribeButton.m
# SmartDeviceLink/SDLSystemRequest.m
# SmartDeviceLink/SDLTTSChunk.m
# SmartDeviceLink/SDLTextField.m
# SmartDeviceLink/SDLTireStatus.m
# SmartDeviceLink/SDLUnsubscribeButton.m
# SmartDeviceLink/SDLVehicleDataResult.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m
# SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m
# SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m
# SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m
|