Updating robolectric to use ASM 7 am: 95d48609f9

Original change: https://android-review.googlesource.com/c/platform/external/robolectric-shadows/+/1948557

Change-Id: I11b244ede231757889479b555500e08d81c87866

8 files changed, 29 insertions, 29 deletions

diff --git a/Android.bp b/Android.bp
index 4cb11d741..f9a6f484d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -154,11 +154,11 @@ java_library_host {
         "Robolectric_sandbox",
         "Robolectric_junit",
         "Robolectric_utils",
-        "asm-6.0", // if upgrading to ASM 7.0+, unset my_require_v53_or_lower_class_files in robotest-internal.mk (requires robolectric 4.0.x, see b/135459087)
+        "asm-7.0", // when upgraded to ASM 7.0+, my_require_v53_or_lower_class_files was unset in robotest-internal.mk (requires robolectric 4.0.x, see b/135459087)
         "junit",
-        "asm-tree-6.0",
+        "asm-tree-7.0",
         "guava",
-        "asm-commons-6.0",
+        "asm-commons-7.0",
         "bouncycastle-unbundled",
         "robolectric-sqlite4java-0.282",
         "hamcrest",
diff --git a/junit/Android.bp b/junit/Android.bp
index 65f12adf9..beefdcba2 100644
--- a/junit/Android.bp
+++ b/junit/Android.bp
@@ -18,12 +18,12 @@ java_library_host {
         "Robolectric_shadowapi",
         "Robolectric_sandbox",
         "Robolectric_utils",
-        "asm-commons-6.0",
+        "asm-commons-7.0",
         "guava",
-        "asm-tree-6.0",
+        "asm-tree-7.0",
         "hamcrest",
         "junit",
-        "asm-6.0",
+        "asm-7.0",
         "jsr305",
     ],
     srcs: ["src/main/java/**/*.java"],
diff --git a/processor/Android.bp b/processor/Android.bp
index fdf2dc618..a4b4ccc55 100644
--- a/processor/Android.bp
+++ b/processor/Android.bp
@@ -22,11 +22,11 @@ java_plugin {
     static_libs: [
         "Robolectric_annotations",
         "Robolectric_shadowapi",
-        "asm-commons-6.0",
+        "asm-commons-7.0",
         "guava",
-        "asm-tree-6.0",
+        "asm-tree-7.0",
         "gson-prebuilt-jar",
-        "asm-6.0",
+        "asm-7.0",
         "jsr305",
     ],
 
diff --git a/robolectric/Android.bp b/robolectric/Android.bp
index 90c413da9..f2894ef6d 100644
--- a/robolectric/Android.bp
+++ b/robolectric/Android.bp
@@ -25,13 +25,13 @@ java_library_host {
         "robolectric-host-androidx-test-monitor",
         "robolectric-maven-ant-tasks-2.1.3",
         "bouncycastle-unbundled",
-        "asm-commons-6.0",
+        "asm-commons-7.0",
         "guava",
         "robolectric-xstream-1.4.8",
-        "asm-tree-6.0",
+        "asm-tree-7.0",
         "junit",
         "robolectric-ant-1.8.0",
-        "asm-6.0",
+        "asm-7.0",
         "jsr305",
         "robolectric-host-android_all",
     ],
@@ -70,17 +70,17 @@ java_test_host {
         "bouncycastle-unbundled",
         "hamcrest",
         "robolectric-sqlite4java-0.282",
-        "asm-commons-6.0",
+        "asm-commons-7.0",
         "robolectric-diffutils-1.3.0",
         "guava",
         "objenesis",
         "robolectric-xstream-1.4.8",
-        "asm-tree-6.0",
+        "asm-tree-7.0",
         "junit",
         "icu4j",
         "truth-prebuilt",
         "robolectric-ant-1.8.0",
-        "asm-6.0",
+        "asm-7.0",
         "jsr305",
     ],
     libs: ["robolectric-host-android_all"],
diff --git a/robotest-internal.mk b/robotest-internal.mk
index 938c1a57e..87ec53f2b 100644
--- a/robotest-internal.mk
+++ b/robotest-internal.mk
@@ -18,8 +18,8 @@ my_target_retval := $(intermediates)/$(my_filename_stem)-retval.txt
 my_target_nocache := $(intermediates)/$(my_filename_stem)-nocache
 
 # OpenJDK 10+ java binaries include v54+ classfiles which require ASM 7.0 or higher.
-# While this build is still using ASM 6.0, pin to an OpenJDK 9 java binary:
-my_require_v53_or_lower_class_files := true
+# The flag has been used when this build was using ASM 6.0 to pin to an OpenJDK 9 java binary:
+my_require_v53_or_lower_class_files := false
 
 # Private variables.
 $(my_target_output): PRIVATE_MODULE := $(LOCAL_MODULE)
diff --git a/sandbox/Android.bp b/sandbox/Android.bp
index cad5fd576..1260ea2f2 100644
--- a/sandbox/Android.bp
+++ b/sandbox/Android.bp
@@ -18,10 +18,10 @@ java_library_host {
         "Robolectric_annotations",
         "Robolectric_shadowapi",
         "Robolectric_utils",
-        "asm-commons-6.0",
+        "asm-commons-7.0",
         "guava",
-        "asm-tree-6.0",
-        "asm-6.0",
+        "asm-tree-7.0",
+        "asm-7.0",
         "jsr305",
     ],
 }
@@ -41,13 +41,13 @@ java_test_host {
         "Robolectric_utils",
         "mockito",
         "hamcrest",
-        "asm-commons-6.0",
+        "asm-commons-7.0",
         "guava",
         "objenesis",
-        "asm-tree-6.0",
+        "asm-tree-7.0",
         "junit",
         "truth-prebuilt",
-        "asm-6.0",
+        "asm-7.0",
         "jsr305",
     ],
     test_suites: ["general-tests"],
diff --git a/shadows/httpclient/Android.bp b/shadows/httpclient/Android.bp
index 613f852af..f4cfa5016 100644
--- a/shadows/httpclient/Android.bp
+++ b/shadows/httpclient/Android.bp
@@ -51,14 +51,14 @@ java_test_host {
         "bouncycastle-unbundled",
         "hamcrest",
         "robolectric-httpclient-4.0.3",
-        "asm-commons-6.0",
+        "asm-commons-7.0",
         "robolectric-httpcore-4.0.1",
         "guava",
-        "asm-tree-6.0",
+        "asm-tree-7.0",
         "junit",
         "truth-prebuilt",
         "robolectric-ant-1.8.0",
-        "asm-6.0",
+        "asm-7.0",
         "jsr305",
         "robolectric-host-android_all",
         "robolectric-host-org_apache_http_legacy",
diff --git a/shadows/supportv4/Android.bp b/shadows/supportv4/Android.bp
index a1d30f8d9..c3565a07c 100644
--- a/shadows/supportv4/Android.bp
+++ b/shadows/supportv4/Android.bp
@@ -53,14 +53,14 @@ java_test_host {
         "mockito",
         "bouncycastle-unbundled",
         "hamcrest",
-        "asm-commons-6.0",
+        "asm-commons-7.0",
         "guava",
         "objenesis",
-        "asm-tree-6.0",
+        "asm-tree-7.0",
         "junit",
         "truth-prebuilt",
         "robolectric-ant-1.8.0",
-        "asm-6.0",
+        "asm-7.0",
         "jsr305",
     ],
     libs: ["robolectric-host-android_all"],