Skip to content

Commit

Permalink
Bump versions.errorprone from 2.4.0 to 2.5.1 (#2176)
Browse files Browse the repository at this point in the history
* Bump versions.errorprone from 2.4.0 to 2.5.1

Bumps `versions.errorprone` from 2.4.0 to 2.5.1.

Updates `error_prone_core` from 2.4.0 to 2.5.1
- [Release notes](https://github.com/google/error-prone/releases)
- [Commits](google/error-prone@v2.4.0...v2.5.1)

Updates `error_prone_test_helpers` from 2.4.0 to 2.5.1
- [Release notes](https://github.com/google/error-prone/releases)
- [Commits](google/error-prone@v2.4.0...v2.5.1)

Signed-off-by: dependabot[bot] <support@github.com>

* Fix ErrorProne compilation errors

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tim van der Lippe <tvanderlippe@google.com>
  • Loading branch information
dependabot[bot] and TimvdLippe committed Jan 15, 2021
1 parent 09bfe5b commit 79f06ba
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
Expand Up @@ -6,7 +6,7 @@ def versions = [:]

versions.bytebuddy = '1.10.19'
versions.junitJupiter = '5.7.0'
versions.errorprone = '2.4.0'
versions.errorprone = '2.5.1'

libraries.junit4 = 'junit:junit:4.13.1'
libraries.junitJupiterApi = "org.junit.jupiter:junit-jupiter-api:${versions.junitJupiter}"
Expand Down
Expand Up @@ -193,6 +193,7 @@ public CrossClassLoaderSerializationProxy(Object mockitoMock) throws IOException
* @return A deserialized instance of the Mockito mock.
* @throws java.io.ObjectStreamException
*/
@SuppressWarnings("BanSerializableRead")
private Object readResolve() throws ObjectStreamException {
try {
ByteArrayInputStream bis = new ByteArrayInputStream(serializedMock);
Expand Down Expand Up @@ -267,6 +268,7 @@ public MockitoMockObjectInputStream(
* @throws ClassNotFoundException
*/
@Override
@SuppressWarnings("BanSerializableRead")
protected Class<?> resolveClass(ObjectStreamClass desc)
throws IOException, ClassNotFoundException {
if (notMarkedAsAMockitoMock(readObject())) {
Expand Down
Expand Up @@ -744,7 +744,7 @@ private static void exit(

public static class ForReadObject {

@SuppressWarnings("unused")
@SuppressWarnings({"unused", "BanSerializableRead"})
public static void doReadObject(
@Identifier String identifier,
@This MockAccess thiz,
Expand Down
Expand Up @@ -70,7 +70,7 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState
}
if (argumentIndex == -1) {
throw new IllegalStateException(
"Cannot find argument " + tree + " in argument list from " + parentTree);
"Cannot find argument " + state.getSourceForNode(tree) + " in argument list from " + state.getSourceForNode(parentTree));
}

Type parameterType = getParameterType(parentMethod, argumentIndex);
Expand Down

0 comments on commit 79f06ba

Please sign in to comment.