Merge with upstream

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'com.android.tools'
-version '8.2.2'
+version '8.2.6'
 
 repositories {
     mavenCentral()
@@ -30,7 +30,7 @@ ext {
     javassistVersion = '3.29.2-GA'
     espressoVersion = '3.0.0'
     fastutilVersion = '8.5.11'
-    guavaVersion = '30.1.1-jre'
+    guavaVersion = '31.1-jre'
     joptSimpleVersion = '4.6'
     gsonVersion = '2.7'
     junitVersion = '4.13-beta-2'
@@ -39,7 +39,7 @@ ext {
     // all kotlin compilations are done in tests.
     kotlinVersion = '1.8.0'
     kotlinExtMetadataJVMVersion = '0.6.0'
-    smaliVersion = '2.2b4'
+    smaliVersion = '3.0.3'
     errorproneVersion = '2.18.0'
     testngVersion = '6.10'
 }

buildSrc/build.gradle

@@ -5,16 +5,19 @@ apply plugin: 'java'
 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: '30.1.1-jre'
-    implementation group: 'org.smali', name: 'smali', version: '2.2b4'
+    implementation group: 'com.google.guava', name: 'guava', version: guavaVersion
+    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

@@ -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 {
 

commonBuildSrc/settings.gradle.kts

@@ -10,6 +10,7 @@ pluginManagement {
 
 dependencyResolutionManagement {
     repositories {
+        google()
         mavenCentral()
         gradlePluginPortal()
     }

commonBuildSrc/src/main/kotlin/Dependencies.kt

@@ -35,15 +35,15 @@ object JvmCompatibility {
 }
 
 object Versions {
-  const val asmVersion = "9.4"
+  const val asmVersion = "9.5"
   const val fastUtilVersion = "7.2.0"
   const val gsonVersion = "2.7"
-  const val guavaVersion = "30.1.1-jre"
+  const val guavaVersion = "31.1-jre"
   const val joptSimpleVersion = "4.6"
   const val junitVersion = "4.13-beta-2"
   const val kotlinVersion = "1.8.0"
   const val kotlinMetadataVersion = "0.6.0"
-  const val smaliVersion = "2.2b4"
+  const val smaliVersion = "3.0.3"
   const val errorproneVersion = "2.18.0"
 }
 
@@ -60,6 +60,6 @@ object Deps {
     "org.jetbrains.kotlinx:kotlinx-metadata-jvm:${Versions.kotlinMetadataVersion}" }
   val kotlinStdLib by lazy { "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlinVersion}" }
   val kotlinReflect by lazy { "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlinVersion}" }
-  val smali by lazy { "org.smali:smali:${Versions.smaliVersion}" }
+  val smali by lazy { "com.android.tools.smali:smali:${Versions.smaliVersion}" }
   val errorprone by lazy { "com.google.errorprone:error_prone_core:${Versions.errorproneVersion}" }
 }

src/main/dontwarn.txt

@@ -1,3 +1,4 @@
 # TODO(b/176783536): Avoid need to use -dontwarn.
 -dontwarn com.google.errorprone.annotations.**
 -dontwarn com.google.j2objc.annotations.*
+-dontwarn javax.annotation.CheckForNull

src/main/java/com/android/tools/r8/BaseCommand.java

@@ -89,7 +89,7 @@ public ProgramInputOrigin(Path file) {
     }
   }
 
-  private static class LibraryInputOrigin extends InputFileOrigin {
+  static class LibraryInputOrigin extends InputFileOrigin {
 
     public LibraryInputOrigin(Path file) {
       super("library input", file);