Common 3.5.0 #1481
Merged
Common 3.5.0 #1481
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AdamBJohnsonx
requested review from
iambmelt,
iamgusain,
rpdome,
shahzaibj and
shoatman
as code owners
AdamBJohnsonx
changed the title
AdamBJohnsonx
changed the title
|
So this is a merge of master to dev + some additional changes to fix tests? (From the title, it isn't clear what all is in this PR) |
It was created with the wrong base. |
rpdome
approved these changes
Jul 27, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is one of a trio of changes unblocking the automation tests once more. We saw a failure design objenesis (dependency of mockito), and it looks like a versioning problem. So we bump the mockitol versions and sever the test dependency on mockito so as to avoid including mockito-inline and mockito-android in the same closure (See: mockito/mockito#2024 ). Additional changes accommodate it.
Automated testing builds here: https://console.firebase.google.com/u/1/project/msal-automation-app-764c7/testlab/histories/bh.10e97d500b7740a/matrices/5378680702194906044/executions/bs.3ac3f21216073230
MSAL: AzureAD/microsoft-authentication-library-for-android#1467
Ad-Accounts: https://github.com/AzureAD/ad-accounts-for-android/pull/1642