summaryrefslogtreecommitdiff
path: root/javaSE
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into TextAndGraphicsManager-Refactor-QueuesJulian Kast2020-08-221-2/+2
|\
| * Update mongodb bson dependencyBilal Alsharifi2020-08-191-1/+1
| * Update android x dependenciesBilal Alsharifi2020-08-191-1/+1
* | Fixed JavaSE ProjectJulian Kast2020-08-201-2/+2
* | Fixed javaSE project T&G managerJulian Kast2020-08-201-3/+2
|/
* Merge branch 'develop' into feature/issue_1048_remove_symlinksBilal Alsharifi2020-08-1115-17/+17
|\
| * Merge branch 'develop' into AndroidXJulian Kast2020-08-112-47/+25
| |\
| * | Update javaSE ImportsJulian Kast2020-08-1112-12/+12
| * | Update javaSE gradle file to use androidXJulian Kast2020-08-111-1/+1
* | | Move java specific classes to javaSEBilal Alsharifi2020-08-116-0/+491
* | | Move WebSocket classes to JavaSEBilal Alsharifi2020-08-112-0/+361
* | | Move Android stub classes to JavaSEBilal Alsharifi2020-08-114-0/+188
* | | Move cloud JSON classes to javaSEBilal Alsharifi2020-08-117-0/+2790
* | | Move cloud SdlTrace to javaSEBilal Alsharifi2020-08-111-0/+48
* | | Handle files that exist in both base & androidBilal Alsharifi2020-08-112-0/+265
| |/ |/|
* | Merge pull request #1430 from smartdevicelink/feature/refactor_interfacesJulian Kast2020-08-112-47/+25
|\ \ | |/ |/|
| * Run code formatter on session classesJoey Grover2020-08-041-17/+17
| * Implement interface refactor into JavaSEJoey Grover2020-07-302-53/+30
* | Merge branch 'develop' into feature/managers_refactorBilal Alsharifi2020-08-051-0/+130
|\ \
| * | Address review commentsJoey Grover2020-08-041-20/+19
| |/
| * Add missing method to JavaSE SdlSessionfeature/sdlsession_refactorJoey Grover2020-07-301-0/+7
| * Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android into...Joey Grover2020-07-302-7/+4
| |\
| * | Refactor SdlSession2 into SdlSession with baseJoey Grover2020-07-211-0/+124
* | | Move SCM to managers.lifecycle packageBilal Alsharifi2020-08-041-0/+45
| |/ |/|
* | Update version name to 4.12 (#1415)4.12.0Bilal Alsharifi2020-07-291-1/+1
* | Return void from log methodsbugfix/fix_logBilal Alsharifi2020-07-281-6/+3
* | Return correct bytesWritten in log methodsBilal Alsharifi2020-07-281-3/+3
|/
* Update Version for release candidate4.12.0-RC1RHenigan2020-07-081-1/+1
* Merge branch 'develop' into bugfix/issue_1377_loggingRHenigan2020-06-302-4/+15
|\
| * Merge pull request #1391 from smartdevicelink/feature/subscribe_buttonsBilal Alsharifi2020-06-301-0/+11
| |\
| | * Merge branch 'develop' into feature/subscribe_buttonsJulian Kast2020-06-232-9/+15
| | |\
| | * | Added Base class for subscribeButton Manager then created two SubscribeButton...Julian Kast2020-06-231-0/+11
| * | | Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android into...Joey Grover2020-06-264-0/+344
| |\ \ \
| * | | | Remove proxy naming from LCMJoey Grover2020-06-221-4/+4
| | |_|/ | |/| |
* | | | Move JavaSE classes to use the new logError ApisRHenigan2020-06-261-2/+2
* | | | Move JavaSE classes to use new logWarningRHenigan2020-06-261-1/+1
* | | | Refactor LogInfo in JavaSE LibRHenigan2020-06-262-7/+6
* | | | Merge branch 'develop' into bugfix/issue_1377_loggingRHenigan2020-06-264-0/+344
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #1383 from smartdevicelink/feature/use_taskmasterRobert Henigan2020-06-251-0/+1
| |\ \ \
| | * \ \ Merge branch 'develop' into feature/use_taskmasterBilal Alsharifi2020-06-192-9/+15
| | |\ \ \ | | | |/ /
| | * | | Update Taskmaster to 0.3.0Bilal Alsharifi2020-06-171-1/+1
| | * | | Add Taskmaster dependencyBilal Alsharifi2020-06-121-0/+1
| | | |/ | | |/|
| * | | Merge pull request #1382 from smartdevicelink/bugfix/issue_1377_ParcelableBilal Alsharifi2020-06-252-0/+159
| |\ \ \
| | * | | Move TransportRecord parcel constructor to AndroidBilal Alsharifi2020-06-251-3/+1
| | * | | Fix feedback from reviewbugfix/issue_1377_ParcelableRHenigan2020-06-252-7/+12
| | * | | Merge branch 'develop' into bugfix/issue_1377_ParcelableRHenigan2020-06-122-2240/+147
| | |\ \ \ | | | |/ /
| | * | | Add JavaSE Child class for TransportRecordRHenigan2020-06-101-0/+28
| | * | | Add JavaSE Child Class for SdlPacketRHenigan2020-06-102-0/+128
| * | | | Merge pull request #1381 from smartdevicelink/bugfix/issue_1377_HttpRequestTaskBilal Alsharifi2020-06-251-0/+184
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Implement JavaSE Methodsbugfix/issue_1377_HttpRequestTaskRHenigan2020-06-251-2/+163