chore(release): 12.0.0-dev.2 [skip ci]

# [12.0.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v12.0.0-dev.1...v12.0.0-dev.2) (2023-07-28)

### Features

* Deprecate `Version` annotation ([400442f](400442f70e))

.releaserc

@@ -10,7 +10,7 @@
     [
       "@semantic-release/commit-analyzer", {
         "releaseRules": [
-          { "type": "build", "scope": "Needs bump", "release": "patch" }
+          { "type": "build", "scope": "needs-bump", "release": "patch" }
         ]
       }
     ],

CHANGELOG.md

@@ -1,64 +1,3 @@
-# [13.0.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v12.1.1...v13.0.0-dev.1) (2023-08-11)
-
-
-* build(Needs bump)!: Bump dependencies ([d5f89a9](https://github.com/ReVanced/revanced-patcher/commit/d5f89a903f019c199bdb27a50287124fc4b4978e))
-
-
-### BREAKING CHANGES
-
-* This bump updates smali, a crucial dependency
-
-## [12.1.1](https://github.com/ReVanced/revanced-patcher/compare/v12.1.0...v12.1.1) (2023-08-03)
-
-
-### Bug Fixes
-
-* clear method lookup maps before initializing them ([#210](https://github.com/ReVanced/revanced-patcher/issues/210)) ([746544f](https://github.com/ReVanced/revanced-patcher/commit/746544f9d51d1013bb160075709cd26bffd425b3))
-
-## [12.1.1-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v12.1.1-dev.1...v12.1.1-dev.2) (2023-08-03)
-
-## [12.1.1-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v12.1.0...v12.1.1-dev.1) (2023-08-03)
-
-
-### Bug Fixes
-
-* clear method lookup maps before initializing them ([#210](https://github.com/ReVanced/revanced-patcher/issues/210)) ([746544f](https://github.com/ReVanced/revanced-patcher/commit/746544f9d51d1013bb160075709cd26bffd425b3))
-
-# [12.1.0](https://github.com/ReVanced/revanced-patcher/compare/v12.0.0...v12.1.0) (2023-08-03)
-
-
-### Features
-
-* add `MutableMethod.getInstructions` extension function ([fae4029](https://github.com/ReVanced/revanced-patcher/commit/fae4029cfccfad7aa3dd8f7fbef1c63ee26b85b3))
-
-# [12.1.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v12.1.0-dev.1...v12.1.0-dev.2) (2023-08-03)
-
-# [12.1.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v12.0.0...v12.1.0-dev.1) (2023-08-01)
-
-
-### Features
-
-* add `MutableMethod.getInstructions` extension function ([fae4029](https://github.com/ReVanced/revanced-patcher/commit/fae4029cfccfad7aa3dd8f7fbef1c63ee26b85b3))
-
-# [12.0.0](https://github.com/ReVanced/revanced-patcher/compare/v11.0.4...v12.0.0) (2023-07-30)
-
-
-### Bug Fixes
-
-* correct access flags of `PackageMetadata` ([416d691](https://github.com/ReVanced/revanced-patcher/commit/416d69142f50dab49c9ea3f027e9d53e4777f257))
-* set resource table via resource decoder ([e0f8e1b](https://github.com/ReVanced/revanced-patcher/commit/e0f8e1b71a295948b610029c89a48f52762396b6))
-
-
-### Features
-
-* Deprecate `Version` annotation ([c9bbcf2](https://github.com/ReVanced/revanced-patcher/commit/c9bbcf2bf2b0f50ab9100380a3a66c6346ad42ac))
-* remove `Path` option ([#202](https://github.com/ReVanced/revanced-patcher/issues/202)) ([69e4a49](https://github.com/ReVanced/revanced-patcher/commit/69e4a490659ebc4fb4bf46148634f4b064ef1713))
-
-
-### BREAKING CHANGES
-
-* This removes the previously available `Path` option
-
 # [12.0.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v12.0.0-dev.1...v12.0.0-dev.2) (2023-07-28)
 
 

build.gradle.kts

@@ -10,25 +10,22 @@ val githubPassword: String = project.findProperty("gpr.key") as? String ?: Syste
 
 repositories {
     mavenCentral()
-    google()
+    maven {
-    listOf("multidexlib2", "apktool").forEach { repo ->
+        url = uri("https://maven.pkg.github.com/revanced/multidexlib2")
-        maven {
+        credentials {
-            url = uri("https://maven.pkg.github.com/revanced/$repo")
+            username = githubUsername
-            credentials {
+            password = githubPassword
-                username = githubUsername
-                password = githubPassword
-            }
         }
     }
 }
 
 dependencies {
     implementation("xpp3:xpp3:1.1.4c")
-    implementation("com.android.tools.smali:smali:3.0.3")
+    implementation("app.revanced:smali:2.5.3-a3836654")
-    implementation("app.revanced:multidexlib2:3.0.3.r2")
+    implementation("app.revanced:multidexlib2:2.5.3-a3836654")
-    implementation("app.revanced:apktool-lib:2.8.2-2")
+    implementation("app.revanced:apktool-lib:2.8.2")
 
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.22")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC")
     testImplementation("org.jetbrains.kotlin:kotlin-test:1.8.20-RC")
 }
 

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 13.0.0-dev.1
+version = 12.0.0-dev.2

src/main/kotlin/app/revanced/patcher/PatcherContext.kt

@@ -4,7 +4,7 @@ import app.revanced.patcher.data.*
 import app.revanced.patcher.logging.Logger
 import app.revanced.patcher.patch.Patch
 import app.revanced.patcher.util.ClassMerger.merge
-import com.android.tools.smali.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.ClassDef
 import java.io.File
 
 data class PatcherContext(

src/main/kotlin/app/revanced/patcher/PatcherOptions.kt

@@ -18,15 +18,4 @@ data class PatcherOptions(
     internal val aaptPath: String? = null,
     internal val frameworkDirectory: String? = null,
     internal val logger: Logger = NopLogger
-) {
+)
-    fun recreateResourceCacheDirectory() = File(resourceCacheDirectory).also {
-        if (it.exists()) {
-            logger.info("Deleting existing resource cache directory")
-
-            if (!it.deleteRecursively())
-                logger.error("Failed to delete existing resource cache directory")
-        }
-
-        it.mkdirs()
-    }
-}

src/main/kotlin/app/revanced/patcher/data/Context.kt

@@ -2,8 +2,8 @@ package app.revanced.patcher.data
 
 import app.revanced.patcher.util.ProxyBackedClassList
 import app.revanced.patcher.util.method.MethodWalker
-import com.android.tools.smali.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.iface.Method
+import org.jf.dexlib2.iface.Method
 import org.w3c.dom.Document
 import java.io.Closeable
 import java.io.File

src/main/kotlin/app/revanced/patcher/extensions/Extensions.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.extensions
 
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
 
 /**
  * Create a label for the instruction at given index.

src/main/kotlin/app/revanced/patcher/extensions/InstructionExtensions.kt

@@ -4,12 +4,12 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patcher.util.smali.toInstructions
-import com.android.tools.smali.dexlib2.builder.BuilderInstruction
+import org.jf.dexlib2.builder.BuilderInstruction
-import com.android.tools.smali.dexlib2.builder.BuilderOffsetInstruction
+import org.jf.dexlib2.builder.BuilderOffsetInstruction
-import com.android.tools.smali.dexlib2.builder.Label
+import org.jf.dexlib2.builder.Label
-import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
+import org.jf.dexlib2.builder.MutableMethodImplementation
-import com.android.tools.smali.dexlib2.builder.instruction.*
+import org.jf.dexlib2.builder.instruction.*
-import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import org.jf.dexlib2.iface.instruction.Instruction
 
 object InstructionExtensions {
 
@@ -321,11 +321,6 @@ object InstructionExtensions {
      * @param T The type of instruction to return.
      * @return The instruction.
      */
+    @Suppress("UNCHECKED_CAST")
     fun <T> MutableMethod.getInstruction(index: Int): T = implementation!!.getInstruction<T>(index)
-
-    /**
-     * Get the instructions of a method.
-     * @return The instructions.
-     */
-    fun MutableMethod.getInstructions(): MutableList<BuilderInstruction> = implementation!!.instructions
 }

src/main/kotlin/app/revanced/patcher/extensions/PatchExtensions.kt

@@ -25,7 +25,6 @@ object PatchExtensions {
     /**
      * The version of a [Patch].
      */
-    @Deprecated("This property is deprecated and will be removed in a future release.")
     val Class<out Patch<Context>>.version
         get() = findAnnotationRecursively(Version::class)?.version
 

src/main/kotlin/app/revanced/patcher/fingerprint/method/impl/MethodFingerprint.kt

@@ -6,14 +6,14 @@ import app.revanced.patcher.fingerprint.Fingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.util.proxy.ClassProxy
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.iface.Method
+import org.jf.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import org.jf.dexlib2.iface.instruction.Instruction
-import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import com.android.tools.smali.dexlib2.iface.reference.StringReference
+import org.jf.dexlib2.iface.reference.StringReference
-import com.android.tools.smali.dexlib2.util.MethodUtil
+import org.jf.dexlib2.util.MethodUtil
 import java.util.*
 
 private typealias StringMatch = MethodFingerprintResult.MethodFingerprintScanResult.StringsScanResult.StringMatch
@@ -99,7 +99,7 @@ abstract class MethodFingerprint(
                 methodClassPairs!!.add(methodClassPair)
             }
 
-            if (methods.isNotEmpty()) MethodFingerprint.clearFingerprintResolutionLookupMaps()
+            if (methods.isNotEmpty()) throw PatchResultError("Map already initialized")
 
             context.classes.classes.forEach { classDef ->
                 classDef.methods.forEach { method ->
@@ -510,4 +510,4 @@ data class MethodFingerprintResult(
             )
         }
     }
-}
+}

src/main/kotlin/app/revanced/patcher/util/ClassMerger.kt

@@ -15,9 +15,9 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableField
 import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.util.MethodUtil
+import org.jf.dexlib2.util.MethodUtil
 import kotlin.reflect.KFunction2
 
 /**

src/main/kotlin/app/revanced/patcher/util/ProxyBackedClassList.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util
 
 import app.revanced.patcher.util.proxy.ClassProxy
-import com.android.tools.smali.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.ClassDef
 
 /**
  * A class that represents a set of classes and proxies.

src/main/kotlin/app/revanced/patcher/util/method/MethodWalker.kt

@@ -2,10 +2,10 @@ package app.revanced.patcher.util.method
 
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import com.android.tools.smali.dexlib2.iface.Method
+import org.jf.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.iface.reference.MethodReference
-import com.android.tools.smali.dexlib2.util.MethodUtil
+import org.jf.dexlib2.util.MethodUtil
 
 /**
  * Find a method from another method via instruction offsets.

src/main/kotlin/app/revanced/patcher/util/patch/PatchBundle.kt

@@ -6,7 +6,7 @@ import app.revanced.patcher.data.Context
 import app.revanced.patcher.extensions.AnnotationExtensions.findAnnotationRecursively
 import app.revanced.patcher.extensions.PatchExtensions.patchName
 import app.revanced.patcher.patch.Patch
-import com.android.tools.smali.dexlib2.DexFileFactory
+import org.jf.dexlib2.DexFileFactory
 import java.io.File
 import java.net.URLClassLoader
 import java.util.jar.JarFile

src/main/kotlin/app/revanced/patcher/util/proxy/ClassProxy.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy
 
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
-import com.android.tools.smali.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.ClassDef
 
 /**
  * A proxy class for a [ClassDef].

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation.kt

@@ -1,8 +1,8 @@
 package app.revanced.patcher.util.proxy.mutableTypes
 
 import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotationElement.Companion.toMutable
-import com.android.tools.smali.dexlib2.base.BaseAnnotation
+import org.jf.dexlib2.base.BaseAnnotation
-import com.android.tools.smali.dexlib2.iface.Annotation
+import org.jf.dexlib2.iface.Annotation
 
 class MutableAnnotation(annotation: Annotation) : BaseAnnotation() {
     private val visibility = annotation.visibility

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement.kt

@@ -2,9 +2,9 @@ package app.revanced.patcher.util.proxy.mutableTypes
 
 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue
 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue.Companion.toMutable
-import com.android.tools.smali.dexlib2.base.BaseAnnotationElement
+import org.jf.dexlib2.base.BaseAnnotationElement
-import com.android.tools.smali.dexlib2.iface.AnnotationElement
+import org.jf.dexlib2.iface.AnnotationElement
-import com.android.tools.smali.dexlib2.iface.value.EncodedValue
+import org.jf.dexlib2.iface.value.EncodedValue
 
 class MutableAnnotationElement(annotationElement: AnnotationElement) : BaseAnnotationElement() {
     private var name = annotationElement.name

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableClass.kt

@@ -4,10 +4,10 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotation.Companion.
 import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import com.google.common.collect.Iterables
-import com.android.tools.smali.dexlib2.base.reference.BaseTypeReference
+import org.jf.dexlib2.base.reference.BaseTypeReference
-import com.android.tools.smali.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.util.FieldUtil
+import org.jf.dexlib2.util.FieldUtil
-import com.android.tools.smali.dexlib2.util.MethodUtil
+import org.jf.dexlib2.util.MethodUtil
 
 class MutableClass(classDef: ClassDef) : ClassDef, BaseTypeReference() {
     // Class

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableField.kt

@@ -3,9 +3,9 @@ package app.revanced.patcher.util.proxy.mutableTypes
 import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue
 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue.Companion.toMutable
-import com.android.tools.smali.dexlib2.HiddenApiRestriction
+import org.jf.dexlib2.HiddenApiRestriction
-import com.android.tools.smali.dexlib2.base.reference.BaseFieldReference
+import org.jf.dexlib2.base.reference.BaseFieldReference
-import com.android.tools.smali.dexlib2.iface.Field
+import org.jf.dexlib2.iface.Field
 
 class MutableField(field: Field) : Field, BaseFieldReference() {
     private var definingClass = field.definingClass

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethod.kt

@@ -2,10 +2,10 @@ package app.revanced.patcher.util.proxy.mutableTypes
 
 import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethodParameter.Companion.toMutable
-import com.android.tools.smali.dexlib2.HiddenApiRestriction
+import org.jf.dexlib2.HiddenApiRestriction
-import com.android.tools.smali.dexlib2.base.reference.BaseMethodReference
+import org.jf.dexlib2.base.reference.BaseMethodReference
-import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
+import org.jf.dexlib2.builder.MutableMethodImplementation
-import com.android.tools.smali.dexlib2.iface.Method
+import org.jf.dexlib2.iface.Method
 
 class MutableMethod(method: Method) : Method, BaseMethodReference() {
     private var definingClass = method.definingClass

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter.kt

@@ -1,8 +1,8 @@
 package app.revanced.patcher.util.proxy.mutableTypes
 
 import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
-import com.android.tools.smali.dexlib2.base.BaseMethodParameter
+import org.jf.dexlib2.base.BaseMethodParameter
-import com.android.tools.smali.dexlib2.iface.MethodParameter
+import org.jf.dexlib2.iface.MethodParameter
 
 // TODO: finish overriding all members if necessary
 class MutableMethodParameter(parameter: MethodParameter) : MethodParameter, BaseMethodParameter() {

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue.kt

@@ -1,9 +1,9 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
 import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotationElement.Companion.toMutable
-import com.android.tools.smali.dexlib2.base.value.BaseAnnotationEncodedValue
+import org.jf.dexlib2.base.value.BaseAnnotationEncodedValue
-import com.android.tools.smali.dexlib2.iface.AnnotationElement
+import org.jf.dexlib2.iface.AnnotationElement
-import com.android.tools.smali.dexlib2.iface.value.AnnotationEncodedValue
+import org.jf.dexlib2.iface.value.AnnotationEncodedValue
 
 class MutableAnnotationEncodedValue(annotationEncodedValue: AnnotationEncodedValue) : BaseAnnotationEncodedValue(),
     MutableEncodedValue {

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue.kt

@@ -1,9 +1,9 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue.Companion.toMutable
-import com.android.tools.smali.dexlib2.base.value.BaseArrayEncodedValue
+import org.jf.dexlib2.base.value.BaseArrayEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.ArrayEncodedValue
+import org.jf.dexlib2.iface.value.ArrayEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.EncodedValue
+import org.jf.dexlib2.iface.value.EncodedValue
 
 class MutableArrayEncodedValue(arrayEncodedValue: ArrayEncodedValue) : BaseArrayEncodedValue(), MutableEncodedValue {
     private val _value by lazy {

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseBooleanEncodedValue
+import org.jf.dexlib2.base.value.BaseBooleanEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.BooleanEncodedValue
+import org.jf.dexlib2.iface.value.BooleanEncodedValue
 
 class MutableBooleanEncodedValue(booleanEncodedValue: BooleanEncodedValue) : BaseBooleanEncodedValue(),
     MutableEncodedValue {

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseByteEncodedValue
+import org.jf.dexlib2.base.value.BaseByteEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.ByteEncodedValue
+import org.jf.dexlib2.iface.value.ByteEncodedValue
 
 class MutableByteEncodedValue(byteEncodedValue: ByteEncodedValue) : BaseByteEncodedValue(), MutableEncodedValue {
     private var value = byteEncodedValue.value

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseCharEncodedValue
+import org.jf.dexlib2.base.value.BaseCharEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.CharEncodedValue
+import org.jf.dexlib2.iface.value.CharEncodedValue
 
 class MutableCharEncodedValue(charEncodedValue: CharEncodedValue) : BaseCharEncodedValue(), MutableEncodedValue {
     private var value = charEncodedValue.value

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseDoubleEncodedValue
+import org.jf.dexlib2.base.value.BaseDoubleEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.DoubleEncodedValue
+import org.jf.dexlib2.iface.value.DoubleEncodedValue
 
 class MutableDoubleEncodedValue(doubleEncodedValue: DoubleEncodedValue) : BaseDoubleEncodedValue(),
     MutableEncodedValue {

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.ValueType
+import org.jf.dexlib2.ValueType
-import com.android.tools.smali.dexlib2.iface.value.*
+import org.jf.dexlib2.iface.value.*
 
 interface MutableEncodedValue : EncodedValue {
     companion object {

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue.kt

@@ -1,8 +1,8 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseEnumEncodedValue
+import org.jf.dexlib2.base.value.BaseEnumEncodedValue
-import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+import org.jf.dexlib2.iface.reference.FieldReference
-import com.android.tools.smali.dexlib2.iface.value.EnumEncodedValue
+import org.jf.dexlib2.iface.value.EnumEncodedValue
 
 class MutableEnumEncodedValue(enumEncodedValue: EnumEncodedValue) : BaseEnumEncodedValue(), MutableEncodedValue {
     private var value = enumEncodedValue.value

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue.kt

@@ -1,9 +1,9 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.ValueType
+import org.jf.dexlib2.ValueType
-import com.android.tools.smali.dexlib2.base.value.BaseFieldEncodedValue
+import org.jf.dexlib2.base.value.BaseFieldEncodedValue
-import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+import org.jf.dexlib2.iface.reference.FieldReference
-import com.android.tools.smali.dexlib2.iface.value.FieldEncodedValue
+import org.jf.dexlib2.iface.value.FieldEncodedValue
 
 class MutableFieldEncodedValue(fieldEncodedValue: FieldEncodedValue) : BaseFieldEncodedValue(), MutableEncodedValue {
     private var value = fieldEncodedValue.value