Attempt to prevent merge conflicts when updating both flavors of Guava.
RELNOTES=n/a
<!-- Properties for multiple-artifact deps. -->
<auto-value.version>1.7.4</auto-value.version>
+ <!--
+ We have a separate property for each flavor of Guava (instead of a shared
+ version without the -android and -jre suffixes) because that lets
+ Dependabot update our Guava versions.
+ -->
<guava.android.version>30.1-android</guava.android.version>
+ <!--
+ Also, we have this comment in between the 2 flavors of Guava. That's
+ also to smooth the Dependabot update process: Dependabot generates a
+ separate PR for each flavor. Even if we approve both at the same
+ time, one gets submitted before the other, and
+ the other ends up with a merge conflict. That requires reapprovals.
+ -->
<guava.jre.version>30.1-jre</guava.jre.version>
<gwt.version>2.9.0</gwt.version>
<protobuf.version>3.14.0</protobuf.version>
