commit cd1a1aa37165bee202cd3fe78dad08a0f7e499c8
author Morten Krogh-Jespersen <mkroghj@google.com> Thu Nov 26 08:26:26 2020 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Fri Nov 27 08:56:02 2020 +0000
tree 2727ee007f160562de827000bfc5b45edb370fac
parent 43a4ef3c8746fca03e92d0fd2a5bcc5acb12c0dd

Update ASM to version 9.0

Bug: 141587937
Bug: 169692487
Change-Id: I7420ad7709350e3df1db6d06248592a5675553fb

build.gradle

diff --git a/build.gradle b/build.gradle
index d80eb7e..be64cba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,7 @@
 
 ext {
     androidSupportVersion = '25.4.0'
-    asmVersion = '8.0'  // When updating update tools/asmifier.py and Toolhelper as well.
+    asmVersion = '9.0'  // When updating update tools/asmifier.py and Toolhelper as well.
     espressoVersion = '3.0.0'
     fastutilVersion = '7.2.0'
     guavaVersion = '23.0'

src/test/java/com/android/tools/r8/ToolHelper.java

diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index 3ad6107..0fe11ae 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -121,8 +121,8 @@
   public static final String JAVA_CLASSES_DIR = BUILD_DIR + "classes/java/";
   public static final String JDK_11_TESTS_CLASSES_DIR = JAVA_CLASSES_DIR + "jdk11Tests/";
 
-  public static final String ASM_JAR = BUILD_DIR + "deps/asm-8.0.jar";
-  public static final String ASM_UTIL_JAR = BUILD_DIR + "deps/asm-util-8.0.jar";
+  public static final String ASM_JAR = BUILD_DIR + "deps/asm-9.0.jar";
+  public static final String ASM_UTIL_JAR = BUILD_DIR + "deps/asm-util-9.0.jar";
 
   public static final Path API_SAMPLE_JAR = Paths.get("tests", "r8_api_usage_sample.jar");
 

tools/asmifier.py

diff --git a/tools/asmifier.py b/tools/asmifier.py
index 5290f0a..8aeb9a7 100755
--- a/tools/asmifier.py
+++ b/tools/asmifier.py
@@ -10,7 +10,7 @@
 import sys
 import utils
 
-ASM_VERSION = '8.0'
+ASM_VERSION = '9.0'
 ASM_JAR = 'asm-' + ASM_VERSION + '.jar'
 ASM_UTIL_JAR = 'asm-util-' + ASM_VERSION + '.jar'