From 2d968a5d97639b673f5ed7c0d2c12a2b50734c97 Mon Sep 17 00:00:00 2001 From: ibaker Date: Mon, 24 Apr 2023 12:22:23 +0100 Subject: [PATCH] Rollback of https://github.com/androidx/media/commit/8d17faea335e67115355e65a4c9b9ef7e7595004 *** Original commit *** Rollback of https://github.com/androidx/media/commit/d7983f9485018508dc3a0d06a62d2ed1f6fadf16 *** Original commit *** Bump Guava version to 31.1 *** *** PiperOrigin-RevId: 526601244 --- constants.gradle | 2 +- libraries/exoplayer/build.gradle | 1 + libraries/transformer/build.gradle | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/constants.gradle b/constants.gradle index c9d73dc908..47c25e2bd9 100644 --- a/constants.gradle +++ b/constants.gradle @@ -27,7 +27,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 = '31.0.1-android' + guavaVersion = '31.1-android' mockitoVersion = '3.12.4' robolectricVersion = '4.8.1' // Keep this in sync with Google's internal Checker Framework version. diff --git a/libraries/exoplayer/build.gradle b/libraries/exoplayer/build.gradle index c65cddffe6..017d903c81 100644 --- a/libraries/exoplayer/build.gradle +++ b/libraries/exoplayer/build.gradle @@ -56,6 +56,7 @@ dependencies { exclude module: modulePrefix.substring(1) + 'library-core' } androidTestImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion + testCompileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion testImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion testImplementation 'org.robolectric:robolectric:' + robolectricVersion testImplementation project(modulePrefix + 'test-utils') diff --git a/libraries/transformer/build.gradle b/libraries/transformer/build.gradle index 6038fbb26e..693d80c921 100644 --- a/libraries/transformer/build.gradle +++ b/libraries/transformer/build.gradle @@ -49,6 +49,7 @@ dependencies { testImplementation project(modulePrefix + 'test-data') testImplementation 'org.robolectric:robolectric:' + robolectricVersion testImplementation 'com.google.truth:truth:' + truthVersion + testCompileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion androidTestImplementation 'junit:junit:' + junitVersion androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion androidTestImplementation 'com.google.truth:truth:' + truthVersion