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

Update to Mockito 2 #5484

Merged
merged 6 commits into from Mar 19, 2019
Merged

Update to Mockito 2 #5484

merged 6 commits into from Mar 19, 2019

Conversation

TimvdLippe
Copy link
Contributor

@TimvdLippe TimvdLippe commented Mar 19, 2019

This is the public port of cl/238445847

Fixes #5319

@TimvdLippe
Copy link
Contributor Author

Working on the deprecation warnings as we speak.

@dapengzhang0
Copy link
Member

@TimvdLippe Thank you for your PR. Please ping me when it's ready for review.

@dapengzhang0
Copy link
Member

This will resolve #5319

@TimvdLippe
Copy link
Contributor Author

@dapengzhang0 Ready 😄

@dapengzhang0 dapengzhang0 added the kokoro:run Add this label to a PR to tell Kokoro the code is safe and tests can be run label Mar 19, 2019
@grpc-kokoro grpc-kokoro removed the kokoro:run Add this label to a PR to tell Kokoro the code is safe and tests can be run label Mar 19, 2019
Copy link
Member

@dapengzhang0 dapengzhang0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dapengzhang0 dapengzhang0 merged commit d35fbd7 into grpc:master Mar 19, 2019
@TimvdLippe TimvdLippe deleted the use-mockito-2 branch March 20, 2019 10:51
@ejona86
Copy link
Member

ejona86 commented Apr 1, 2019

It looks like this is causing failures during dexing in the android-interop test. I think that one may not be run during presubmit.

https://source.cloud.google.com/results/invocations/dc18ac18-556a-4871-b5ce-78b07f783e9e/log

/tmpfs/tmp/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy-agent/1.9.7/8e7d1b599f4943851ffea125fd9780e572727fc0/byte-buddy-agent-1.9.7.jar: D8: Illegal class file: Class module-info is missing a super type.
/tmpfs/tmp/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy/1.9.7/8fea78fea6449e1738b675cb155ce8422661e237/byte-buddy-1.9.7.jar: D8: Illegal class file: Class module-info is missing a super type.

@dapengzhang0
Copy link
Member

Seems need to remove the old Dexmaker dependency and add org.mockito:mockito-android

@TimvdLippe
Copy link
Contributor Author

FYI this is the upstream issue: mockito/mockito#1511 It is related to usage of outdated Android tooling. Make sure you are running the latest version of the Android Gradle Plugin.

@ejona86
Copy link
Member

ejona86 commented Apr 1, 2019

@TimvdLippe, thanks for the link. That's helpful. So we need to upgrade to com.android.tools.build:gradle:3.3.2. Unfortunately that requires upgrading Gradle to 4.10, which means non-Android is impacted. But since we're on Gradle 4.9 now, it may not be too hard. I'm working on this.

@dapengzhang0
Copy link
Member

@ejona86 actually I was doing that as well see #5523 #5525

@lock lock bot locked as resolved and limited conversation to collaborators Jun 30, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade Mockito dependency to version 2
4 participants