Skip to content

Update guava to 29.0 - #7079

Merged
dapengzhang0 merged 12 commits into
grpc:masterfrom
elharo:onlyguava
Jun 3, 2020
Merged

Update guava to 29.0#7079
dapengzhang0 merged 12 commits into
grpc:masterfrom
elharo:onlyguava

Conversation

@elharo

@elharo elharo commented Jun 1, 2020

Copy link
Copy Markdown
Contributor

@elharo elharo changed the title Onlyguava Update guava to 29.0 Jun 1, 2020
@elharo

elharo commented Jun 3, 2020

Copy link
Copy Markdown
Contributor Author
> Task :grpc-context:compileTestJava FAILED
/home/travis/build/grpc/grpc-java/context/src/test/java/io/grpc/ContextTest.java:784: warning: [deprecation] <T>assertThat(T,Matcher<? super T>) in Assert has been deprecated
    assertThat(context.cancellationCause(), instanceOf(TimeoutException.class));
    ^
  where T is a type-variable:
    T extends Object declared in method <T>assertThat(T,Matcher<? super T>)
/home/travis/build/grpc/grpc-java/context/src/test/java/io/grpc/ContextTest.java:791: warning: [deprecation] <T>assertThat(T,Matcher<? super T>) in Assert has been deprecated
    assertThat(context.cancellationCause(), instanceOf(TimeoutException.class));
    ^
  where T is a type-variable:
    T extends Object declared in method <T>assertThat(T,Matcher<? super T>)
error: warnings found and -Werror specified
1 error
2 warnings

@elharo

elharo commented Jun 3, 2020

Copy link
Copy Markdown
Contributor Author

Foxed locally, for some reason the PR doesn't have that change. I hate git.

@elharo elharo left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Exclusion of JUnit doesn't seem to be working. @dapengzhang0 any ideas?

Comment thread build.gradle Outdated
testCompile libraries.junit,
libraries.mockito,
libraries.truth
testImplementation (libraries.guava_testlib) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Should not be done here. Search for usage of libraries.guava_testlib and change each of them with exclusion. (census/build.gradle uses libraries.guava_testlib but actually it should not)

@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 Jun 3, 2020
@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 Jun 3, 2020
Comment thread build.gradle Outdated
jetty_alpn_agent: 'org.mortbay.jetty.alpn:jetty-alpn-agent:2.0.9'
]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

remove 8 white spaces

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Comment thread api/build.gradle
project(':grpc-grpclb'),
libraries.guava_testlib

testImplementation (libraries.guava_testlib) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Remove the comma above, otherwise this is considered as appending its return value to the above list, although not breaking.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

done

@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 Jun 3, 2020
@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 Jun 3, 2020
@elharo

elharo commented Jun 3, 2020

Copy link
Copy Markdown
Contributor Author

Thanks. You need to merge this as I don't have committer rights.

@dapengzhang0
dapengzhang0 merged commit 417d770 into grpc:master Jun 3, 2020
@dapengzhang0

Copy link
Copy Markdown
Contributor

@elharo Thank you for your PR.

dfawley pushed a commit to dfawley/grpc-java that referenced this pull request Jan 15, 2021
@elharo
elharo deleted the onlyguava branch April 21, 2021 20:36
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Jul 21, 2021
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.

Bump Guava to 29.0-android

3 participants