From e8ee6dad2a47eeae4e64574e44c6db7eed82c512 Mon Sep 17 00:00:00 2001 From: ibaker Date: Mon, 13 Dec 2021 12:42:11 +0000 Subject: [PATCH] Revert e148a678ac5fc42e1a87a90bf4e99ad04968818e Fix the gradle problem PiperOrigin-RevId: 416011494 --- constants.gradle | 2 +- library/common/build.gradle | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/constants.gradle b/constants.gradle index 7fd89a86d6..853ff6ff20 100644 --- a/constants.gradle +++ b/constants.gradle @@ -25,7 +25,7 @@ project.ext { junitVersion = '4.13.2' // Use the same Guava version as the Android repo: // https://cs.android.com/android/platform/superproject/+/master:external/guava/METADATA - guavaVersion = '27.1-android' + guavaVersion = '31.0.1-android' mockitoVersion = '3.12.4' robolectricVersion = '4.6.1' // Keep this in sync with Google's internal Checker Framework version. diff --git a/library/common/build.gradle b/library/common/build.gradle index b59552d366..871bf5d8a4 100644 --- a/library/common/build.gradle +++ b/library/common/build.gradle @@ -27,6 +27,7 @@ dependencies { // (but declared as runtime deps) [internal b/168188131]. exclude group: 'com.google.code.findbugs', module: 'jsr305' exclude group: 'org.checkerframework', module: 'checker-compat-qual' + exclude group: 'org.checkerframework', module: 'checker-qual' exclude group: 'com.google.errorprone', module: 'error_prone_annotations' exclude group: 'com.google.j2objc', module: 'j2objc-annotations' exclude group: 'org.codehaus.mojo', module: 'animal-sniffer-annotations'