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

Replace failOnVersionConflict() with custom requireUpperBoundDeps #8238

Merged
merged 6 commits into from Jun 11, 2021

Commits on Jun 8, 2021

  1. Replace failOnVersionConflict() with custom requireUpperBoundDeps

    failOnVersionConflict has never been good for us. It is equivalent to
    Maven dependencyConvergence which we discourage our users to use because
    it is too tempermental and _creates_ version skew issues over time.
    However, we had no real alternative for determining if our deps would be
    misinterpeted by Maven.
    
    failOnVersionConflict has been a constant drain and makes it really hard
    to do seemingly-trivial upgrades. As evidenced by protobuf/build.gradle
    in this change, it also caused _us_ to introduce a version downgrade.
    
    This introduces our own custom requireUpperBoundDeps implementation so
    that we can get back to simple dependency upgrades _and_ increase our
    confidence in a consistent dependency tree.
    ejona86 committed Jun 8, 2021
    Copy the full SHA
    03911f1 View commit details
    Browse the repository at this point in the history
  2. Fix errorprone requireUpperBoundDeps failure due to protobuf-java-util

    The changes didn't introduce a bug. It is just we previously excluded
    and re-defined errorprone with guava such that it would be closer to the
    root and ended up beating protobuf-java-util's dep.
    ejona86 committed Jun 8, 2021
    Copy the full SHA
    3c9937a View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    4862d46 View commit details
    Browse the repository at this point in the history
  4. Directly depend on errorprone when used in the project instead of rel…

    …ying on Guava's transitive dep
    ejona86 committed Jun 8, 2021
    Copy the full SHA
    1443ffc View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2021

  1. Copy the full SHA
    34c23ee View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2021

  1. Copy the full SHA
    7e5e294 View commit details
    Browse the repository at this point in the history