Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 3.3.0 #114

Merged
merged 17 commits into from
Mar 9, 2015
Merged

Release 3.3.0 #114

merged 17 commits into from
Mar 9, 2015

Conversation

mikeburke106
Copy link
Contributor

Merging the changes from last week into master branch as release 3.3.0. All changes have already been reviewed, but due to API changes, this will be considered a "minor" version under semantic versioning, hence the pull request for review as well.

Here are the issues that are addressed in this version:

Dahiya, Anil (A.) and others added 17 commits January 23, 2015 13:06
Modified layout capabilities when display layout is successfully changed.

Signed-off-by: Mike Burke <[email protected]>
Deprecated legacy object and added appropriate new object.  Modified valueForString method to follow project guidelines.

Signed-off-by: Mike Burke <[email protected]>
Signed-off-by: Mike Burke <[email protected]>
Deprecated fuelLevel_State methods and created fuelLevelState methods to follow Java naming conventions

Signed-off-by: Mike Burke <[email protected]>
Fixes #85.  Forward calls to setAPTData to setBulkData and getAPTData to getBulkData

Signed-off-by: Mike Burke <[email protected]>
Signed-off-by: Mike Burke <[email protected]>
@mikeburke106 mikeburke106 added the REVIEW - scheduled The reviewer has scheduled a review of this PR for the current sprint label Feb 16, 2015
@mikeburke106 mikeburke106 added this to the 3.3.0 milestone Feb 16, 2015
@mikeburke106 mikeburke106 self-assigned this Feb 18, 2015
@justinjdickow justinjdickow added REVIEW - offline The review will be discussed with the author offline REVIEW - accepted The reviewer has approved the PR and removed REVIEW - scheduled The reviewer has scheduled a review of this PR for the current sprint REVIEW - offline The review will be discussed with the author offline labels Mar 6, 2015
@mikeburke106
Copy link
Contributor Author

Here were the conflicts for this merge, since that came up during the meeting:

Conflicts:
sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GPSData.java
sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnVehicleData.java
sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java

Conflicts are related to #118, #96 #92 and #77 and all were resolved in the merge commit.

The merge commit was unit tested with the current unit tests, here are the results:

Tests Run Test Passes (%) Test Failures (%) Test Errors (%)
1488 1483 (99%) 2 (<1%) 3 (<1%)

The failed tests are related to OnSystemRequest, which will be fixed with #123. The errors are issues with the tests themselves, which still need to be fixed.

I have also tested the Livio tester app with this commit and everything works as expected.

@mikeburke106 mikeburke106 merged commit add5ed9 into master Mar 9, 2015
@mikeburke106 mikeburke106 deleted the release/3.3.0 branch March 9, 2015 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
REVIEW - accepted The reviewer has approved the PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants