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

Jump to bottom

Update guava to 29.0 #7079

Merged
merged 12 commits into from Jun 3, 2020
Merged

Update guava to 29.0 #7079

merged 12 commits into from Jun 3, 2020

Conversation

elharo
Copy link
Contributor

@elharo elharo commented Jun 1, 2020

@elharo elharo changed the title Onlyguava Update guava to 29.0 Jun 1, 2020
@elharo
Copy link
Contributor Author

elharo commented Jun 3, 2020 

> 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
Copy link
Contributor Author

elharo commented Jun 3, 2020

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

elharo
elharo commented Jun 3, 2020
View reviewed changes
Copy link
Contributor Author

@elharo elharo left a comment

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?

dapengzhang0
dapengzhang0 reviewed Jun 3, 2020
View reviewed changes
build.gradle Outdated
@@ -312,6 +312,9 @@ subprojects {
testCompile libraries.junit,
libraries.mockito,
libraries.truth
testImplementation (libraries.guava_testlib) {
Copy link
Member

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
dapengzhang0
dapengzhang0 approved these changes Jun 3, 2020
View reviewed changes
build.gradle Outdated
@@ -187,7 +187,7 @@ subprojects {
// Jetty ALPN dependencies
jetty_alpn_agent: 'org.mortbay.jetty.alpn:jetty-alpn-agent:2.0.9'
]

Copy link
Member

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
Contributor Author

Choose a reason for hiding this comment

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

https://engdoc.corp.google.com/eng/doc/devguide/java/style/index.md?cl=head#s8.1.1-no-comment-issues

api/build.gradle
@@ -18,8 +18,9 @@ dependencies {
testImplementation project(':grpc-context').sourceSets.test.output,
project(':grpc-testing'),
project(':grpc-grpclb'),
libraries.guava_testlib

testImplementation (libraries.guava_testlib) {
Copy link
Member

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
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
Copy link
Contributor Author

elharo commented Jun 3, 2020

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
Member

@elharo Thank you for your PR.

@dapengzhang0 dapengzhang0 mentioned this pull request Jun 5, 2020
Closed
@ejona86 ejona86 mentioned this pull request Sep 28, 2020
Closed
dfawley pushed a commit to dfawley/grpc-java that referenced this pull request Jan 15, 2021
@elharo @dfawley
deps: Update guava to 29.0 (grpc#7079)
2642b3b
@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.
Reviewers

@dapengzhang0 dapengzhang0 dapengzhang0 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Bump Guava to 29.0-android
3 participants
@elharo @dapengzhang0 @grpc-kokoro