commit 4832e8b5876cb481d6e845782f7582904e1e445e
author Søren Gjesse <sgjesse@google.com> Wed Jun 30 09:25:25 2021 +0200
committer Søren Gjesse <sgjesse@google.com> Wed Jun 30 07:40:32 2021 +0000
tree 908d6b913020f189f535b30d0a42180656297f60
parent 23650cfda46a22256ad101fb4ddd23fb1c338f02

Update ASM to version 9.2

Change-Id: I90daf8d32a403d9041c63c2ccccc88f37d6cd07a

build.gradle

diff --git a/build.gradle b/build.gradle
index 1dc777d..7a28b47 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,7 @@
 
 ext {
     androidSupportVersion = '25.4.0'
-    asmVersion = '9.0'  // When updating update tools/asmifier.py and Toolhelper as well.
+    asmVersion = '9.2'  // 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 f3108e5..e4ed7b0 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -124,8 +124,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-9.0.jar";
-  public static final String ASM_UTIL_JAR = BUILD_DIR + "deps/asm-util-9.0.jar";
+  public static final String ASM_JAR = BUILD_DIR + "deps/asm-9.2.jar";
+  public static final String ASM_UTIL_JAR = BUILD_DIR + "deps/asm-util-9.2.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 8aeb9a7..3fec231 100755
--- a/tools/asmifier.py
+++ b/tools/asmifier.py
@@ -10,7 +10,7 @@
 import sys
 import utils
 
-ASM_VERSION = '9.0'
+ASM_VERSION = '9.2'
 ASM_JAR = 'asm-' + ASM_VERSION + '.jar'
 ASM_UTIL_JAR = 'asm-util-' + ASM_VERSION + '.jar'