chore(release): 1.3.2 [skip ci]

## [1.3.2](https://github.com/revanced/revanced-patcher/compare/v1.3.1...v1.3.2) (2022-06-21)

### Bug Fixes

* return resourceFile to caller ([1f75777](1f75777cf9))

CHANGELOG.md

@@ -1,3 +1,25 @@
+## [1.3.2](https://github.com/revanced/revanced-patcher/compare/v1.3.1...v1.3.2) (2022-06-21)
+
+
+### Bug Fixes
+
+* return resourceFile to caller ([1f75777](https://github.com/revanced/revanced-patcher/commit/1f75777cf985bf08483033ec541937d3e733347b))
+
+## [1.3.1](https://github.com/revanced/revanced-patcher/compare/v1.3.0...v1.3.1) (2022-06-21)
+
+
+### Bug Fixes
+
+* `InlineSmaliCompiler.compile` using 0 registers instead of 1 by default ([835a421](https://github.com/revanced/revanced-patcher/commit/835a421cc0588b92c2995e9d74727069d14b1750))
+
+# [1.3.0](https://github.com/revanced/revanced-patcher/compare/v1.2.9...v1.3.0) (2022-06-20)
+
+
+### Features
+
+* `parametersCount` for `InlineSmaliCompiler` instead of `parameters` ([ad6c5c8](https://github.com/revanced/revanced-patcher/commit/ad6c5c827389d10eae473dc66557a699df8c3280))
+* simplify adding instructions ([e47b67d](https://github.com/revanced/revanced-patcher/commit/e47b67d7ec521f288644afb89baf4146dc9bc87d))
+
 ## [1.2.9](https://github.com/revanced/revanced-patcher/compare/v1.2.8...v1.2.9) (2022-06-20)
 
 

build.gradle.kts

@@ -24,10 +24,12 @@ dependencies {
     implementation(kotlin("stdlib"))
     implementation(kotlin("reflect"))
 
-    api("xpp3:xpp3:1.1.4c")
-    api("org.apktool:apktool-lib:2.6.5-SNAPSHOT")
-    api("app.revanced:multidexlib2:2.5.2.r2")
-    api("org.smali:smali:2.5.2")
+    implementation("xpp3:xpp3:1.1.4c")
+    implementation("app.revanced:multidexlib2:2.5.2.r2")
+    implementation("org.smali:smali:2.5.2")
+
+    implementation("org.apktool:apktool-lib:2.6.5-SNAPSHOT")
+    api("org.apktool:brut.j.dir:2.6.5-SNAPSHOT")
 
     testImplementation(kotlin("test"))
 }

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 1.2.9
+version = 1.3.2

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

@@ -137,6 +137,7 @@ class Patcher(private val options: PatcherOptions) {
     fun save(): PatcherResult {
         val packageMetadata = data.packageMetadata
         val metaInfo = packageMetadata.metaInfo
+        var resourceFile: ExtFile? = null
 
         if (options.patchResources) {
             val cacheDirectory = ExtFile(options.resourceCacheDirectory)
@@ -177,9 +178,7 @@ class Patcher(private val options: PatcherOptions) {
                 null, includedFiles
             )
 
-            // write packaged resources to cache directory
-            ExtFile(aaptFile).directory.copyToDir(cacheDirectory.resolve("build/"))
-
+            resourceFile = ExtFile(aaptFile)
         }
 
         val newDexFile = object : DexFile {
@@ -204,7 +203,8 @@ class Patcher(private val options: PatcherOptions) {
             dexFiles.map {
                 app.revanced.patcher.util.dex.DexFile(it.key, it.value)
             },
-            metaInfo.doNotCompress.toList()
+            metaInfo.doNotCompress.toList(),
+            resourceFile
         )
     }
 

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

@@ -1,6 +1,7 @@
 package app.revanced.patcher
 
 import app.revanced.patcher.util.dex.DexFile
+import brut.directory.ExtFile
 
 /**
  * The result of a patcher.
@@ -9,5 +10,6 @@ import app.revanced.patcher.util.dex.DexFile
  */
 data class PatcherResult(
     val dexFiles: List<DexFile>,
-    val doNotCompress: List<String>? = null
+    val doNotCompress: List<String>? = null,
+    val resourceFile: ExtFile?
 )

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

@@ -1,6 +1,9 @@
 package app.revanced.patcher.extensions
 
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
+import app.revanced.patcher.util.smali.toInstruction
+import app.revanced.patcher.util.smali.toInstructions
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.builder.BuilderInstruction
 import org.jf.dexlib2.builder.MutableMethodImplementation
@@ -62,6 +65,22 @@ internal fun Method.clone(
     )
 }
 
+/**
+ * Add smali instructions to the method.
+ * @param index The index to insert the instructions at.
+ * @param instruction The smali instruction to add.
+ */
+fun MutableMethod.addInstruction(index: Int, instruction: String) =
+    this.implementation!!.addInstruction(index, instruction.toInstruction(this))
+
+/**
+ * Add smali instructions to the method.
+ * @param index The index to insert the instructions at.
+ * @param instructions The smali instructions to add.
+ */
+fun MutableMethod.addInstructions(index: Int, instructions: String) =
+    this.implementation!!.addInstructions(index, instructions.toInstructions(this))
+
 /**
  * Clones the method.
  * @param registerCount This parameter allows you to change the register count of the method.

src/main/kotlin/app/revanced/patcher/patch/implementation/BytecodePatch.kt

@@ -9,5 +9,5 @@ import app.revanced.patcher.signature.implementation.method.MethodSignature
  * @param signatures A list of [MethodSignature] this patch relies on.
  */
 abstract class BytecodePatch(
-    val signatures: Iterable<MethodSignature>
+    internal val signatures: Iterable<MethodSignature>
 ) : Patch<BytecodeData>()

src/main/kotlin/app/revanced/patcher/util/smali/InlineSmaliCompiler.kt

@@ -3,8 +3,10 @@ package app.revanced.patcher.util.smali
 import org.antlr.runtime.CommonTokenStream
 import org.antlr.runtime.TokenSource
 import org.antlr.runtime.tree.CommonTreeNodeStream
+import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcodes
 import org.jf.dexlib2.builder.BuilderInstruction
+import org.jf.dexlib2.iface.Method
 import org.jf.dexlib2.writer.builder.DexBuilder
 import org.jf.smali.LexerErrorInterface
 import org.jf.smali.smaliFlexLexer
@@ -13,12 +15,12 @@ import org.jf.smali.smaliTreeWalker
 import java.io.InputStreamReader
 
 private const val METHOD_TEMPLATE = """
-.class LInlineCompiler;
-.super Ljava/lang/Object;
-.method %s dummyMethod(%s)V
-    .registers %d
-    %s
-.end method
+    .class LInlineCompiler;
+    .super Ljava/lang/Object;
+    .method %s dummyMethod(%s)V
+        .registers %d
+        %s
+    .end method
 """
 
 class InlineSmaliCompiler {
@@ -32,13 +34,11 @@ class InlineSmaliCompiler {
          * be messed up and results in broken Dalvik bytecode.
          * FIXME: Fix the above issue. When this is fixed, add the proper conversions in [InstructionConverter].
          */
-        fun compileMethodInstructions(
-            instructions: String,
-            parameters: String,
-            registers: Int,
-            forStaticMethod: Boolean
+        fun compile(
+            instructions: String, parameters: String, registers: Int, forStaticMethod: Boolean
         ): List<BuilderInstruction> {
-            val input = METHOD_TEMPLATE.format(if (forStaticMethod) "static" else "", parameters, registers, instructions)
+            val input =
+                METHOD_TEMPLATE.format(if (forStaticMethod) "static" else "", parameters, registers, instructions)
             val reader = InputStreamReader(input.byteInputStream())
             val lexer: LexerErrorInterface = smaliFlexLexer(reader, 15)
             val tokens = CommonTokenStream(lexer as TokenSource)
@@ -59,8 +59,19 @@ class InlineSmaliCompiler {
     }
 }
 
-fun String.toInstructions(parameters: String = "", registers: Int = 1, forStaticMethod: Boolean = true) =
-    InlineSmaliCompiler.compileMethodInstructions(this, parameters, registers, forStaticMethod)
+/**
+ * Compile lines of Smali code to a list of instructions.
+ * @param templateMethod The method to compile the instructions against.
+ * @returns A list of instructions.
+ */
+fun String.toInstructions(templateMethod: Method? = null) = InlineSmaliCompiler.compile(this,
+    templateMethod?.parameters?.joinToString("") { it } ?: "",
+    templateMethod?.implementation?.registerCount ?: 1,
+    (templateMethod?.accessFlags ?: 0) and AccessFlags.STATIC.value != 0)
 
-fun String.toInstruction(parameters: String = "", registers: Int = 1, forStaticMethod: Boolean = true) =
-    this.toInstructions(parameters, registers, forStaticMethod).first()
+/**
+ * Compile a line of Smali code to an instruction.
+ * @param templateMethod The method to compile the instructions against.
+ * @return The instruction.
+ */
+fun String.toInstruction(templateMethod: Method? = null) = this.toInstructions(templateMethod).first()

src/test/kotlin/app/revanced/patcher/usage/bytecode/patch/ExampleBytecodePatch.kt

@@ -15,7 +15,6 @@ import app.revanced.patcher.usage.resource.annotation.ExampleResourceCompatibili
 import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patcher.util.smali.toInstruction
-import app.revanced.patcher.util.smali.toInstructions
 import com.google.common.collect.ImmutableList
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Format
@@ -47,7 +46,7 @@ class ExampleBytecodePatch : BytecodePatch(
     // You can treat it as a constructor
     override fun execute(data: BytecodeData): PatchResult {
         // Get the resolved method for the signature from the resolver cache
-        val result = signatures.first().result!!
+        val result = ExampleSignature.result!!
 
         // Get the implementation for the resolved method
         val implementation = result.method.implementation!!
@@ -126,8 +125,8 @@ class ExampleBytecodePatch : BytecodePatch(
                         invoke-static { }, LTestClass;->returnHello()Ljava/lang/String;
                         move-result-object v1
                         invoke-virtual { v0, v1 }, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
-                    """.trimIndent().toInstructions()
-        implementation.addInstructions(startIndex + 2, instructions)
+                    """
+        result.method.addInstructions(startIndex + 2, instructions)
 
         // Finally, tell the patcher that this patch was a success.
         // You can also return PatchResultError with a message.