This repository was archived by the owner on May 8, 2026. It is now read-only.
Commit 1d7c224
authored
deps: fix UpperBoundsDep check for checker-qual (#941)
#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 consistent1 parent 57cddee commit 1d7c224
2 files changed
Lines changed: 12 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
150 | 150 | | |
151 | 151 | | |
152 | 152 | | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
153 | 161 | | |
154 | 162 | | |
155 | 163 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
235 | 235 | | |
236 | 236 | | |
237 | 237 | | |
| 238 | + | |
| 239 | + | |
238 | 240 | | |
239 | 241 | | |
240 | 242 | | |
| |||
246 | 248 | | |
247 | 249 | | |
248 | 250 | | |
| 251 | + | |
| 252 | + | |
249 | 253 | | |
250 | 254 | | |
251 | 255 | | |
| |||
0 commit comments