Update Robolectric to 4.8.1

Bug: 1337396,1347256 Change-Id: I49c5268da2c37ce507318cacddb2d460f3c33691 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3781743 Reviewed-by: Andrew Grieve <agrieve@chromium.org> Commit-Queue: Benjamin Joyce <bjoyce@chromium.org> Reviewed-by: Peter Wen <wnwen@chromium.org> Cr-Commit-Position: refs/heads/main@{#1028299}
chromium · Jul 26, 2022 · 7da1a15 · 7da1a15
1 parent f480d00
commit 7da1a15
Show file tree

Hide file tree

Showing 33 changed files with 98 additions and 89 deletions.
diff --git a/DEPS b/DEPS
@@ -1651,7 +1651,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/robolectric',
-              'version': 'WZ96VJuhBM63xzHb-_E72Tf46M9yIbfia6basI1YG4EC',
+              'version': '6OaDTPaXu0VZoMwWllgaXTeiaJR5jQkZb1_aooRa2GUC',
           },
       ],
       'condition': 'checkout_android',
@@ -3463,7 +3463,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_robolectric_annotations',
-              'version': 'version:2@4.7.3.cr1',
+              'version': 'version:2@4.8.1.cr1',
           },
       ],
       'condition': 'checkout_android',
@@ -3474,7 +3474,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_robolectric_junit',
-              'version': 'version:2@4.7.3.cr1',
+              'version': 'version:2@4.8.1.cr1',
           },
       ],
       'condition': 'checkout_android',
@@ -3485,7 +3485,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_robolectric_nativeruntime',
-              'version': 'version:2@4.7.3.cr1',
+              'version': 'version:2@4.8.1.cr1',
           },
       ],
       'condition': 'checkout_android',
@@ -3496,7 +3496,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_robolectric_pluginapi',
-              'version': 'version:2@4.7.3.cr1',
+              'version': 'version:2@4.8.1.cr1',
           },
       ],
       'condition': 'checkout_android',
@@ -3507,7 +3507,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver',
-              'version': 'version:2@4.7.3.cr1',
+              'version': 'version:2@4.8.1.cr1',
           },
       ],
       'condition': 'checkout_android',
@@ -3518,7 +3518,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_robolectric_resources',
-              'version': 'version:2@4.7.3.cr1',
+              'version': 'version:2@4.8.1.cr1',
           },
       ],
       'condition': 'checkout_android',
@@ -3529,7 +3529,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_robolectric_robolectric',
-              'version': 'version:2@4.7.3.cr1',
+              'version': 'version:2@4.8.1.cr1',
           },
       ],
       'condition': 'checkout_android',
@@ -3540,7 +3540,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_robolectric_sandbox',
-              'version': 'version:2@4.7.3.cr1',
+              'version': 'version:2@4.8.1.cr1',
           },
       ],
       'condition': 'checkout_android',
@@ -3551,7 +3551,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadowapi',
-              'version': 'version:2@4.7.3.cr1',
+              'version': 'version:2@4.8.1.cr1',
           },
       ],
       'condition': 'checkout_android',
@@ -3562,7 +3562,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_framework',
-              'version': 'version:2@4.7.3.cr1',
+              'version': 'version:2@4.8.1.cr1',
           },
       ],
       'condition': 'checkout_android',
@@ -3573,7 +3573,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_multidex',
-              'version': 'version:2@4.7.3.cr1',
+              'version': 'version:2@4.8.1.cr1',
           },
       ],
       'condition': 'checkout_android',
@@ -3584,7 +3584,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_playservices',
-              'version': 'version:2@4.7.3.cr1',
+              'version': 'version:2@4.8.1.cr1',
           },
       ],
       'condition': 'checkout_android',
@@ -3595,7 +3595,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils',
-              'version': 'version:2@4.7.3.cr1',
+              'version': 'version:2@4.8.1.cr1',
           },
       ],
       'condition': 'checkout_android',
@@ -3606,7 +3606,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils_reflector',
-              'version': 'version:2@4.7.3.cr1',
+              'version': 'version:2@4.8.1.cr1',
           },
       ],
       'condition': 'checkout_android',

diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
@@ -1430,7 +1430,7 @@ if (!limit_android_deps) {
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   java_prebuilt("org_robolectric_robolectric_java") {
-    jar_path = "libs/org_robolectric_robolectric/robolectric-4.7.3.jar"
+    jar_path = "libs/org_robolectric_robolectric/robolectric-4.8.1.jar"
     output_name = "org_robolectric_robolectric"
     enable_bytecode_checks = false
     testonly = true
@@ -1447,6 +1447,7 @@ if (!limit_android_deps) {
       ":org_robolectric_shadows_framework_java",
       ":org_robolectric_utils_java",
       ":org_robolectric_utils_reflector_java",
+      "//third_party/androidx:androidx_test_espresso_espresso_idling_resource_java",
       "//third_party/androidx:androidx_test_monitor_java",
     ]
     is_robolectric = true
@@ -1455,7 +1456,7 @@ if (!limit_android_deps) {
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   java_prebuilt("org_robolectric_shadows_multidex_java") {
     jar_path =
-        "libs/org_robolectric_shadows_multidex/shadows-multidex-4.7.3.jar"
+        "libs/org_robolectric_shadows_multidex/shadows-multidex-4.8.1.jar"
     output_name = "org_robolectric_shadows_multidex"
     enable_bytecode_checks = false
     testonly = true
@@ -1470,7 +1471,7 @@ if (!limit_android_deps) {
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   java_prebuilt("org_robolectric_shadows_playservices_java") {
-    jar_path = "libs/org_robolectric_shadows_playservices/shadows-playservices-4.7.3.jar"
+    jar_path = "libs/org_robolectric_shadows_playservices/shadows-playservices-4.8.1.jar"
     output_name = "org_robolectric_shadows_playservices"
     enable_bytecode_checks = false
     testonly = true
@@ -1483,7 +1484,7 @@ if (!limit_android_deps) {
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   java_prebuilt("org_robolectric_utils_java") {
-    jar_path = "libs/org_robolectric_utils/utils-4.7.3.jar"
+    jar_path = "libs/org_robolectric_utils/utils-4.8.1.jar"
     output_name = "org_robolectric_utils"
     enable_bytecode_checks = false
     testonly = true
@@ -2173,7 +2174,7 @@ if (!limit_android_deps) {
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   java_prebuilt("org_robolectric_annotations_java") {
-    jar_path = "libs/org_robolectric_annotations/annotations-4.7.3.jar"
+    jar_path = "libs/org_robolectric_annotations/annotations-4.8.1.jar"
     output_name = "org_robolectric_annotations"
     enable_bytecode_checks = false
 
@@ -2189,7 +2190,7 @@ if (!limit_android_deps) {
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   java_prebuilt("org_robolectric_junit_java") {
-    jar_path = "libs/org_robolectric_junit/junit-4.7.3.jar"
+    jar_path = "libs/org_robolectric_junit/junit-4.8.1.jar"
     output_name = "org_robolectric_junit"
     enable_bytecode_checks = false
 
@@ -2212,7 +2213,7 @@ if (!limit_android_deps) {
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   java_prebuilt("org_robolectric_nativeruntime_java") {
-    jar_path = "libs/org_robolectric_nativeruntime/nativeruntime-4.7.3.jar"
+    jar_path = "libs/org_robolectric_nativeruntime/nativeruntime-4.8.1.jar"
     output_name = "org_robolectric_nativeruntime"
     enable_bytecode_checks = false
 
@@ -2223,13 +2224,16 @@ if (!limit_android_deps) {
       "//third_party/androidx:*",
     ]
     testonly = true
-    deps = [ ":com_google_guava_guava_java" ]
+    deps = [
+      ":com_google_guava_guava_java",
+      ":org_robolectric_utils_java",
+    ]
     is_robolectric = true
   }
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   java_prebuilt("org_robolectric_pluginapi_java") {
-    jar_path = "libs/org_robolectric_pluginapi/pluginapi-4.7.3.jar"
+    jar_path = "libs/org_robolectric_pluginapi/pluginapi-4.8.1.jar"
     output_name = "org_robolectric_pluginapi"
     enable_bytecode_checks = false
 
@@ -2240,13 +2244,16 @@ if (!limit_android_deps) {
       "//third_party/androidx:*",
     ]
     testonly = true
-    deps = [ ":org_robolectric_annotations_java" ]
+    deps = [
+      ":com_google_guava_guava_java",
+      ":org_robolectric_annotations_java",
+    ]
     is_robolectric = true
   }
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   java_prebuilt("org_robolectric_plugins_maven_dependency_resolver_java") {
-    jar_path = "libs/org_robolectric_plugins_maven_dependency_resolver/plugins-maven-dependency-resolver-4.7.3.jar"
+    jar_path = "libs/org_robolectric_plugins_maven_dependency_resolver/plugins-maven-dependency-resolver-4.8.1.jar"
     output_name = "org_robolectric_plugins_maven_dependency_resolver"
     enable_bytecode_checks = false
 
@@ -2267,7 +2274,7 @@ if (!limit_android_deps) {
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   java_prebuilt("org_robolectric_resources_java") {
-    jar_path = "libs/org_robolectric_resources/resources-4.7.3.jar"
+    jar_path = "libs/org_robolectric_resources/resources-4.8.1.jar"
     output_name = "org_robolectric_resources"
     enable_bytecode_checks = false
 
@@ -2289,7 +2296,7 @@ if (!limit_android_deps) {
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   java_prebuilt("org_robolectric_sandbox_java") {
-    jar_path = "libs/org_robolectric_sandbox/sandbox-4.7.3.jar"
+    jar_path = "libs/org_robolectric_sandbox/sandbox-4.8.1.jar"
     output_name = "org_robolectric_sandbox"
     enable_bytecode_checks = false
 
@@ -2316,7 +2323,7 @@ if (!limit_android_deps) {
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   java_prebuilt("org_robolectric_shadowapi_java") {
-    jar_path = "libs/org_robolectric_shadowapi/shadowapi-4.7.3.jar"
+    jar_path = "libs/org_robolectric_shadowapi/shadowapi-4.8.1.jar"
     output_name = "org_robolectric_shadowapi"
     enable_bytecode_checks = false
 
@@ -2337,7 +2344,7 @@ if (!limit_android_deps) {
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   java_prebuilt("org_robolectric_shadows_framework_java") {
     jar_path =
-        "libs/org_robolectric_shadows_framework/shadows-framework-4.7.3.jar"
+        "libs/org_robolectric_shadows_framework/shadows-framework-4.8.1.jar"
     output_name = "org_robolectric_shadows_framework"
     enable_bytecode_checks = false
 
@@ -2355,6 +2362,7 @@ if (!limit_android_deps) {
       ":org_robolectric_nativeruntime_java",
       ":org_robolectric_pluginapi_java",
       ":org_robolectric_resources_java",
+      ":org_robolectric_sandbox_java",
       ":org_robolectric_shadowapi_java",
       ":org_robolectric_utils_java",
       ":org_robolectric_utils_reflector_java",
@@ -2368,7 +2376,7 @@ if (!limit_android_deps) {
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   java_prebuilt("org_robolectric_utils_reflector_java") {
-    jar_path = "libs/org_robolectric_utils_reflector/utils-reflector-4.7.3.jar"
+    jar_path = "libs/org_robolectric_utils_reflector/utils-reflector-4.8.1.jar"
     output_name = "org_robolectric_utils_reflector"
     enable_bytecode_checks = false
 

diff --git a/third_party/android_deps/build.gradle b/third_party/android_deps/build.gradle
@@ -183,7 +183,7 @@ dependencies {
     // Version 1.2 is needed by espresso-web, but we'll newer 1.2.1.
     androidTestCompile 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
 
-    String robolectricVersion = '4.7.3'
+    String robolectricVersion = '4.8.1'
     // Use testCompile to avoid having support_android = true set on
     // robolectric dependencies.
     testCompile "org.robolectric:robolectric:${robolectricVersion}"

diff --git a/third_party/android_deps/libs/org_robolectric_annotations/README.chromium b/third_party/android_deps/libs/org_robolectric_annotations/README.chromium
@@ -1,7 +1,7 @@
 Name: annotations
 Short Name: annotations
 URL: http://robolectric.org
-Version: 4.7.3
+Version: 4.8.1
 License: MIT
 License File: NOT_SHIPPED
 CPEPrefix: unknown

diff --git a/third_party/android_deps/libs/org_robolectric_annotations/cipd.yaml b/third_party/android_deps/libs/org_robolectric_annotations/cipd.yaml
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2@4.7.3.cr1
+# cipd create --pkg-def cipd.yaml -tag version:2@4.8.1.cr1
 package: chromium/third_party/android_deps/libs/org_robolectric_annotations
 description: "annotations"
 data:
-- file: annotations-4.7.3.jar
+- file: annotations-4.8.1.jar
diff --git a/third_party/android_deps/libs/org_robolectric_junit/README.chromium b/third_party/android_deps/libs/org_robolectric_junit/README.chromium
@@ -1,7 +1,7 @@
 Name: junit
 Short Name: junit
 URL: http://robolectric.org
-Version: 4.7.3
+Version: 4.8.1
 License: MIT
 License File: NOT_SHIPPED
 CPEPrefix: unknown

diff --git a/third_party/android_deps/libs/org_robolectric_junit/cipd.yaml b/third_party/android_deps/libs/org_robolectric_junit/cipd.yaml
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2@4.7.3.cr1
+# cipd create --pkg-def cipd.yaml -tag version:2@4.8.1.cr1
 package: chromium/third_party/android_deps/libs/org_robolectric_junit
 description: "junit"
 data:
-- file: junit-4.7.3.jar
+- file: junit-4.8.1.jar
diff --git a/third_party/android_deps/libs/org_robolectric_nativeruntime/README.chromium b/third_party/android_deps/libs/org_robolectric_nativeruntime/README.chromium
@@ -1,7 +1,7 @@
 Name: nativeruntime
 Short Name: nativeruntime
 URL: http://robolectric.org
-Version: 4.7.3
+Version: 4.8.1
 License: MIT
 License File: NOT_SHIPPED
 CPEPrefix: unknown

diff --git a/third_party/android_deps/libs/org_robolectric_nativeruntime/cipd.yaml b/third_party/android_deps/libs/org_robolectric_nativeruntime/cipd.yaml
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2@4.7.3.cr1
+# cipd create --pkg-def cipd.yaml -tag version:2@4.8.1.cr1
 package: chromium/third_party/android_deps/libs/org_robolectric_nativeruntime
 description: "nativeruntime"
 data:
-- file: nativeruntime-4.7.3.jar
+- file: nativeruntime-4.8.1.jar
diff --git a/third_party/android_deps/libs/org_robolectric_pluginapi/README.chromium b/third_party/android_deps/libs/org_robolectric_pluginapi/README.chromium
@@ -1,7 +1,7 @@
 Name: pluginapi
 Short Name: pluginapi
 URL: http://robolectric.org
-Version: 4.7.3
+Version: 4.8.1
 License: MIT
 License File: NOT_SHIPPED
 CPEPrefix: unknown

diff --git a/third_party/android_deps/libs/org_robolectric_pluginapi/cipd.yaml b/third_party/android_deps/libs/org_robolectric_pluginapi/cipd.yaml
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2@4.7.3.cr1
+# cipd create --pkg-def cipd.yaml -tag version:2@4.8.1.cr1
 package: chromium/third_party/android_deps/libs/org_robolectric_pluginapi
 description: "pluginapi"
 data:
-- file: pluginapi-4.7.3.jar
+- file: pluginapi-4.8.1.jar
diff --git a/...party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver/README.chromium b/...party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver/README.chromium
@@ -1,7 +1,7 @@
 Name: maven-dependency-resolver
 Short Name: plugins-maven-dependency-resolver
 URL: http://robolectric.org
-Version: 4.7.3
+Version: 4.8.1
 License: MIT
 License File: NOT_SHIPPED
 CPEPrefix: unknown