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

# [1.2.0-dev.2](https://github.com/revanced/revanced-cli/compare/v1.2.0-dev.1...v1.2.0-dev.2) (2022-06-05)

### Features

* debugging option ([1b645c6](1b645c67db))

.github/workflows/release.yml

@@ -1,5 +1,6 @@
 name: Release
 on:
+  workflow_dispatch:
   push:
     branches:
       - main

.idea/vcs.xml

@@ -8,5 +8,7 @@
   </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../revanced-patcher" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../revanced-patches" vcs="Git" />
   </component>
 </project>

CHANGELOG.md

@@ -1,3 +1,45 @@
+# [1.2.0-dev.2](https://github.com/revanced/revanced-cli/compare/v1.2.0-dev.1...v1.2.0-dev.2) (2022-06-05)
+
+
+### Features
+
+* debugging option ([1b645c6](https://github.com/revanced/revanced-cli/commit/1b645c67db58eb4d49b5290fd247507c9b43a9c6))
+
+# [1.2.0-dev.1](https://github.com/revanced/revanced-cli/compare/v1.1.6-dev.1...v1.2.0-dev.1) (2022-06-04)
+
+
+### Features
+
+* add path for `cacheDirectory` and enable resource patching by default ([54c0a03](https://github.com/revanced/revanced-cli/commit/54c0a03d44c8d1b586bc487ee1ca71859d6f0b57))
+
+## [1.1.6-dev.1](https://github.com/revanced/revanced-cli/compare/v1.1.5...v1.1.6-dev.1) (2022-05-31)
+
+
+### Bug Fixes
+
+* migrate to latest patcher api changes ([ace70e4](https://github.com/revanced/revanced-cli/commit/ace70e417fdf280c7630a5a89a773879fd240e96))
+
+## [1.1.5](https://github.com/revanced/revanced-cli/compare/v1.1.4...v1.1.5) (2022-05-27)
+
+
+### Bug Fixes
+
+* invalid code flow when adding patches ([206f202](https://github.com/revanced/revanced-cli/commit/206f2029d7498b6474c16a47cbe451c170fdd31f))
+
+## [1.1.4](https://github.com/revanced/revanced-cli/compare/v1.1.3...v1.1.4) (2022-05-26)
+
+
+### Bug Fixes
+
+* migrate from `PatchLoader.load(...)` to `JarPatchBundle(...).loadPatches()` ([cabd32f](https://github.com/revanced/revanced-cli/commit/cabd32fda41d32616a61ae450c60e1ee7c35bc59))
+
+## [1.1.3](https://github.com/revanced/revanced-cli/compare/v1.1.2...v1.1.3) (2022-05-25)
+
+
+### Bug Fixes
+
+* only accept directories when looking for files in resource patch ([c76da7e](https://github.com/revanced/revanced-cli/commit/c76da7e5ffa208860eea008dad358e4e3bb3d735))
+
 ## [1.1.2](https://github.com/revanced/revanced-cli/compare/v1.1.1...v1.1.2) (2022-05-22)
 
 

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.6.20"
+    kotlin("jvm") version "1.6.21"
     id("com.github.johnrengelman.shadow") version "7.1.2"
     java
     `maven-publish`
@@ -23,15 +23,14 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("stdlib"))
-    implementation("app.revanced:revanced-patcher:+")
-    implementation("app.revanced:revanced-patches:+")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
+    implementation("app.revanced:revanced-patcher:1.0.0-dev.18")
 
-    implementation("info.picocli:picocli:+")
+    implementation("info.picocli:picocli:4.6.3")
 
     implementation("com.github.li-wjohnson:jadb:master-SNAPSHOT") // using a fork instead.
-    implementation("org.bouncycastle:bcpkix-jdk15on:+")
-    implementation(kotlin("reflect"))
+    implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.21")
 }
 
 java {
@@ -68,4 +67,4 @@ publishing {
             from(components["java"])
         }
     }
-}
+}

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 1.1.2
+version = 1.2.0-dev.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/app/revanced/cli/MainCommand.kt

@@ -1,8 +1,8 @@
 package app.revanced.cli
 
+import app.revanced.patcher.PatcherOptions
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.extensions.findAnnotationRecursively
-import app.revanced.patcher.util.patch.PatchLoader
+import app.revanced.patcher.util.patch.implementation.JarPatchBundle
 import app.revanced.utils.adb.Adb
 import app.revanced.utils.patcher.addPatchesFiltered
 import app.revanced.utils.signature.Signature
@@ -20,13 +20,13 @@ internal object MainCommand : Runnable {
     internal var includedPatches = arrayOf<String>()
 
     @Option(names = ["-p", "--patches"], description = ["One or more bundles of patches"])
-    internal var patchBundles = arrayOf<File>()
+    internal var patchBundles = arrayOf<String>()
 
-    @Option(names = ["-t", "--temp-dir"], description = ["Temporal resource cache directory"], required = true)
-    internal lateinit var cacheDirectory: String
+    @Option(names = ["-t", "--temp-dir"], description = ["Temporal resource cache directory"])
+    internal var cacheDirectory = "revanced-cache"
 
-    @Option(names = ["-r", "--resource-patcher"], description = ["Enable patching resources"])
-    internal var patchResources: Boolean = false
+    @Option(names = ["-r", "--resource-patcher"], description = ["Disable patching resources"])
+    internal var disableResourcePatching: Boolean = false
 
     @Option(
         names = ["-c", "--clean"],
@@ -52,23 +52,23 @@ internal object MainCommand : Runnable {
     @Option(names = ["-d", "--deploy-on"], description = ["If specified, deploy to adb device with given name"])
     internal var deploy: String? = null
 
+    @Option(names = ["-b", "--debugging"], description = ["Disable patch version compatibility"])
+    internal var debugging: Boolean = false
+
     override fun run() {
         if (listOnly) {
-            for (patchBundle in patchBundles)
-                for (it in PatchLoader.loadFromFile(patchBundle))
-                    println(
-                        "[available] ${
-                            it.javaClass.findAnnotationRecursively(
-                                Name::class.java
-                            )?.name ?: Name::class.java.name
-                        }"
-                    )
+            for (patchBundlePath in patchBundles) for (it in JarPatchBundle(patchBundlePath).loadPatches()) {
+
+                // TODO: adjust extension methods to be able to do this
+                val name = (it.annotations.find { it is Name } as? Name)?.name ?: it.simpleName
+                println(
+                    "[available] $name"
+                )
+            }
             return
         }
 
-        val patcher = app.revanced.patcher.Patcher(
-            inputFile, cacheDirectory, patchResources
-        )
+        val patcher = app.revanced.patcher.Patcher(PatcherOptions(inputFile, cacheDirectory, !disableResourcePatching))
 
         if (signatureCheck) {
             patcher.addPatchesFiltered()
@@ -90,7 +90,7 @@ internal object MainCommand : Runnable {
         if (clean) File(cacheDirectory).deleteRecursively()
 
         adb?.deploy()
-      
+
         if (clean) outputFile.delete()
     }
 }

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

@@ -6,6 +6,7 @@ import app.revanced.utils.patcher.applyPatchesPrint
 import app.revanced.utils.patcher.mergeFiles
 import app.revanced.utils.signing.Signer
 import java.io.File
+import java.io.FileFilter
 
 internal class Patcher {
     internal companion object {
@@ -29,8 +30,9 @@ internal class Patcher {
                 zipFileSystem.replaceFile(name, data.data)
             }
 
-            if (MainCommand.patchResources) {
-                for (file in File(MainCommand.cacheDirectory).resolve("build/").listFiles()?.first()?.listFiles()!!) {
+            if (!MainCommand.disableResourcePatching) {
+                for (file in File(MainCommand.cacheDirectory).resolve("build/").listFiles(FileFilter { it.isDirectory })
+                    ?.first()?.listFiles()!!) {
                     if (!file.isDirectory) {
                         zipFileSystem.replaceFile(file.name, file.readBytes())
                         continue

src/main/kotlin/app/revanced/patch/Patches.kt

@@ -1,2 +0,0 @@
-package app.revanced.patch
-

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

@@ -2,29 +2,23 @@ package app.revanced.utils.patcher
 
 import app.revanced.cli.MainCommand
 import app.revanced.patcher.Patcher
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.base.Data
-import app.revanced.patcher.extensions.findAnnotationRecursively
+import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
+import app.revanced.patcher.extensions.PatchExtensions.patchName
 import app.revanced.patcher.patch.base.Patch
-import app.revanced.patcher.util.patch.PatchLoader
+import app.revanced.patcher.util.patch.implementation.JarPatchBundle
 
 fun Patcher.addPatchesFiltered(
-    packageCompatibilityFilter: Boolean = true,
-    packageVersionCompatibilityFilter: Boolean = true,
     includeFilter: Boolean = false
 ) {
     val packageName = this.packageName
     val packageVersion = this.packageVersion
 
     MainCommand.patchBundles.forEach { bundle ->
-        val includedPatches = mutableListOf<Patch<Data>>()
-        PatchLoader.loadFromFile(bundle).forEach patch@{ p ->
-            val patch = p.getDeclaredConstructor().newInstance()
-
-            val compatibilityAnnotation = patch.javaClass.findAnnotationRecursively(Compatibility::class.java)
-
-            val patchName = patch.javaClass.findAnnotationRecursively(Name::class.java)?.name ?: Name::class.java.name
+        val includedPatches = mutableListOf<Class<out Patch<Data>>>()
+        JarPatchBundle(bundle).loadPatches().forEach patch@{ patch ->
+            val compatiblePackages = patch.compatiblePackages
+            val patchName = patch.patchName
 
             val prefix = "[skipped] $patchName"
 
@@ -33,21 +27,14 @@ fun Patcher.addPatchesFiltered(
                 return@patch
             }
 
-            if (packageVersionCompatibilityFilter || packageCompatibilityFilter) {
-
-                if (compatibilityAnnotation == null) {
-                    println("$prefix: Missing compatibility annotation.")
+            if (compatiblePackages == null) println("$prefix: Missing compatibility annotation. Continuing.")
+            else compatiblePackages.forEach { compatiblePackage ->
+                if (compatiblePackage.name != packageName) {
+                    println("$prefix: Package name not matching ${compatiblePackage.name}.")
                     return@patch
                 }
 
-
-                for (compatiblePackage in compatibilityAnnotation.compatiblePackages) {
-                    if (packageCompatibilityFilter && compatiblePackage.name != packageName) {
-                        println("$prefix: Package name not matching ${compatiblePackage.name}.")
-                        return@patch
-                    }
-
-                    if (!packageVersionCompatibilityFilter || compatiblePackage.versions.any { it == packageVersion }) continue
+                if (!(MainCommand.debugging || compatiblePackage.versions.any { it == packageVersion })) {
                     println("$prefix: Unsupported version.")
                     return@patch
                 }
@@ -61,8 +48,13 @@ fun Patcher.addPatchesFiltered(
 }
 
 fun Patcher.applyPatchesPrint() {
-    for ((patch, result) in this.applyPatches()) {
-        println("[${if (result.isFailure) "error" else "success"}] $patch")
+    this.applyPatches().forEach { (patch, result) ->
+        if (result.isSuccess) {
+            println("[success] $patch")
+            return@forEach
+        }
+        println("[error] $patch:")
+        result.exceptionOrNull()!!.printStackTrace()
     }
 }
 

src/main/kotlin/app/revanced/utils/signature/Signature.kt

@@ -1,55 +1,52 @@
 package app.revanced.utils.signature
 
 import app.revanced.patcher.Patcher
-import app.revanced.patcher.extensions.findAnnotationRecursively
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
 import org.jf.dexlib2.iface.Method
 
 object Signature {
 
     fun checkSignatures(patcher: Patcher) {
+        TODO()
+        /**
         val failed = mutableListOf<String>()
         for (signature in patcher.resolveSignatures()) {
-            val signatureClass = signature::class.java
-            val signatureName =
-                signatureClass.findAnnotationRecursively(app.revanced.patcher.annotation.Name::class.java)?.name
-                    ?: signatureClass.name
-            if (!signature.resolved) {
-                failed.add(signatureName)
-                continue
-            }
+        val signatureClass = signature::class.java
+        val signatureName = signature.name ?: signatureClass.simpleName
+        if (!signature.resolved) {
+        failed.add(signatureName)
+        continue
+        }
 
-            val method = signature.result!!.method
-            val matchingMethod =
-                signatureClass.findAnnotationRecursively(MatchingMethod::class.java) ?: MatchingMethod()
+        val method = signature.result!!.method
+        val matchingMethod = signature.matchingMethod ?: MatchingMethod()
 
-            println(
-                """
-                    [Signature] $signatureName
-                    [Method] ${matchingMethod.definingClass}->${matchingMethod.name}
-                    [Match] ${method.definingClass}->${method.toStr()}
-                """.trimIndent()
-            )
+        println(
+        """
+        [Signature] $signatureName
+        [Method] ${matchingMethod.definingClass}->${matchingMethod.name}
+        [Match] ${method.definingClass}->${method.toStr()}
+        """.trimIndent()
+        )
 
-            signatureClass.findAnnotationRecursively(FuzzyPatternScanMethod::class.java)?.let {
-                val warnings = signature.result!!.scanResult.warnings!!
-                println(
-                    """
-                        [Warnings: ${warnings.count()}]
-                        ${warnings.joinToString(separator = "\n") { warning -> "${warning.instructionIndex} / ${warning.patternIndex}: ${warning.wrongOpcode} (expected: ${warning.correctOpcode})" }}
-                    """.trimIndent()
-                )
-            }
+        signature.fuzzyThreshold.let {
+        val warnings = signature.result!!.scanResult.warnings!!
+        println(
+        """
+        [Warnings: ${warnings.count()}]
+        ${warnings.joinToString(separator = "\n") { warning -> "${warning.instructionIndex} / ${warning.patternIndex}: ${warning.wrongOpcode} (expected: ${warning.correctOpcode})" }}
+        """.trimIndent()
+        )
+        }
         }
 
         println(
-            """
-                ${"=".repeat(50)}
-                [Failed signatures: ${failed.size}]
-                ${failed.joinToString(separator = "\n") { it }}
+        """
+        ${"=".repeat(50)}
+        [Failed signatures: ${failed.size}]
+        ${failed.joinToString(separator = "\n") { it }}
         """.trimIndent()
         )
+         */
     }
 
     private fun Method.toStr(): String {