summaryrefslogtreecommitdiff
path: root/SmartDeviceLink
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/develop' into ↵Muller, Alexander (A.)2016-10-13363-5666/+3121
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Revert "Changed deviceScale type to silence build warning"Joel Fischer2016-10-131-1/+1
| | | | | | | | This reverts commit e220430734ed5603a7fb4c1b24d37252669b98fb.
| * Changed deviceScale type to silence build warningMuller, Alexander (A.)2016-10-131-1/+1
| |
| * Merge branch 'feature/issue_151_struct_dictionary_init' into developJoel Fischer2016-09-30295-2674/+313
| |\
| | * Change SDLRPCStruct private method to be a class methodfeature/issue_151_struct_dictionary_initJoel Fischer2016-09-301-4/+4
| | |
| | * Merge branch 'develop' into feature/issue_151_struct_dictionary_initJoel Fischer2016-09-30204-2859/+2775
| | |\ | | | | | | | | | | | | | | | | # Conflicts: # SmartDeviceLink/SDLRPCStruct.m
| | * \ Merge branch 'develop' of https://github.com/smartdevicelink/sdl_ios into ↵Muller, Alexander (A.)2016-09-232-3/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/issue_151_struct_dictionary_init * 'develop' of https://github.com/smartdevicelink/sdl_ios: Update public imports for organization and to remove a duplicate A few more updates to travis scripts Try better Travis CI build formatting Update Travis to run on Xcode 8 Update snapshot tests Update importing of SDLNotificationConstant names Remove some null files from the build phase
| | * | | Migrated initWithDictionary to take non-mutable dictionary as parameter.Muller, Alexander (A.)2016-09-22295-2674/+317
| | | | |
| * | | | Merge branch 'develop' into feature/issue_8_json_encoder_decoderJoel Fischer2016-09-3037-53/+55
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'release/4.3.0' into developJoel Fischer2016-09-3037-53/+55
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .xctool-args
| | | * \ \ Merge branch 'release/4.3.0' of https://github.com/smartdevicelink/sdl_ios ↵Joel Fischer2016-09-2720-2/+15
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into release/4.3.0
| | | | * | | Fixed issue with not being able to support both Swift 3 and pre-iOS 10 ↵Muller, Alexander (A.)2016-09-261-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Objective-C.
| | | | * | | Fixed an issue with cocoapods not properly loading icons on pre-iOS 8 devices.Muller, Alexander (A.)2016-09-2319-1/+6
| | | | | | |
| | | * | | | Update lock screen to work correctly on iOS 6 - 8Joel Fischer2016-09-272-26/+17
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * Update lock screen storyboard to open on Xcode 7.x * Update lock screen to function properly on iPhone 4s
| | | * | | Update version checking code to use what we already useJoel Fischer2016-09-231-7/+8
| | | | | |
| | | * | | Updated assets and support for retrieving bundle images for iOS 6 & 7.Muller, Alexander (A.)2016-09-2317-27/+24
| | | | |/ | | | |/|
| * | | | Merge branch 'develop' into feature/issue_8_json_encoder_decoderJoel Fischer2016-09-309-507/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | # Conflicts: # SmartDeviceLink-iOS.xcodeproj/project.pbxproj
| | * | | Initial removal of SDLSiphonServerMuller, Alexander (A.)2016-09-289-507/+2
| | | | |
| * | | | Fixed error reference.feature/issue_8_json_encoder_decoderMuller, Alexander (A.)2016-09-281-1/+1
| | | | |
| * | | | Removed SDLJsonEncoder/Decoder.Muller, Alexander (A.)2016-09-2811-138/+24
| |/ / /
| * | | Fixed issue with not all instances for SDLRPCMessage function rename applied.Muller, Alexander (A.)2016-09-272-2/+2
| | | |
| * | | reverting function renaming in SDLRPCMessage.feature/issue_3_constant_namesMuller, Alexander (A.)2016-09-272-2/+2
| | | |
| * | | Fixed accidental function renaming.Muller, Alexander (A.)2016-09-272-2/+2
| | | |
| * | | Merge branch 'develop' of https://github.com/smartdevicelink/sdl_ios into ↵Muller, Alexander (A.)2016-09-231-2/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/issue_3_constant_names * 'develop' of https://github.com/smartdevicelink/sdl_ios: Update public imports for organization and to remove a duplicate A few more updates to travis scripts Try better Travis CI build formatting
| * | | Merge branch 'develop' into feature/issue_3_constant_namesJoel Fischer2016-09-231-1/+1
| |\ \ \
| * | | | Updated SDLFunctionID to be a singleton.Muller, Alexander (A.)2016-09-228-79/+86
| | | | |
| * | | | Updated naming of some constant.Muller, Alexander (A.)2016-09-2243-413/+413
| | | | |
| * | | | Removed extensibility from SDLNameMuller, Alexander (A.)2016-09-221-1/+1
| | | | |
| * | | | Reverted SDLNames to Project instead of Public.Muller, Alexander (A.)2016-09-22150-204/+148
| | | | |
| * | | | Replaced all defines with constant strings of the SDLName typedef. Also ↵Muller, Alexander (A.)2016-09-21160-2385/+2857
| | |_|/ | |/| | | | | | | | | | modified SDLFunctionID to use a static dictionary.
* | | | Merge branch 'develop' of https://github.com/smartdevicelink/sdl_ios into ↵Muller, Alexander (A.)2016-09-232-3/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/issue_425_stringly_typed_enum * 'develop' of https://github.com/smartdevicelink/sdl_ios: Update public imports for organization and to remove a duplicate A few more updates to travis scripts Try better Travis CI build formatting Update Travis to run on Xcode 8 Update snapshot tests Update importing of SDLNotificationConstant names Remove some null files from the build phase
| * | | Update public imports for organization and to remove a duplicateJoel Fischer2016-09-231-2/+1
| | |/ | |/|
| * | Update importing of SDLNotificationConstant namesJoel Fischer2016-09-191-1/+1
| |/
* | replace extensible enum with regular enum.Muller, Alexander (A.)2016-09-2268-68/+68
| |
* | Renamed enums to be more readable.Muller, Alexander (A.)2016-09-2254-180/+180
| |
* | Removed SDLJingle because SDLPrerecordedSpeech exists, and SDLJingle is not ↵Muller, Alexander (A.)2016-09-223-44/+0
| | | | | | | | in spec.
* | Fixed types in constant.Muller, Alexander (A.)2016-09-222-2/+2
| |
* | Fixed missing consts and misspellings.Muller, Alexander (A.)2016-09-2219-58/+58
| |
* | Fixed issue with SDLLanguage Enum valuesMuller, Alexander (A.)2016-09-211-24/+24
| |
* | Initial conversion of all enum objects to SDLEnum typedef.Muller, Alexander (A.)2016-09-21262-9068/+1801
|/
* Merge branch 'master' into release/4.3.04.3.0-rc.3Joel Fischer2016-09-151-0/+1
|\ | | | | | | | | | | | | | | | | # Conflicts: # Cartfile.resolved # SmartDeviceLink-iOS.podspec # SmartDeviceLink-iOS.xcodeproj/project.pbxproj # SmartDeviceLink/Info.plist # SmartDeviceLink/SDLProxy.m
| * Update to v4.2.44.2.4Joel Fischer2016-09-152-2/+2
| |
| * Fixed issue relating to not all single touch callbacks. firing.hotfix/issue_441_single_touch_eventsMuller, Alexander (A.)2016-09-131-0/+1
| |
* | Update to v4.3.0-rc.3Joel Fischer2016-09-152-2/+2
| |
* | Fixed a bug where files requiring multiple putfiles would occassionally crashJoel Fischer2016-09-151-11/+22
| | | | | | | | * Updated tests to account for the multiple put file case
* | Update to 4.3.0-rc.24.3.0-rc.2Joel Fischer2016-09-132-2/+2
| |
* | Fixed testsJoel Fischer2016-09-135-8/+14
| | | | | | | | | | * Updated test deps to work on Xcode 8 * Update `SDLRPCResponseNotification` and `SDLRPCNotificationNotification` to allow for use in tests
* | Update to Xcode 8 GMJoel Fischer2016-09-121-1/+1
| | | | | | | | * Fix a few bugs found by the Xcode 8 compiler
* | Update for v4.3.0-rc.14.3.0-rc.1Joel Fischer2016-09-024-4/+4
| |
* | Merge branch 'release/4.3.0' of https://github.com/smartdevicelink/sdl_ios ↵Joel Fischer2016-09-021-1/+3
|\ \ | | | | | | | | | into release/4.3.0
View Lorry Controller Status