Revert "Update guava to 31.0.1"

Revert submission 17530734-protobuf-3.19

Reason for revert: broken CI
Reverted Changes:
Ic2e0a0ea3:Update protobuf to 3.19.2
Ifedea8629:Update guava to 31.0.1
If73f7168f:Update guava to 31.0.1
If50f9942c:Update guava to 31.0.1
Ie25cd8ca1:Update guava to 31.0.1
I742979770:Update protobuf to 3.19.2
I34dac833f:Update protobuf to 3.19.2

Change-Id: I4914084c1b4ec077702ab218886368cba763e08a

3 files changed, 36 insertions, 82 deletions

diff --git a/bazel/maven/BUILD.maven b/bazel/maven/BUILD.maven
index cf9318f26c..3266f118e5 100644
--- a/bazel/maven/BUILD.maven
+++ b/bazel/maven/BUILD.maven
@@ -203,11 +203,13 @@ maven_import(
     jars = [
         "repository/com/android/tools/build/bundletool/1.11.0/bundletool-1.11.0.jar"
     ],
+    exports = [
+        "com.google.guava.guava",
+    ],
     deps = [
         "com.android.tools.build.aapt2-proto",
         "com.google.auto.value.auto-value-annotations",
         "com.google.errorprone.error_prone_annotations",
-        "com.google.guava.guava",
         "com.google.protobuf.protobuf-java",
         "com.google.protobuf.protobuf-java-util",
         "com.google.dagger.dagger",
@@ -1047,25 +1049,25 @@ maven_import(
 )
 
 maven_artifact(
-    name = "com.google.errorprone.error_prone_annotations_2.7.1",
-    pom = "repository/com/google/errorprone/error_prone_annotations/2.7.1/error_prone_annotations-2.7.1.pom",
+    name = "com.google.errorprone.error_prone_annotations_2.4.0",
+    pom = "repository/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.pom",
     repo_root_path = "repository",
-    repo_path = "com/google/errorprone/error_prone_annotations/2.7.1",
-    parent = "com.google.errorprone.error_prone_parent_2.7.1",
+    repo_path = "com/google/errorprone/error_prone_annotations/2.4.0",
+    parent = "com.google.errorprone.error_prone_parent_2.4.0",
     visibility = ["//visibility:public"],
 )
 
 maven_import(
     name = "com.google.errorprone.error_prone_annotations",
     classifiers = [],
-    parent = "com.google.errorprone.error_prone_parent_2.7.1",
+    parent = "com.google.errorprone.error_prone_parent_2.4.0",
     jars = [
-        "repository/com/google/errorprone/error_prone_annotations/2.7.1/error_prone_annotations-2.7.1.jar"
+        "repository/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.jar"
     ],
     original_deps = [],
-    pom = "repository/com/google/errorprone/error_prone_annotations/2.7.1/error_prone_annotations-2.7.1.pom",
+    pom = "repository/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.pom",
     repo_root_path = "repository",
-    repo_path = "com/google/errorprone/error_prone_annotations/2.7.1",
+    repo_path = "com/google/errorprone/error_prone_annotations/2.4.0",
     visibility = ["//visibility:public"],
 )
 
@@ -1213,17 +1215,17 @@ maven_import(
 )
 
 maven_artifact(
-    name = "com.google.guava.guava_31.0.1-jre",
-    pom = "repository/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.pom",
+    name = "com.google.guava.guava_30.1-jre",
+    pom = "repository/com/google/guava/guava/30.1-jre/guava-30.1-jre.pom",
     repo_root_path = "repository",
-    repo_path = "com/google/guava/guava/31.0.1-jre",
-    parent = "com.google.guava.guava-parent_31.0.1-jre",
+    repo_path = "com/google/guava/guava/30.1-jre",
+    parent = "com.google.guava.guava-parent_30.1-jre",
     deps = [
         "com.google.guava.failureaccess_1.0.1",
         "com.google.guava.listenablefuture_9999.0-empty-to-avoid-conflict-with-guava",
         "com.google.code.findbugs.jsr305_3.0.2",
-        "org.checkerframework.checker-qual_3.12.0",
-        "com.google.errorprone.error_prone_annotations_2.7.1",
+        "org.checkerframework.checker-qual_3.5.0",
+        "com.google.errorprone.error_prone_annotations_2.3.4",
         "com.google.j2objc.j2objc-annotations_1.3",
     ],
     visibility = ["//visibility:public"],
@@ -1232,9 +1234,9 @@ maven_artifact(
 maven_import(
     name = "com.google.guava.guava",
     classifiers = [],
-    parent = "com.google.guava.guava-parent_31.0.1-jre",
+    parent = "com.google.guava.guava-parent_30.1-jre",
     jars = [
-        "repository/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.jar"
+        "repository/com/google/guava/guava/30.1-jre/guava-30.1-jre.jar"
     ],
     exports = [
         "com.google.guava.failureaccess",
@@ -1248,13 +1250,13 @@ maven_import(
         "com.google.guava.failureaccess_1.0.1",
         "com.google.guava.listenablefuture_9999.0-empty-to-avoid-conflict-with-guava",
         "com.google.code.findbugs.jsr305_3.0.2",
-        "org.checkerframework.checker-qual_3.12.0",
-        "com.google.errorprone.error_prone_annotations_2.7.1",
+        "org.checkerframework.checker-qual_3.5.0",
+        "com.google.errorprone.error_prone_annotations_2.3.4",
         "com.google.j2objc.j2objc-annotations_1.3",
     ],
-    pom = "repository/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.pom",
+    pom = "repository/com/google/guava/guava/30.1-jre/guava-30.1-jre.pom",
     repo_root_path = "repository",
-    repo_path = "com/google/guava/guava/31.0.1-jre",
+    repo_path = "com/google/guava/guava/30.1-jre",
     visibility = ["//visibility:public"],
 )
 
@@ -2652,10 +2654,10 @@ maven_import(
     exports = [
         "io.grpc.grpc-context",
         "com.google.code.findbugs.jsr305",
+        "com.google.errorprone.error_prone_annotations",
     ],
     deps = [
         "com.google.guava.guava",
-        "com.google.errorprone.error_prone_annotations",
     ],
     original_deps = [
         "io.grpc.grpc-context_1.39.0",
@@ -5027,10 +5029,10 @@ maven_import(
 )
 
 maven_artifact(
-    name = "org.checkerframework.checker-qual_3.12.0",
-    pom = "repository/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.pom",
+    name = "org.checkerframework.checker-qual_3.5.0",
+    pom = "repository/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/checkerframework/checker-qual/3.12.0",
+    repo_path = "org/checkerframework/checker-qual/3.5.0",
     visibility = ["//visibility:public"],
 )
 
@@ -5038,12 +5040,12 @@ maven_import(
     name = "org.checkerframework.checker-qual",
     classifiers = [],
     jars = [
-        "repository/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar"
+        "repository/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.jar"
     ],
     original_deps = [],
-    pom = "repository/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.pom",
+    pom = "repository/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/checkerframework/checker-qual/3.12.0",
+    repo_path = "org/checkerframework/checker-qual/3.5.0",
     visibility = ["//visibility:public"],
 )
 
@@ -26305,15 +26307,6 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "com.google.errorprone.error_prone_annotations_2.4.0",
-    pom = "repository/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.pom",
-    repo_root_path = "repository",
-    repo_path = "com/google/errorprone/error_prone_annotations/2.4.0",
-    parent = "com.google.errorprone.error_prone_parent_2.4.0",
-    visibility = ["//visibility:public"],
-)
-
-maven_artifact(
     name = "com.google.errorprone.javac-shaded_9-dev-r4023-3",
     pom = "repository/com/google/errorprone/javac-shaded/9-dev-r4023-3/javac-shaded-9-dev-r4023-3.pom",
     repo_root_path = "repository",
@@ -26690,23 +26683,6 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "com.google.guava.guava_30.1-jre",
-    pom = "repository/com/google/guava/guava/30.1-jre/guava-30.1-jre.pom",
-    repo_root_path = "repository",
-    repo_path = "com/google/guava/guava/30.1-jre",
-    parent = "com.google.guava.guava-parent_30.1-jre",
-    deps = [
-        "com.google.guava.failureaccess_1.0.1",
-        "com.google.guava.listenablefuture_9999.0-empty-to-avoid-conflict-with-guava",
-        "com.google.code.findbugs.jsr305_3.0.2",
-        "org.checkerframework.checker-qual_3.5.0",
-        "com.google.errorprone.error_prone_annotations_2.3.4",
-        "com.google.j2objc.j2objc-annotations_1.3",
-    ],
-    visibility = ["//visibility:public"],
-)
-
-maven_artifact(
     name = "com.google.guava.listenablefuture_1.0",
     pom = "repository/com/google/guava/listenablefuture/1.0/listenablefuture-1.0.pom",
     repo_root_path = "repository",
@@ -28649,14 +28625,6 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.checkerframework.checker-qual_3.5.0",
-    pom = "repository/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.pom",
-    repo_root_path = "repository",
-    repo_path = "org/checkerframework/checker-qual/3.5.0",
-    visibility = ["//visibility:public"],
-)
-
-maven_artifact(
     name = "org.codehaus.groovy.groovy-all_2.4.15",
     pom = "repository/org/codehaus/groovy/groovy-all/2.4.15/groovy-all-2.4.15.pom",
     repo_root_path = "repository",
@@ -34669,14 +34637,6 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "com.google.errorprone.error_prone_parent_2.7.1",
-    pom = "repository/com/google/errorprone/error_prone_parent/2.7.1/error_prone_parent-2.7.1.pom",
-    repo_root_path = "repository",
-    repo_path = "com/google/errorprone/error_prone_parent/2.7.1",
-    parent = "org.sonatype.oss.oss-parent_7",
-)
-
-maven_artifact(
     name = "com.google.googlejavaformat.google-java-format-parent_1.5",
     pom = "repository/com/google/googlejavaformat/google-java-format-parent/1.5/google-java-format-parent-1.5.pom",
     repo_root_path = "repository",
@@ -34869,13 +34829,6 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "com.google.guava.guava-parent_31.0.1-jre",
-    pom = "repository/com/google/guava/guava-parent/31.0.1-jre/guava-parent-31.0.1-jre.pom",
-    repo_root_path = "repository",
-    repo_path = "com/google/guava/guava-parent/31.0.1-jre",
-)
-
-maven_artifact(
     name = "com.google.http-client.google-http-client-parent_1.22.0",
     pom = "repository/com/google/http-client/google-http-client-parent/1.22.0/google-http-client-parent-1.22.0.pom",
     repo_root_path = "repository",
diff --git a/bazel/maven/artifacts.bzl b/bazel/maven/artifacts.bzl
index a7ad0a1c80..bea9820a0a 100644
--- a/bazel/maven/artifacts.bzl
+++ b/bazel/maven/artifacts.bzl
@@ -25,7 +25,7 @@ ARTIFACTS = [
     "com.fasterxml.jackson.core:jackson-databind:2.11.1",
     "com.google.flatbuffers:flatbuffers-java:1.12.0",
     "com.google.guava:guava:23.0",  # TODO to be removed, needed by gradlew of agp
-    "com.google.guava:guava:31.0.1-jre",
+    "com.google.guava:guava:30.1-jre",
     "com.google.guava:guava-testlib:25.1-jre",
     "com.google.jimfs:jimfs:1.1",
     "com.google.protobuf:protobuf-gradle-plugin:0.8.15",
diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/res/shrinker/obfuscation/ObfuscatedClasses.kt b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/res/shrinker/obfuscation/ObfuscatedClasses.kt
index 078b5252c7..5357ab7728 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/res/shrinker/obfuscation/ObfuscatedClasses.kt
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/res/shrinker/obfuscation/ObfuscatedClasses.kt
@@ -30,14 +30,15 @@ class ObfuscatedClasses private constructor(builder: Builder) {
     private val obfuscatedMethods = builder.obfuscatedMethods.toImmutableMap()
 
     fun resolveOriginalMethod(obfuscatedMethod: ClassAndMethod): ClassAndMethod {
-        return obfuscatedMethods.getOrElse(obfuscatedMethod) {
-            val realClassName = obfuscatedClasses[obfuscatedMethod.className] ?: obfuscatedMethod.className
+        return obfuscatedMethods.getOrElse(obfuscatedMethod, {
+            val realClassName = obfuscatedClasses.getOrDefault(
+                obfuscatedMethod.className, obfuscatedMethod.className)
             ClassAndMethod(realClassName, obfuscatedMethod.methodName)
-        }
+        })
     }
 
     fun resolveOriginalClass(obfuscatedClass: String): String {
-        return obfuscatedClasses[obfuscatedClass] ?: obfuscatedClass
+        return obfuscatedClasses.getOrDefault(obfuscatedClass, obfuscatedClass)
     }
 
     /**