Rollback of https://github.com/google/ExoPlayer/commit/e64be9b689aa76a092ccde17fbd46e8c67096ea1

*** Original commit ***

Rollback of https://github.com/google/ExoPlayer/commit/f92a9a628a3b2b8e189e583d209268b9d49d8978

*** Original commit ***

Bump Guava version to 31.1

***

***

PiperOrigin-RevId: 526601244

constants.gradle

@@ -28,7 +28,7 @@ project.ext {
     junitVersion = '4.13.2'
     junitVersion = '4.13.2'
     // Use the same Guava version as the Android repo:
     // Use the same Guava version as the Android repo:
     // https://cs.android.com/android/platform/superproject/+/master:external/guava/METADATA
     // https://cs.android.com/android/platform/superproject/+/master:external/guava/METADATA
-    guavaVersion = '31.0.1-android'
+    guavaVersion = '31.1-android'
     mockitoVersion = '3.12.4'
     mockitoVersion = '3.12.4'
     robolectricVersion = '4.8.1'
     robolectricVersion = '4.8.1'
     // Keep this in sync with Google's internal Checker Framework version.
     // Keep this in sync with Google's internal Checker Framework version.

library/core/build.gradle

@@ -56,6 +56,7 @@ dependencies {
         exclude module: modulePrefix.substring(1) + 'library-core'
         exclude module: modulePrefix.substring(1) + 'library-core'
     }
     }
     androidTestImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion
     androidTestImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion
+    testCompileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion
     testImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion
     testImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
     testImplementation project(modulePrefix + 'testutils')
     testImplementation project(modulePrefix + 'testutils')

library/transformer/build.gradle

@@ -49,6 +49,7 @@ dependencies {
     testImplementation project(modulePrefix + 'testdata')
     testImplementation project(modulePrefix + 'testdata')
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
     testImplementation 'com.google.truth:truth:' + truthVersion
     testImplementation 'com.google.truth:truth:' + truthVersion
+    testCompileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion
     androidTestImplementation 'junit:junit:' + junitVersion
     androidTestImplementation 'junit:junit:' + junitVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
     androidTestImplementation 'com.google.truth:truth:' + truthVersion
     androidTestImplementation 'com.google.truth:truth:' + truthVersion