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

deps: fix UpperBoundsDep check for checker-qual #941

Merged
merged 1 commit into from Aug 9, 2021

Conversation

igorbernstein2
Copy link
Contributor

@igorbernstein2 igorbernstein2 commented Aug 9, 2021

#939 switch guava from -android to -jre, which replaced the transitive dep checker-compat-qual with checker-qual. This introduced a version conflict between guava's transitive deps and truth's: gauva depends on version 3.8.0 while truth depends on 3.13.0. #939 tried to workaround the conflict by excluding the transitive dep from truth, but it didnt do it all places. This finishes the workaround.

I'm not convinced that this is the correct way to resolve the dependency conflict, but for now this PR just makes it consistent

googleapis#939 switch guava from -android to -jre, which replaced the transitive dep checker-compat-qual with checker-qual. This introduced a version conflict between guava's transitive deps and truth's: gauva depends on version 3.8.0 while truth depends on 3.13.0. googleapis#939 tried to workaround the conflict by excluding the transitive dep from truth, but it didnt do it all places. This finishes the workaround.

I'm not convinced that this is the correct way to resolve the dependency conflict, but for now this PR just makes it consistent
@igorbernstein2 igorbernstein2 requested a review from kolea2 Aug 9, 2021
@igorbernstein2 igorbernstein2 requested review from as code owners Aug 9, 2021
@google-cla google-cla bot added the cla: yes label Aug 9, 2021
@product-auto-label product-auto-label bot added the api: bigtable label Aug 9, 2021
kolea2
kolea2 approved these changes Aug 9, 2021
@igorbernstein2 igorbernstein2 added the automerge label Aug 9, 2021
@kolea2 kolea2 changed the title dep: fix UpperBoundsDep check for checker-qual deps: fix UpperBoundsDep check for checker-qual Aug 9, 2021
@gcf-merge-on-green gcf-merge-on-green bot merged commit 1d7c224 into googleapis:master Aug 9, 2021
16 checks passed
@gcf-merge-on-green gcf-merge-on-green bot removed the automerge label Aug 9, 2021
gcf-merge-on-green bot pushed a commit that referenced this issue Aug 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api: bigtable cla: yes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants