summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Comment fixesbugfix/issue-1757-RPC-spec-generator-should-not-add-#pragmas-to-suppress-deprection-warnings-to-property-and-enum-definitionsFrank Elias2020-09-182-0/+4
|
* RPC spec generator should not add #pragmas to suppress deprecation warnings ↵Frank Elias2020-09-171-3/+0
| | | | | | to property and enum definitions RPC spec generator should not add #pragmas to suppress deprecation warnings to property and enum definitions
* RPC spec generator should not add #pragmas to suppress deprecation warnings ↵Frank Elias2020-09-164-70/+1
| | | | | | to property and enum definitions RPC spec generator should not add #pragmas to suppress deprecation warnings to property and enum definitions
* Merge pull request #1774 from ↵Joel Fischer2020-09-043-27/+30
|\ | | | | | | | | smartdevicelink/bugfix/issue_1772_fix_warnings_in_obj_c_ex_app Fixed warnings in the Obj-C example app
| * Added a 1024x1024 app store iconbugfix/issue_1772_fix_warnings_in_obj_c_ex_appNicoleYarroch2020-09-042-27/+28
| | | | | | | | Signed-off-by: NicoleYarroch <nicole@livio.io>
| * Added missing protocol delegate methodNicoleYarroch2020-09-041-0/+2
|/ | | | Signed-off-by: NicoleYarroch <nicole@livio.io>
* Merge pull request #1764 from ↵Joel Fischer2020-09-032-3/+3
|\ | | | | | | | | smartdevicelink/bugfix/issue-1762-failing-automated-tests Fix automated tests not running properly
| * Make failing cache spec use toEventuallybugfix/issue-1762-failing-automated-testsJoel Fischer2020-09-021-2/+2
| |
| * Fix a test not running properlyJoel Fischer2020-09-011-1/+1
| |
* | Merge branch 'feature/0253_vehicle_data_StabilityControlsStatus' into developJoel Fischer2020-09-0333-145/+523
|\ \ | | | | | | | | | | | | | | | | | | # Conflicts: # SmartDeviceLink-iOS.podspec # SmartDeviceLink-iOS.xcodeproj/project.pbxproj # SmartDeviceLink.podspec
| * | [0253] 'Stability Controls Status' : code review, fix tests.leonid lokhmatov, Luxoft2020-09-039-105/+117
| | |
| * | [0253] 'Stability Controls Status' : code review fix data structures: ↵leonid lokhmatov, Luxoft2020-09-0312-54/+44
| | | | | | | | | | | | replace (float) with (nullable NSNumber<SDLFloat> *), fix text comments (documentation).
| * | sdl-0253 "New vehicle data StabilityControlsStatus": Merge branch 'develop' ↵leonid lokhmatov, Luxoft2020-09-01110-616/+4006
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into this, conflicts resolved. # Conflicts: # Example Apps/Example ObjC/VehicleDataManager.m # SmartDeviceLink-iOS.xcodeproj/project.pbxproj # SmartDeviceLink/SDLGetVehicleData.h # SmartDeviceLink/SDLGetVehicleData.m # SmartDeviceLink/SDLGetVehicleDataResponse.h # SmartDeviceLink/SDLGetVehicleDataResponse.m # SmartDeviceLink/SDLOnVehicleData.h # SmartDeviceLink/SDLOnVehicleData.m # SmartDeviceLink/SDLRPCParameterNames.h # SmartDeviceLink/SDLRPCParameterNames.m # SmartDeviceLink/SDLSubscribeVehicleData.h # SmartDeviceLink/SDLSubscribeVehicleData.m # SmartDeviceLink/SDLSubscribeVehicleDataResponse.h # SmartDeviceLink/SDLSubscribeVehicleDataResponse.m # SmartDeviceLink/SDLUnsubscribeVehicleData.h # SmartDeviceLink/SDLUnsubscribeVehicleData.m # SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h # SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m # SmartDeviceLink/SDLVehicleDataType.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.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
| * \ \ Merge branch 'develop' into 0253_vehicle_data_StabilityControlsStatus, all ↵leonid lokhmatov, Luxoft2020-08-15251-8381/+12471
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicts resolved (merged) # Conflicts: # SmartDeviceLink-iOS.xcodeproj/project.pbxproj # SmartDeviceLink/SDLGetVehicleData.h # SmartDeviceLink/SDLGetVehicleData.m # SmartDeviceLink/SDLGetVehicleDataResponse.h # SmartDeviceLink/SDLGetVehicleDataResponse.m # SmartDeviceLink/SDLOnVehicleData.h # SmartDeviceLink/SDLOnVehicleData.m # SmartDeviceLink/SDLSubscribeVehicleData.h # SmartDeviceLink/SDLSubscribeVehicleData.m # SmartDeviceLink/SDLSubscribeVehicleDataResponse.h # SmartDeviceLink/SDLSubscribeVehicleDataResponse.m # SmartDeviceLink/SDLUnsubscribeVehicleData.h # SmartDeviceLink/SDLUnsubscribeVehicleData.m # SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h # SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.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
| * | | | sdl-0253 "New vehicle data StabilityControlsStatus": code review, revert ↵leonid lokhmatov, Luxoft2020-08-0626-1789/+958
| | | | | | | | | | | | | | | | | | | | extra changes to the develop branch.
| * | | | sdl-0253 "New vehicle data StabilityControlsStatus": code review, add missed ↵leonid lokhmatov, Luxoft2020-08-0622-830/+1008
| | | | | | | | | | | | | | | | | | | | in a few classes 'stabilityControlsStatus', apply review comments, fix unit tests, move nullable to the beginning, add error handling stubs to getters
| * | | | sdl-0253 "New vehicle data StabilityControlsStatus": code review, fix ↵leonid lokhmatov, Luxoft2020-08-042-2/+12
| | | | | | | | | | | | | | | | | | | | SDLStabilityControlsStatus
| * | | | sdl-0253 "New vehicle data StabilityControlsStatus": code review, reorder ↵leonid lokhmatov, Luxoft2020-08-043-102/+100
| | | | | | | | | | | | | | | | | | | | files alphabetically in xcode virtual folder, revert and update podspec files
| * | | | sdl-0253 "New vehicle data StabilityControlsStatus": apply review comments ↵leonid lokhmatov, Luxoft2020-07-2725-636/+1022
| | | | | | | | | | | | | | | | | | | | (p2): add script generated initializers, sort imported classes & properties alphabetically
| * | | | sdl-0253 "New vehicle data StabilityControlsStatus": apply review comments: ↵leonid lokhmatov, Luxoft2020-07-0710-13/+76
| | | | | | | | | | | | | | | | | | | | fix the previous commit leftovers.
| * | | | sdl-0253 "New vehicle data StabilityControlsStatus": apply review comments ↵leonid lokhmatov, Luxoft2020-07-0726-550/+788
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use [[x alloc] init] instead of [x new]; replace (nullable, strong, nonatomic) with (strong, nonatomic, nullable); replace .to(beFalse()); with .to(equal(@NO)); in tests replace .to(beTrue()); with .to(equal(@YES)); in tests reorder headers import alphabetically
| * | | | sdl-0253 "New vehicle data StabilityControlsStatus": fix testsleonid l lokhmatov2020-06-237-403/+432
| | | | |
| * | | | sdl-0253 "New vehicle data StabilityControlsStatus": implement testsleonid l lokhmatov2020-06-2210-41/+167
| | | | |
| * | | | sdl-0253 "New vehicle data StabilityControlsStatus": fix enum item nameleonid l lokhmatov2020-06-222-2/+2
| | | | |
| * | | | sdl-0253 "New vehicle data StabilityControlsStatus": add & fix auto ↵leonid l lokhmatov2020-06-2221-166/+1063
| | | | | | | | | | | | | | | | | | | | generated classes/interfaces, update/deprecate init methods.
* | | | | Merge pull request #1768 from ↵Joel Fischer2020-09-034-10/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | smartdevicelink/bugfix/issue-1765-sdl-example-files Move example app files to the correct folder
| * | | | | Move files from wrong folderbugfix/issue-1765-sdl-example-filesJoel Fischer2020-09-024-10/+10
|/ / / / /
* | | | | Merge pull request #1758 from ↵Joel Fischer2020-09-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | smartdevicelink/bugfix/issue-1744-RPC-spec-generator-strips-text-after-@TODO RPC spec generator no longer cut text after @TODO
| * | | | | Boolean removedbugfix/issue-1744-RPC-spec-generator-strips-text-after-@TODOFrank Elias2020-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | removed boolean from being checked which displayed {}
| * | | | | textwrap.wrap is addedFrank Elias2020-08-311-2/+4
| | | | | |
| * | | | | 1744Frank Elias2020-08-251-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove text cut in RPC spec generator
| * | | | | 1744Frank Elias2020-08-251-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Updated generator to no longer cut after @TODO
* | | | | | Merge pull request #1760 from ↵Joel Fischer2020-09-021100-5341/+4430
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | smartdevicelink/bugfix/issue-568-shift-project-files-to-public-private-folders Update file system structure to public / private sub-folders
| * \ \ \ \ \ Merge branch 'develop' into ↵Joel Fischer2020-09-0216-1166/+1745
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix/issue-568-shift-project-files-to-public-private-folders # Conflicts: # SmartDeviceLink-iOS.xcodeproj/project.pbxproj
* | | | | | | Merge branch 'master' into developJoel Fischer2020-09-021-3/+1
|\ \ \ \ \ \ \
| * | | | | | | Update PULL_REQUEST_TEMPLATE.mddeveopJoel Fischer2020-09-021-3/+1
| | | | | | | |
* | | | | | | | Merge pull request #1739 from ↵Joel Fischer2020-09-026-17/+31
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | smartdevicelink/feature/issue-1684-protocol-nak-reason Add support for protocol nak reason parameter
| * | | | | | | Merge branch 'develop' into feature/issue-1684-protocol-nak-reasonfeature/issue-1684-protocol-nak-reasonJoel Fischer2020-08-31150-2154/+7656
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Add support for protocol nak reason parameterJoel Fischer2020-07-306-17/+31
| | | | | | | |
* | | | | | | | Merge pull request #1753 from ↵Joel Fischer2020-09-0110-1147/+1718
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | smartdevicelink/bugfix/issue-1749-refactor-t-g-manager-queues Refactor Text & Graphic Manager to use queues
| * | | | | | | Fix checking before sending secondary graphicbugfix/issue-1749-refactor-t-g-manager-queuesJoel Fischer2020-08-311-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'develop' into bugfix/issue-1749-refactor-t-g-manager-queuesJoel Fischer2020-08-31109-1660/+5050
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # SmartDeviceLink-iOS.xcodeproj/project.pbxproj
| * | | | | | | Fixes for spec test namesJoel Fischer2020-08-281-15/+15
| | | | | | | |
| * | | | | | | Fix missing nullable annotationsJoel Fischer2020-08-282-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes for secondary graphic on < 5.0
| * | | | | | | Fixes for T&G manager updates when display or hmi level updateJoel Fischer2020-08-281-8/+2
| | | | | | | |
| * | | | | | | Fix testsJoel Fischer2020-08-243-6/+20
| | | | | | | |
| * | | | | | | Fix bugs in text and graphic operationJoel Fischer2020-08-243-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix update handler not being sent if the handler was cancelled before starting * Fix update not being queued if an update is already queued * Fix a focus on a test
| * | | | | | | Add new file to module mapJoel Fischer2020-08-211-1/+1
| | | | | | | |
| * | | | | | | Fixes to text and graphic managerJoel Fischer2020-08-213-706/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes to T&G spec
| * | | | | | | Fix not sending alignmentJoel Fischer2020-08-201-0/+1
| | | | | | | |