diff options
| author | Allen Hair <allenhair@google.com> | 2022-03-22 17:20:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-22 17:20:25 +0000 |
| commit | 5786b42736b2d2a85ae7f76050424c18d068ec7e (patch) | |
| tree | 9bf1dd5898f93484291974550a610f0a3c9e2153 | |
| parent | 8bfd5cab04c9adb734353ac05db9f3799bae9b33 (diff) | |
| parent | 6fbba72b201cdf2c041fc8936a259462bc8ac2aa (diff) | |
| download | robolectric-shadows-5786b42736b2d2a85ae7f76050424c18d068ec7e.tar.gz | |
Merge "Update asm-7.0 to asm-9.2." am: 6fbba72b20
Original change: https://android-review.googlesource.com/c/platform/external/robolectric-shadows/+/2016075
Change-Id: Ie75a68e1d3d0dd9aef13cffdc6dd84c6cafba08a
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | junit/Android.bp | 6 | ||||
| -rw-r--r-- | processor/Android.bp | 6 | ||||
| -rw-r--r-- | robolectric/Android.bp | 12 | ||||
| -rw-r--r-- | sandbox/Android.bp | 12 | ||||
| -rw-r--r-- | shadows/httpclient/Android.bp | 6 | ||||
| -rw-r--r-- | shadows/supportv4/Android.bp | 6 |
7 files changed, 27 insertions, 27 deletions
diff --git a/Android.bp b/Android.bp index 37796318e..774c382db 100644 --- a/Android.bp +++ b/Android.bp @@ -154,11 +154,11 @@ java_library_host { "Robolectric_sandbox", "Robolectric_junit", "Robolectric_utils", - "asm-7.0", + "asm-9.2", "junit", - "asm-tree-7.0", + "asm-tree-9.2", "guava", - "asm-commons-7.0", + "asm-commons-9.2", "bouncycastle-unbundled", "robolectric-sqlite4java-0.282", "hamcrest", diff --git a/junit/Android.bp b/junit/Android.bp index beefdcba2..38ab52978 100644 --- a/junit/Android.bp +++ b/junit/Android.bp @@ -18,12 +18,12 @@ java_library_host { "Robolectric_shadowapi", "Robolectric_sandbox", "Robolectric_utils", - "asm-commons-7.0", + "asm-commons-9.2", "guava", - "asm-tree-7.0", + "asm-tree-9.2", "hamcrest", "junit", - "asm-7.0", + "asm-9.2", "jsr305", ], srcs: ["src/main/java/**/*.java"], diff --git a/processor/Android.bp b/processor/Android.bp index a4b4ccc55..043ef198c 100644 --- a/processor/Android.bp +++ b/processor/Android.bp @@ -22,11 +22,11 @@ java_plugin { static_libs: [ "Robolectric_annotations", "Robolectric_shadowapi", - "asm-commons-7.0", + "asm-commons-9.2", "guava", - "asm-tree-7.0", + "asm-tree-9.2", "gson-prebuilt-jar", - "asm-7.0", + "asm-9.2", "jsr305", ], diff --git a/robolectric/Android.bp b/robolectric/Android.bp index f2894ef6d..ab08b47ff 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-7.0", + "asm-commons-9.2", "guava", "robolectric-xstream-1.4.8", - "asm-tree-7.0", + "asm-tree-9.2", "junit", "robolectric-ant-1.8.0", - "asm-7.0", + "asm-9.2", "jsr305", "robolectric-host-android_all", ], @@ -70,17 +70,17 @@ java_test_host { "bouncycastle-unbundled", "hamcrest", "robolectric-sqlite4java-0.282", - "asm-commons-7.0", + "asm-commons-9.2", "robolectric-diffutils-1.3.0", "guava", "objenesis", "robolectric-xstream-1.4.8", - "asm-tree-7.0", + "asm-tree-9.2", "junit", "icu4j", "truth-prebuilt", "robolectric-ant-1.8.0", - "asm-7.0", + "asm-9.2", "jsr305", ], libs: ["robolectric-host-android_all"], diff --git a/sandbox/Android.bp b/sandbox/Android.bp index 1260ea2f2..ae6aa36cf 100644 --- a/sandbox/Android.bp +++ b/sandbox/Android.bp @@ -18,10 +18,10 @@ java_library_host { "Robolectric_annotations", "Robolectric_shadowapi", "Robolectric_utils", - "asm-commons-7.0", + "asm-commons-9.2", "guava", - "asm-tree-7.0", - "asm-7.0", + "asm-tree-9.2", + "asm-9.2", "jsr305", ], } @@ -41,13 +41,13 @@ java_test_host { "Robolectric_utils", "mockito", "hamcrest", - "asm-commons-7.0", + "asm-commons-9.2", "guava", "objenesis", - "asm-tree-7.0", + "asm-tree-9.2", "junit", "truth-prebuilt", - "asm-7.0", + "asm-9.2", "jsr305", ], test_suites: ["general-tests"], diff --git a/shadows/httpclient/Android.bp b/shadows/httpclient/Android.bp index 744496e7a..39d57a8be 100644 --- a/shadows/httpclient/Android.bp +++ b/shadows/httpclient/Android.bp @@ -55,14 +55,14 @@ java_test_host { "bouncycastle-unbundled", "hamcrest", "robolectric-httpclient-4.0.3", - "asm-commons-7.0", + "asm-commons-9.2", "robolectric-httpcore-4.0.1", "guava", - "asm-tree-7.0", + "asm-tree-9.2", "junit", "truth-prebuilt", "robolectric-ant-1.8.0", - "asm-7.0", + "asm-9.2", "jsr305", "robolectric-host-android_all", "robolectric-host-org_apache_http_legacy", diff --git a/shadows/supportv4/Android.bp b/shadows/supportv4/Android.bp index c3565a07c..04714e520 100644 --- a/shadows/supportv4/Android.bp +++ b/shadows/supportv4/Android.bp @@ -53,14 +53,14 @@ java_test_host { "mockito", "bouncycastle-unbundled", "hamcrest", - "asm-commons-7.0", + "asm-commons-9.2", "guava", "objenesis", - "asm-tree-7.0", + "asm-tree-9.2", "junit", "truth-prebuilt", "robolectric-ant-1.8.0", - "asm-7.0", + "asm-9.2", "jsr305", ], libs: ["robolectric-host-android_all"], |