commit a599e658cfa6be7446c7e1216aad36d930b88610
author Søren Gjesse <sgjesse@google.com> Wed May 03 14:35:06 2023 +0200
committer Søren Gjesse <sgjesse@google.com> Thu May 04 07:48:09 2023 +0000
tree 3dde269cea15d6b9a574e556fb3d70efa26d2650
parent 63a53a990ca06ad517377eb4c654ffee7d60ce70

Update smali to version 3.0.3 (the Google maintained version)

Fixes: b/280401078
Change-Id: Ie15cd388bffd7e765e3a127d1a0b3ef15c818b0c

buildSrc/build.gradle

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 0eeb704..85815bd 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -5,17 +5,19 @@
 apply plugin: 'idea'
 
 repositories {
+    google()
     mavenCentral()
 }
 
 ext {
     guavaVersion = '31.1-jre'
     asmVersion = '9.5'
+    smaliVersion = '3.0.3'
 }
 
 dependencies {
     implementation group: 'com.google.guava', name: 'guava', version: guavaVersion
-    implementation group: 'org.smali', name: 'smali', version: '2.2b4'
+    implementation group: 'com.android.tools.smali', name: 'smali', version: smaliVersion
     implementation group: 'org.ow2.asm', name: 'asm', version: asmVersion
     implementation group: 'org.ow2.asm', name: 'asm-commons', version: asmVersion
     implementation group: 'org.ow2.asm', name: 'asm-tree', version: asmVersion

buildSrc/src/main/java/smali/SmaliTask.java

diff --git a/buildSrc/src/main/java/smali/SmaliTask.java b/buildSrc/src/main/java/smali/SmaliTask.java
index dd4e10c..d35102e 100644
--- a/buildSrc/src/main/java/smali/SmaliTask.java
+++ b/buildSrc/src/main/java/smali/SmaliTask.java
@@ -5,6 +5,8 @@
 
 import static java.util.stream.Collectors.toList;
 
+import com.android.tools.smali.smali.Smali;
+import com.android.tools.smali.smali.SmaliOptions;
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -20,8 +22,6 @@
 import org.gradle.workers.WorkAction;
 import org.gradle.workers.WorkParameters;
 import org.gradle.workers.WorkerExecutor;
-import org.jf.smali.Smali;
-import org.jf.smali.SmaliOptions;
 
 public class SmaliTask extends DefaultTask {