Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This code has been reviewed and submitted internally. Feel free to discuss on the PR and we can submit follow-up changes as necessary.
Commits:
Exclude Compile-Testing's circular dependency on Truth.
Maven already largely ignores this, but the circularity does cause Maven a couple problems:
Here's the diff in Maven's dependency:tree output produced by this change:
$ ( filter() { grep -v -e SUCCESS -e Downloaded -e 'Total time' -e 'Finished at' $@; }; diff <(filter /tmp/pre) <(filter /tmp/post) )
--- /dev/fd/63 2018-08-14 13:58:21.938426152 -0400
+++ /dev/fd/62 2018-08-14 13:58:21.942426128 -0400
@@ -68,9 +68,13 @@
[INFO] | +- (com.google.j2objc:j2objc-annotations:jar:1.1:test - omitted for duplicate)
[INFO] | +- (com.google.guava:guava:jar:25.1-android:test - version managed from 25.1-jre; omitted for duplicate)
[INFO] | - (junit:junit:jar:4.12:test - version managed from 4.11; omitted for duplicate)
-[INFO] +- (com.google.truth:truth:jar:0.37:test - omitted for cycle)
[INFO] +- com.google.testing.compile:compile-testing:jar:0.15:test
-[INFO] | - (junit:junit:jar:4.12:test - version managed from 4.11; omitted for duplicate)
+[INFO] | +- (junit:junit:jar:4.12:test - version managed from 4.11; omitted for duplicate)
+[INFO] | +- (com.google.guava:guava:jar:25.1-android:test - version managed from 23.5-jre; omitted for duplicate)
+[INFO] | +- (com.google.auto.value:auto-value:jar:1.6.2:test - version managed from 1.5.3; omitted for duplicate)
+[INFO] | +- com.google.auto:auto-common:jar:0.9:test
+[INFO] | | - (com.google.guava:guava:jar:25.1-android:test - version managed from 23.5-jre; omitted for duplicate)
+[INFO] | - com.sun:tools:jar:1.8.0_151-google-v7:system
[INFO] - com.google.errorprone:error_prone_annotations:jar:2.3.1:compile
[INFO]
[INFO] ------------------------------------------------------------------------
ff1a5f0
Enable requireUpperBoundDeps and dependencyConvergence, and update Guava to 26.0.
The Guava update doesn't solve any dependency conflicts, but, as I've noted in a comment in pom.xml, it helps requireUpperBoundDeps actually work. (But other such problems might still go undetected.)
requireUpperBoundDeps has to exclude Guava, so it wouldn't have caught the problem in #473, but dependencyConvergence would have.
e8c1902