chore(release): 2.22.0-dev.1 [skip ci]

# [2.22.0-dev.1](https://github.com/revanced/revanced-cli/compare/v2.21.5...v2.22.0-dev.1) (2023-07-10)

### Features

* use new patch naming convention ([e4908c7](e4908c7105))

.github/workflows/release.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Build with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew build
+        run: ./gradlew clean --no-daemon
       - name: Setup semantic-release
         run: npm install
       - name: Release

.releaserc

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

CHANGELOG.md

@@ -1,72 +1,3 @@
-# [3.0.0-dev.3](https://github.com/ReVanced/revanced-cli/compare/v3.0.0-dev.2...v3.0.0-dev.3) (2023-08-23)
-
-# [3.0.0-dev.2](https://github.com/ReVanced/revanced-cli/compare/v3.0.0-dev.1...v3.0.0-dev.2) (2023-08-23)
-
-
-### Bug Fixes
-
-* specify correct class containing entry-point ([1fcc591](https://github.com/ReVanced/revanced-cli/commit/1fcc591222ab67112f2b78174a8b94106846838c))
-
-# [3.0.0-dev.1](https://github.com/ReVanced/revanced-cli/compare/v2.23.0-dev.5...v3.0.0-dev.1) (2023-08-23)
-
-
-### Bug Fixes
-
-* do not use absolute path from custom AAPT2 binary option ([a9c2a5f](https://github.com/ReVanced/revanced-cli/commit/a9c2a5f096627dbbf8ab1b8da26fb14529ce6bc3))
-* use correct option name ([f8972ea](https://github.com/ReVanced/revanced-cli/commit/f8972eac3e5ee0a4a186c12cbe711925656d657b))
-
-
-* refactor!: restructure code ([07da528](https://github.com/ReVanced/revanced-cli/commit/07da528ce2223582f84bf64d2fec69714c647ddc))
-
-
-### Features
-
-* add options command ([9edbbf3](https://github.com/ReVanced/revanced-cli/commit/9edbbf31635603f89fc7bc5dcc6c023d4cdbb5a6))
-* use better logging text ([b0e748d](https://github.com/ReVanced/revanced-cli/commit/b0e748daff527ee7f417b3069882e074896fc131))
-* use separate command to list patches ([b74213f](https://github.com/ReVanced/revanced-cli/commit/b74213f66e0d04d3a0ae6197d069631388e06580))
-* use separate command to patch ([32da961](https://github.com/ReVanced/revanced-cli/commit/32da961d57537e99b39fd92b625a1c73f8314bc6))
-* use separate command to uninstall ([c0cc909](https://github.com/ReVanced/revanced-cli/commit/c0cc90962646cfffd5e2730ae556423271a7990b))
-* use simpler log ([ba758f0](https://github.com/ReVanced/revanced-cli/commit/ba758f00f4ce18791439b7e72fe1ad2e7f11f8af))
-
-
-### BREAKING CHANGES
-
-* This introduces major changes to how ReVanced CLI is used from the command line.
-
-# [2.23.0-dev.5](https://github.com/ReVanced/revanced-cli/compare/v2.23.0-dev.4...v2.23.0-dev.5) (2023-08-14)
-
-# [2.23.0-dev.4](https://github.com/ReVanced/revanced-cli/compare/v2.23.0-dev.3...v2.23.0-dev.4) (2023-08-13)
-
-
-### Features
-
-* show full package name when listing patches ([#240](https://github.com/ReVanced/revanced-cli/issues/240)) ([7174364](https://github.com/ReVanced/revanced-cli/commit/7174364ef8ef5d6ce8351a8340f9c1a5b58eac3c))
-
-# [2.23.0-dev.3](https://github.com/ReVanced/revanced-cli/compare/v2.23.0-dev.2...v2.23.0-dev.3) (2023-08-03)
-
-# [2.23.0-dev.2](https://github.com/ReVanced/revanced-cli/compare/v2.23.0-dev.1...v2.23.0-dev.2) (2023-08-03)
-
-# [2.23.0-dev.1](https://github.com/ReVanced/revanced-cli/compare/v2.22.1-dev.1...v2.23.0-dev.1) (2023-07-30)
-
-
-### Features
-
-* Improve command line argument descriptions ([f9cf7d2](https://github.com/ReVanced/revanced-cli/commit/f9cf7d21b7f1c2f11234d604a1047b9d2b165f83))
-
-## [2.22.1-dev.1](https://github.com/ReVanced/revanced-cli/compare/v2.22.0...v2.22.1-dev.1) (2023-07-24)
-
-
-### Bug Fixes
-
-* print original instead of kebab cased names ([5eaad33](https://github.com/ReVanced/revanced-cli/commit/5eaad33dc1fbd24c36e1498f04e21d068e85f53e))
-
-# [2.22.0](https://github.com/revanced/revanced-cli/compare/v2.21.5...v2.22.0) (2023-07-11)
-
-
-### Features
-
-* use new patch naming convention ([f6c221d](https://github.com/revanced/revanced-cli/commit/f6c221d72dc43ebea00e5eba6bfa02751ae8ad77))
-
 # [2.22.0-dev.1](https://github.com/revanced/revanced-cli/compare/v2.21.5...v2.22.0-dev.1) (2023-07-10)
 
 

README.md

@@ -1,3 +1,3 @@
 # 💻 ReVanced CLI
 
-Command line application to use ReVanced.
+Command line application as an alternative to the ReVanced Manager.

build.gradle.kts

@@ -1,23 +1,42 @@
 plugins {
     kotlin("jvm") version "1.8.20"
-    alias(libs.plugins.shadow)
+    id("com.github.johnrengelman.shadow") version "7.1.2"
 }
 
 group = "app.revanced"
 
-dependencies {
+val githubUsername: String = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
-    implementation(libs.revanced.patcher)
+val githubPassword: String = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
-    implementation(libs.kotlin.reflect)
+
-    implementation(libs.kotlinx.coroutines.core)
+repositories {
-    implementation(libs.picocli)
+    mavenCentral()
-    implementation(libs.jadb) // Updated fork
+    mavenLocal()
-    implementation(libs.apksig)
+    maven {
-    implementation(libs.bcpkix.jdk15on)
+        url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
-    implementation(libs.jackson.module.kotlin)
+        credentials {
-    testImplementation(libs.kotlin.test)
+            username = githubUsername
+            password = githubPassword
+        }
+    }
+    maven { url = uri("https://jitpack.io") }
+    google()
 }
 
-kotlin { jvmToolchain(11) }
+dependencies {
+    implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC")
+
+    implementation("app.revanced:revanced-patcher:11.0.3")
+    implementation("info.picocli:picocli:4.7.1")
+    implementation("com.github.revanced:jadb:2531a28109") // updated fork
+    implementation("com.android.tools.build:apksig:8.1.0-alpha09")
+    implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.14.+")
+    testImplementation("org.jetbrains.kotlin:kotlin-test:1.8.20-RC")
+}
+
+kotlin {
+    jvmToolchain(11)
+}
 
 tasks {
     test {
@@ -26,14 +45,12 @@ tasks {
             events("PASSED", "SKIPPED", "FAILED")
         }
     }
-
+    build {
-    processResources {
+        dependsOn(shadowJar)
-        expand("projectVersion" to project.version)
     }
-
     shadowJar {
         manifest {
-            attributes("Main-Class" to "app.revanced.cli.command.MainCommandKt")
+            attributes("Main-Class" to "app.revanced.cli.main.MainKt")
         }
         minimize {
             exclude(dependency("org.jetbrains.kotlin:.*"))
@@ -41,16 +58,12 @@ tasks {
             exclude(dependency("app.revanced:.*"))
         }
     }
-
-    build {
-        dependsOn(shadowJar)
-    }
-
     // Dummy task to fix the Gradle semantic-release plugin.
     // Remove this if you forked it to support building only.
     // Tracking issue: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
     register<DefaultTask>("publish") {
         group = "publish"
         description = "Dummy task"
+        dependsOn(build)
     }
 }

docs/0_prerequisites.md

@@ -1,17 +1,15 @@
 # 💼 Prerequisites
 
-To use ReVanced CLI, you will need to fulfil specific requirements.
+To use ReVanced CLI, you will need to fulfill certain requirements.
 
 ## 🤝 Requirements
 
-- Java SDK 11 (Azul Zulu JDK or OpenJDK)
+- Java SDK 11 (Azul JDK or OpenJDK)
-- [Android Debug Bridge (adb)](https://developer.android.com/studio/command-line/adb) if you want to install the patched APK file on your device
+- [Android Debug Bridge (adb)](https://developer.android.com/studio/command-line/adb) if you want to deploy the patched APK file on your device
 - An ABI other than ARMv7 such as x86 or x86-64 (or a custom AAPT binary that supports ARMv7)
-- ReVanced Patches
-- ReVanced Integrations, if the patches require it
 
 ## ⏭️ Whats next
 
-The following section will show you how to use ReVanced CLI.
+The next section will show, how to use [ReVanced CLI](https://github.com/revanced/revanced-cli).
 
 Continue: [🛠️ Using ReVanced CLI](1_usage.md)

docs/1_usage.md

@@ -10,14 +10,13 @@ Learn how to ReVanced CLI.
    adb shell exit
    ```
 
-   Optionally, you can install the patched APK file on your device by mounting it on top of the original APK file. 
+   If you want to deploy the patched APK file on your device by mounting it on top of the original APK file, you will need root access. This is optional.
-   You will need root permissions for this. Check if you have root permissions by running the following command:
 
    ```bash
    adb shell su -c exit
    ```
 
-2. Get your device's serial
+2. Get the name of your device
 
    ```bash
    adb devices
@@ -31,67 +30,47 @@ Learn how to ReVanced CLI.
   java -jar revanced-cli.jar -h
   ```
 
-- ### 📃 List patches from supplied patch bundles
+- ### 📃 List all available patches from supplied patch bundles
 
   ```bash
-  java -jar revanced-cli.jar list-patches \
+  java -jar revanced-cli.jar
-   --with-packages \
+   -b revanced-patches.jar \
-   --with-versions \
+   -l # Names of all patches will be in kebab-case
-   --with-options \
-   revanced-patches.jar [<patch-bundle> ...]
   ```
 
-- ### ⚙️ Generate options from patches using ReVanced CLI
+- ### 💉 Use ReVanced CLI to patch an APK file but deploy without root permissions
 
-  This will generate an `options.json` file for the patches from a list of supplied patch bundles.
+  This will deploy the patched APK file on your device by installing it.
-  The file can be supplied to ReVanced CLI later on.
- 
-- ```bash
-  java -jar revanced-cli.jar options \
-   --path options.json \
-   --overwrite \
-   revanced-patches.jar [<patch-bundle> ...]
-  ```
-
-  > **Note**: A default `options.json` file will be automatically generated, if it does not exist 
-  without any need for intervention when using the `patch` command.
-
-- ### 💉 Use ReVanced CLI to patch an APK file but install without root permissions
-
-  This will install the patched APK file regularly on your device.
 
   ```bash
-  java -jar revanced-cli.jar patch \
+  java -jar revanced-cli.jar \
-   --patch-bundle revanced-patches.jar \
+   -a input.apk \
-   --out output.apk \
+   -o patched-output.apk \
-   --device-serial <device-serial> \
+   -b revanced-patches.jar \
-   input.apk
+   -d device-name
   ```
 
-- ### 👾 Use ReVanced CLI to patch an APK file but install with root permissions
+- ### 👾 Use ReVanced CLI to patch an APK file but deploy with root permissions
 
-  This will install the patched APK file on your device by mounting it on top of the original APK file.
+  This will deploy the patched APK file on your device by mounting it on top of the original APK file.
 
   ```bash
   adb install input.apk
-  java -jar revanced-cli.jar patch \
+  java -jar revanced-cli.jar \
-   --patch-bundle revanced-patches.jar \
+   -a input.apk \
-   --include some-other-patch \
+   -o patched-output.apk \
-   --exclude some-patch \
+   -b revanced-patches.jar \
-   --out patched-output.apk \
+   -e vanced-microg-support \
-   --device-serial <device-serial> \
+   -d device-name \
-   --mount \
+   --mount
-   input.apk
   ```
 
-  > **Note**: Some patches may require integrations
+  > **Note**: Some patches from [ReVanced Patches](https://github.com/revanced/revanced-patches) also require [ReVanced Integrations](https://github.com/revanced/revanced-integrations). Supply them with the option `-m`. ReVanced Patcher will merge ReVanced Integrations automatically, depending on if the supplied patches require them.
-  such as [ReVanced Integrations](https://github.com/revanced/revanced-integrations). 
-  Supply them with the option `-m`. If any patches accepted by ReVanced Patcher require ReVanced Integrations, 
-  they will be merged into the APK file automatically.
 
-- ### 🗑️ Uninstall a patched APK file
+- ### ⚙️ Supply options to patches using ReVanced CLI
-  ```bash
+
-  java -jar revanced-cli.jar uninstall \
+  Some patches provide options. Currently, ReVanced CLI will generate and consume an `options.json` file at the location that is specified in `-o`. If the option is not specified, the options file will be generated in the current working directory.
-   --package-name <package-name> \
+  
-   <device-serial>
+  The options file contains all options from supplied patch bundles.
-  ```
+
+  > **Note**: The `options.json` file will be generated at the first time you use ReVanced CLI to patch an APK file for now. This will be changed in the future.

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 3.0.0-dev.3
+version = 2.22.0-dev.1

gradle/libs.versions.toml

@@ -1,25 +0,0 @@
-[versions]
-shadow = "8.1.1"
-apksig = "8.1.0"
-bcpkix-jdk15on = "1.70"
-jackson-module-kotlin = "2.14.3"
-jadb = "2531a28109"
-kotlin-reflect = "1.9.0"
-kotlin-test = "1.8.20-RC"
-kotlinx-coroutines-core = "1.7.1"
-picocli = "4.7.3"
-revanced-patcher = "14.0.0"
-
-[libraries]
-apksig = { module = "com.android.tools.build:apksig", version.ref = "apksig" }
-bcpkix-jdk15on = { module = "org.bouncycastle:bcpkix-jdk15on", version.ref = "bcpkix-jdk15on" }
-jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson-module-kotlin" }
-jadb = { module = "com.github.revanced:jadb", version.ref = "jadb" }
-kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin-reflect" }
-kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin-test" }
-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines-core" }
-picocli = { module = "info.picocli:picocli", version.ref = "picocli" }
-revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" }
-
-[plugins]
-shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }

settings.gradle.kts

@@ -1,23 +1 @@
-val githubUsername: String = providers.gradleProperty("gpr.user").orNull ?: System.getenv("GITHUB_ACTOR")
-val githubPassword: String = providers.gradleProperty("gpr.key").orNull ?: System.getenv("GITHUB_TOKEN")
-
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        mavenCentral()
-        mavenLocal()
-        google()
-        maven { url = uri("https://jitpack.io") }
-        listOf("revanced-patcher", "jadb").forEach { repo ->
-            maven {
-                url = uri("https://maven.pkg.github.com/revanced/$repo")
-                credentials {
-                    username = githubUsername
-                    password = githubPassword
-                }
-            }
-        }
-    }
-}
-
 rootProject.name = "revanced-cli"

src/main/kotlin/app/revanced/cli/aligning/Aligning.kt

@@ -0,0 +1,37 @@
+package app.revanced.cli.aligning
+
+import app.revanced.cli.command.MainCommand.logger
+import app.revanced.patcher.PatcherResult
+import app.revanced.utils.signing.align.ZipAligner
+import app.revanced.utils.signing.align.zip.ZipFile
+import app.revanced.utils.signing.align.zip.structures.ZipEntry
+import java.io.File
+
+object Aligning {
+    fun align(result: PatcherResult, inputFile: File, outputFile: File) {
+        logger.info("Aligning ${inputFile.name} to ${outputFile.name}")
+
+        if (outputFile.exists()) outputFile.delete()
+
+        ZipFile(outputFile).use { file ->
+            result.dexFiles.forEach {
+                file.addEntryCompressData(
+                    ZipEntry.createWithName(it.name),
+                    it.stream.readBytes()
+                )
+            }
+
+            result.resourceFile?.let {
+                file.copyEntriesFromFileAligned(
+                    ZipFile(it),
+                    ZipAligner::getEntryAlignment
+                )
+            }
+
+            file.copyEntriesFromFileAligned(
+                ZipFile(inputFile),
+                ZipAligner::getEntryAlignment
+            )
+        }
+    }
+}

src/main/kotlin/app/revanced/cli/command/ListPatchesCommand.kt

@@ -1,94 +0,0 @@
-package app.revanced.cli.command
-
-import app.revanced.patcher.PatchBundleLoader
-import app.revanced.patcher.annotation.Package
-import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
-import app.revanced.patcher.extensions.PatchExtensions.description
-import app.revanced.patcher.extensions.PatchExtensions.options
-import app.revanced.patcher.extensions.PatchExtensions.patchName
-import app.revanced.patcher.patch.PatchClass
-import app.revanced.patcher.patch.PatchOption
-import picocli.CommandLine.*
-import picocli.CommandLine.Help.Visibility.ALWAYS
-import java.io.File
-
-
-@Command(name = "list-patches", description = ["List patches from supplied patch bundles"])
-internal object ListPatchesCommand : Runnable {
-    @Parameters(
-        description = ["Paths to patch bundles"],
-        arity = "1..*"
-    )
-    lateinit var patchBundles: Array<File>
-
-    @Option(
-        names = ["-d", "--with-descriptions"],
-        description = ["List their descriptions"],
-        showDefaultValue = ALWAYS
-    )
-    var withDescriptions: Boolean = true
-
-    @Option(
-        names = ["-p", "--with-packages"],
-        description = ["List the packages the patches are compatible with"],
-        showDefaultValue = ALWAYS
-    )
-    var withPackages: Boolean = false
-
-    @Option(
-        names = ["-v", "--with-versions"],
-        description = ["List the versions of the packages the patches are compatible with"],
-        showDefaultValue = ALWAYS
-    )
-    var withVersions: Boolean = false
-
-    @Option(
-        names = ["-o", "--with-options"],
-        description = ["List the options of the patches"],
-        showDefaultValue = ALWAYS
-    )
-    var withOptions: Boolean = false
-
-    override fun run() {
-        fun Package.buildString() = buildString {
-            if (withVersions && versions.isNotEmpty()) {
-                appendLine("Package name: $name")
-                appendLine("Compatible versions:")
-                append(versions.joinToString("\n") { version -> version }.prependIndent("\t"))
-            } else
-                append("Package name: $name")
-        }
-
-        fun PatchOption<*>.buildString() = buildString {
-            appendLine("Title: $title")
-            appendLine("Description: $description")
-
-            value?.let {
-                appendLine("Key: $key")
-                append("Value: $it")
-            } ?: append("Key: $key")
-        }
-
-        fun PatchClass.buildString() = buildString {
-            append("Name: $patchName")
-
-            if (withDescriptions) append("\nDescription: $description")
-
-            if (withOptions && options != null) {
-                appendLine("\nOptions:")
-                append(
-                    options!!.joinToString("\n\n") { option -> option.buildString() }.prependIndent("\t")
-                )
-            }
-
-            if (withPackages && compatiblePackages != null) {
-                appendLine("\nCompatible packages:")
-                append(
-                    compatiblePackages!!.joinToString("\n") { it.buildString() }.prependIndent("\t")
-                )
-            }
-        }
-
-        logger.info(PatchBundleLoader.Jar(*patchBundles).joinToString("\n\n") { it.buildString() })
-    }
-}

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

@@ -1,40 +1,264 @@
 package app.revanced.cli.command
 
+import app.revanced.cli.aligning.Aligning
 import app.revanced.cli.logging.impl.DefaultCliLogger
-import app.revanced.patcher.patch.PatchClass
+import app.revanced.cli.patcher.Patcher
-import picocli.CommandLine
+import app.revanced.cli.patcher.logging.impl.PatcherLogger
-import picocli.CommandLine.Command
+import app.revanced.cli.signing.Signing
-import picocli.CommandLine.IVersionProvider
+import app.revanced.cli.signing.SigningOptions
-import java.util.*
+import app.revanced.patcher.PatcherOptions
+import app.revanced.patcher.data.Context
+import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
+import app.revanced.patcher.extensions.PatchExtensions.description
+import app.revanced.patcher.extensions.PatchExtensions.patchName
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.util.patch.PatchBundle
+import app.revanced.utils.Options
+import app.revanced.utils.Options.setOptions
+import app.revanced.utils.adb.Adb
+import picocli.CommandLine.*
+import java.io.File
+import java.nio.file.Files
 
-fun main(args: Array<String>) {
+/**
-    CommandLine(MainCommand).execute(*args)
+ * Alias for return type of [PatchBundle.loadPatches].
-}
+ */
+internal typealias PatchList = List<Class<out Patch<Context>>>
 
-internal typealias PatchList = List<PatchClass>
+private class CLIVersionProvider : IVersionProvider {
-
+    override fun getVersion() = arrayOf(
-internal val logger = DefaultCliLogger()
+        MainCommand::class.java.`package`.implementationVersion ?: "unknown"
-
+    )
-object CLIVersionProvider : IVersionProvider {
-    override fun getVersion(): Array<String> {
-        Properties().apply {
-            load(MainCommand::class.java.getResourceAsStream("/app/revanced/cli/version.properties"))
-        }.let {
-            return arrayOf("ReVanced CLI v${it.getProperty("version")}")
-        }
-    }
 }
 
 @Command(
-    name = "revanced-cli",
+    name = "ReVanced-CLI",
-    description = ["Command line application to use ReVanced"],
     mixinStandardHelpOptions = true,
-    versionProvider = CLIVersionProvider::class,
+    versionProvider = CLIVersionProvider::class
-    subcommands = [
-        ListPatchesCommand::class,
-        PatchCommand::class,
-        UninstallCommand::class,
-        OptionsCommand::class,
-    ]
 )
-internal object MainCommand
+internal object MainCommand : Runnable {
+    val logger = DefaultCliLogger()
+
+    @ArgGroup(exclusive = false, multiplicity = "1")
+    lateinit var args: Args
+
+    class Args {
+        @Option(names = ["-a", "--apk"], description = ["Input APK file to be patched"], required = true)
+        lateinit var inputFile: File
+
+        @Option(names = ["--uninstall"], description = ["Uninstall the mount variant"])
+        var uninstall: Boolean = false
+
+        @Option(
+            names = ["-d", "--deploy-on"],
+            description = ["If specified, deploy to device over ADB with given name"]
+        )
+        var deploy: String? = null
+
+        @ArgGroup(exclusive = false)
+        var patchArgs: PatchArgs? = null
+    }
+
+    class PatchArgs {
+        @Option(names = ["-b", "--bundle"], description = ["One or more bundles of patches"], required = true)
+        var patchBundles = arrayOf<String>()
+
+        @Option(names = ["--options"], description = ["Path to patch options JSON file"])
+        var optionsFile: File = File("options.json")
+
+        @ArgGroup(exclusive = false)
+        var listingArgs: ListingArgs? = null
+
+        @ArgGroup(exclusive = false)
+        var patchingArgs: PatchingArgs? = null
+    }
+
+    class ListingArgs {
+        @Option(names = ["-l", "--list"], description = ["List patches"], required = true)
+        var listOnly: Boolean = false
+
+        @Option(names = ["--with-versions"], description = ["List patches with compatible versions"])
+        var withVersions: Boolean = false
+
+        @Option(names = ["--with-packages"], description = ["List patches with compatible packages"])
+        var withPackages: Boolean = false
+    }
+
+    class PatchingArgs {
+        @Option(names = ["-o", "--out"], description = ["Output file path"], required = true)
+        lateinit var outputPath: String
+
+        @Option(names = ["-e", "--exclude"], description = ["Explicitly exclude patches"])
+        var excludedPatches = arrayOf<String>()
+
+        @Option(
+            names = ["--exclusive"],
+            description = ["Only installs the patches you include, not including any patch by default"]
+        )
+        var exclusive = false
+
+        @Option(names = ["-i", "--include"], description = ["Include patches"])
+        var includedPatches = arrayOf<String>()
+
+        @Option(names = ["--experimental"], description = ["Disable patch version compatibility patch"])
+        var experimental: Boolean = false
+
+        @Option(names = ["-m", "--merge"], description = ["One or more dex file containers to merge"])
+        var mergeFiles = listOf<File>()
+
+        @Option(names = ["--mount"], description = ["If specified, instead of installing, mount"])
+        var mount: Boolean = false
+
+        @Option(names = ["--cn"], description = ["Overwrite the default CN for the signed file"])
+        var cn = "ReVanced"
+
+        @Option(names = ["--keystore"], description = ["File path to your keystore"])
+        var keystorePath: String? = null
+
+        @Option(names = ["-p", "--password"], description = ["Overwrite the default password for the signed file"])
+        var password = "ReVanced"
+
+        @Option(names = ["-t", "--temp-dir"], description = ["Temporary resource cache directory"])
+        var cacheDirectory = "revanced-cache"
+
+        @Option(
+            names = ["-c", "--clean"],
+            description = ["Clean the temporary resource cache directory. This will be done anyways when running the patcher"]
+        )
+        var clean: Boolean = false
+
+        @Option(names = ["--custom-aapt2-binary"], description = ["Path to custom aapt2 binary"])
+        var aaptPath: String = ""
+    }
+
+    override fun run() {
+        if (args.patchArgs?.listingArgs?.listOnly == true) return printListOfPatches()
+        if (args.uninstall) return uninstall()
+
+        val pArgs = this.args.patchArgs?.patchingArgs ?: return
+        val outputFile = File(pArgs.outputPath) // the file to write to
+
+        val allPatches = args.patchArgs!!.patchBundles.flatMap { bundle ->
+            PatchBundle.Jar(bundle).loadPatches()
+        }
+
+        args.patchArgs!!.optionsFile.let {
+            if (it.exists()) allPatches.setOptions(it, logger)
+            else Options.serialize(allPatches, prettyPrint = true).let(it::writeText)
+        }
+
+        val patcher = app.revanced.patcher.Patcher(
+            PatcherOptions(
+                args.inputFile.also { if (!it.exists()) return logger.error("Input file ${args.inputFile} does not exist.") },
+                pArgs.cacheDirectory,
+                pArgs.aaptPath,
+                pArgs.cacheDirectory,
+                PatcherLogger
+            )
+        )
+
+        // prepare adb
+        val adb: Adb? = args.deploy?.let {
+            Adb(outputFile, patcher.context.packageMetadata.packageName, args.deploy!!, !pArgs.mount)
+        }
+
+        // start the patcher
+        val result = Patcher.start(patcher, allPatches)
+
+        val cacheDirectory = File(pArgs.cacheDirectory)
+
+        // align the file
+        val alignedFile = cacheDirectory.resolve("${outputFile.nameWithoutExtension}_aligned.apk")
+        Aligning.align(result, args.inputFile, alignedFile)
+
+        // sign the file
+        val finalFile = if (!pArgs.mount) {
+            val signedOutput = cacheDirectory.resolve("${outputFile.nameWithoutExtension}_signed.apk")
+            Signing.sign(
+                alignedFile,
+                signedOutput,
+                SigningOptions(
+                    pArgs.cn,
+                    pArgs.password,
+                    pArgs.keystorePath ?: outputFile.absoluteFile.parentFile
+                        .resolve("${outputFile.nameWithoutExtension}.keystore")
+                        .canonicalPath
+                )
+            )
+
+            signedOutput
+        } else
+            alignedFile
+
+        // finally copy to the specified output file
+        logger.info("Copying ${finalFile.name} to ${outputFile.name}")
+        finalFile.copyTo(outputFile, overwrite = true)
+
+        // clean up the cache directory if needed
+        if (pArgs.clean)
+            cleanUp(pArgs.cacheDirectory)
+
+        // deploy if specified
+        adb?.deploy()
+
+        if (pArgs.clean && args.deploy != null) Files.delete(outputFile.toPath())
+
+        logger.info("Finished")
+    }
+
+    private fun cleanUp(cacheDirectory: String) {
+        val result = if (File(cacheDirectory).deleteRecursively())
+            "Cleaned up cache directory"
+        else
+            "Failed to clean up cache directory"
+        logger.info(result)
+    }
+
+    private fun uninstall() {
+        val adb: Adb? = args.deploy?.let {
+            Adb(
+                File("placeholder_file"),
+                app.revanced.patcher.Patcher(PatcherOptions(args.inputFile, "")).context.packageMetadata.packageName,
+                args.deploy!!,
+                false
+            )
+        }
+        adb?.uninstall()
+    }
+
+    private fun printListOfPatches() {
+        val logged = mutableListOf<String>()
+        for (patchBundlePath in args.patchArgs?.patchBundles!!) for (patch in PatchBundle.Jar(patchBundlePath)
+            .loadPatches()) {
+            if (patch.patchName in logged) continue
+            for (compatiblePackage in patch.compatiblePackages ?: continue) {
+                val packageEntryStr = buildString {
+                    // Add package if flag is set
+                    if (args.patchArgs?.listingArgs?.withPackages == true) {
+                        val packageName = compatiblePackage.name.substringAfterLast(".").padStart(10)
+                        append(packageName)
+                        append("\t")
+                    }
+
+                    // Add patch name
+                    val patchName = patch.patchName.lowercase().replace("-", " ").padStart(25)
+                    append(patchName)
+
+                    // Add description if flag is set.
+                    append("\t")
+                    append(patch.description)
+
+                    // Add compatible versions, if flag is set
+                    if (args.patchArgs?.listingArgs?.withVersions == true) {
+                        val compatibleVersions = compatiblePackage.versions.joinToString(separator = ", ")
+                        append("\t")
+                        append(compatibleVersions)
+                    }
+                }
+
+                logged.add(patch.patchName)
+                logger.info(packageEntryStr)
+            }
+        }
+    }
+}

src/main/kotlin/app/revanced/cli/command/OptionsCommand.kt

@@ -1,50 +0,0 @@
-package app.revanced.cli.command
-
-import app.revanced.patcher.PatchBundleLoader
-import app.revanced.utils.Options
-import app.revanced.utils.Options.setOptions
-import picocli.CommandLine
-import picocli.CommandLine.Help.Visibility.ALWAYS
-import java.io.File
-
-@CommandLine.Command(
-    name = "options",
-    description = ["Generate options file from patches"],
-)
-internal object OptionsCommand : Runnable {
-    @CommandLine.Parameters(
-        description = ["Paths to patch bundles"],
-        arity = "1..*"
-    )
-    lateinit var patchBundles: Array<File>
-
-    @CommandLine.Option(
-        names = ["-p", "--path"],
-        description = ["Path to patch options JSON file"],
-        showDefaultValue = ALWAYS
-    )
-    var path: File = File("options.json")
-
-    @CommandLine.Option(
-        names = ["-o", "--overwrite"],
-        description = ["Overwrite existing options file"],
-        showDefaultValue = ALWAYS
-    )
-    var overwrite: Boolean = false
-
-    @CommandLine.Option(
-        names = ["-u", "--update"],
-        description = ["Update existing options by adding missing and removing non-existent options"],
-        showDefaultValue = ALWAYS
-    )
-    var update: Boolean = false
-
-    override fun run() = if (!path.exists() || overwrite)
-        with(PatchBundleLoader.Jar(*patchBundles)) {
-            if (update) setOptions(path, logger)
-
-            Options.serialize(this, prettyPrint = true)
-                .let(path::writeText)
-        }
-    else logger.error("Options file already exists, use --override to override it")
-}

src/main/kotlin/app/revanced/cli/command/PatchCommand.kt

@@ -1,412 +0,0 @@
-package app.revanced.cli.command
-
-import app.revanced.cli.patcher.logging.impl.PatcherLogger
-import app.revanced.patcher.PatchBundleLoader
-import app.revanced.patcher.Patcher
-import app.revanced.patcher.PatcherOptions
-import app.revanced.patcher.PatcherResult
-import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
-import app.revanced.patcher.extensions.PatchExtensions.include
-import app.revanced.patcher.extensions.PatchExtensions.patchName
-import app.revanced.utils.Options
-import app.revanced.utils.Options.setOptions
-import app.revanced.utils.adb.AdbManager
-import app.revanced.utils.align.ZipAligner
-import app.revanced.utils.align.zip.ZipFile
-import app.revanced.utils.align.zip.structures.ZipEntry
-import app.revanced.utils.signing.ApkSigner
-import app.revanced.utils.signing.SigningOptions
-import kotlinx.coroutines.runBlocking
-import picocli.CommandLine
-import picocli.CommandLine.Help.Visibility.ALWAYS
-import java.io.File
-
-
-@CommandLine.Command(
-    name = "patch",
-    description = ["Patch the supplied APK file with the supplied patches and integrations"]
-)
-internal object PatchCommand: Runnable {
-    @CommandLine.Parameters(
-        description = ["APK file to be patched"],
-        arity = "1..1"
-    )
-    lateinit var apk: File
-
-    @CommandLine.Option(
-        names = ["-b", "--patch-bundle"],
-        description = ["One or more bundles of patches"],
-        required = true
-    )
-    var patchBundles = emptyList<File>()
-
-    @CommandLine.Option(
-        names = ["-m", "--merge"],
-        description = ["One or more DEX files or containers to merge into the APK"]
-    )
-    var integrations = listOf<File>()
-
-    @CommandLine.Option(
-        names = ["-i", "--include"],
-        description = ["List of patches to include"]
-    )
-    var includedPatches = arrayOf<String>()
-
-    @CommandLine.Option(
-        names = ["-e", "--exclude"],
-        description = ["List of patches to exclude"]
-    )
-    var excludedPatches = arrayOf<String>()
-
-    @CommandLine.Option(
-        names = ["--options"],
-        description = ["Path to patch options JSON file"],
-        showDefaultValue = ALWAYS
-    )
-    var optionsFile: File = File("options.json")
-
-    @CommandLine.Option(
-        names = ["--exclusive"],
-        description = ["Only include patches that are explicitly specified to be included"],
-        showDefaultValue = ALWAYS
-    )
-    var exclusive = false
-
-    @CommandLine.Option(
-        names = ["--experimental"],
-        description = ["Ignore patches incompatibility to versions"],
-        showDefaultValue = ALWAYS
-    )
-    var experimental: Boolean = false
-
-    @CommandLine.Option(
-        names = ["-o", "--out"],
-        description = ["Path to save the patched APK file to"],
-        required = true
-    )
-    lateinit var outputFilePath: File
-
-    @CommandLine.Option(
-        names = ["-d", "--device-serial"],
-        description = ["ADB device serial to install to"],
-        showDefaultValue = ALWAYS
-    )
-    var deviceSerial: String? = null
-
-    @CommandLine.Option(
-        names = ["--mount"],
-        description = ["Install by mounting the patched package"],
-        showDefaultValue = ALWAYS
-    )
-    var mount: Boolean = false
-
-    @CommandLine.Option(
-        names = ["--common-name"],
-        description = ["The common name of the signer of the patched APK file"],
-        showDefaultValue = ALWAYS
-
-    )
-    var commonName = "ReVanced"
-
-    @CommandLine.Option(
-        names = ["--keystore"],
-        description = ["Path to the keystore to sign the patched APK file with"]
-    )
-    var keystorePath: String? = null
-
-    @CommandLine.Option(
-        names = ["--password"],
-        description = ["The password of the keystore to sign the patched APK file with"]
-    )
-    var password = "ReVanced"
-
-    @CommandLine.Option(
-        names = ["-r", "--resource-cache"],
-        description = ["Path to temporary resource cache directory"],
-        showDefaultValue = ALWAYS
-    )
-    var resourceCachePath = File("revanced-resource-cache")
-
-    @CommandLine.Option(
-        names = ["--custom-aapt2-binary"],
-        description = ["Path to a custom AAPT binary to compile resources with"]
-    )
-    var aaptBinaryPath = File("")
-
-    @CommandLine.Option(
-        names = ["-p", "--purge"],
-        description = ["Purge the temporary resource cache directory after patching"],
-        showDefaultValue = ALWAYS
-    )
-    var purge: Boolean = false
-
-    override fun run() {
-        // region Prepare
-
-        if (!apk.exists()) {
-            logger.error("Input file ${apk.name} does not exist")
-            return
-        }
-
-        val adbManager = deviceSerial?.let { serial ->
-            if (mount) AdbManager.RootAdbManager(serial, logger) else AdbManager.UserAdbManager(
-                serial,
-                logger
-            )
-        }
-
-        // endregion
-
-        // region Load patches
-
-        logger.info("Loading patches")
-
-        val patches = PatchBundleLoader.Jar(*patchBundles.toTypedArray())
-        val integrations = integrations
-
-        logger.info("Setting patch options")
-
-        optionsFile.let {
-            if (it.exists()) patches.setOptions(it, logger)
-            else Options.serialize(patches, prettyPrint = true).let(it::writeText)
-        }
-
-        // endregion
-
-        // region Patch
-
-        val patcher = Patcher(
-            PatcherOptions(
-                apk,
-                resourceCachePath,
-                aaptBinaryPath.path,
-                resourceCachePath.absolutePath,
-                PatcherLogger
-            )
-        )
-
-        val result = patcher.apply {
-            acceptIntegrations(integrations)
-            acceptPatches(filterPatchSelection(patches))
-
-            // Execute patches.
-            runBlocking {
-                apply(false).collect { patchResult ->
-                    patchResult.exception?.let {
-                        logger.error("${patchResult.patchName} failed:\n${patchResult.exception}")
-                    } ?: logger.info("${patchResult.patchName} succeeded")
-                }
-            }
-        }.get()
-
-        patcher.close()
-
-        // endregion
-
-        // region Finish
-
-        val alignAndSignedFile = sign(
-            apk.newAlignedFile(
-                result,
-                resourceCachePath.resolve("${outputFilePath.nameWithoutExtension}_aligned.apk")
-            )
-        )
-
-        logger.info("Copying to ${outputFilePath.name}")
-        alignAndSignedFile.copyTo(outputFilePath, overwrite = true)
-
-        adbManager?.install(AdbManager.Apk(outputFilePath, patcher.context.packageMetadata.packageName))
-
-        if (purge) {
-            logger.info("Purging temporary files")
-            outputFilePath.delete()
-            purge(resourceCachePath)
-        }
-
-        // endregion
-    }
-
-
-    /**
-     * Filter the patches to be added to the patcher. The filter is based on the following:
-     * - [includedPatches] (explicitly included)
-     * - [excludedPatches] (explicitly excluded)
-     * - [exclusive] (only include patches that are explicitly included)
-     * - [experimental] (ignore patches incompatibility to versions)
-     * - package name and version of the input APK file (if [experimental] is false)
-     *
-     * @param patches The patches to filter.
-     * @return The filtered patches.
-     */
-    private fun Patcher.filterPatchSelection(patches: PatchList) = buildList {
-        val packageName = context.packageMetadata.packageName
-        val packageVersion = context.packageMetadata.packageVersion
-
-        patches.forEach patch@{ patch ->
-            val formattedPatchName = patch.patchName.lowercase().replace(" ", "-")
-
-            /**
-             * Check if the patch is explicitly excluded.
-             *
-             * Cases:
-             *  1. -e patch.name
-             *  2. -i patch.name -e patch.name
-             */
-
-            /**
-             * Check if the patch is explicitly excluded.
-             *
-             * Cases:
-             *  1. -e patch.name
-             *  2. -i patch.name -e patch.name
-             */
-
-            val excluded = excludedPatches.contains(formattedPatchName)
-            if (excluded) return@patch logger.info("Excluding ${patch.patchName}")
-
-            /**
-             * Check if the patch is constrained to packages.
-             */
-
-            /**
-             * Check if the patch is constrained to packages.
-             */
-
-            patch.compatiblePackages?.let { packages ->
-                packages.singleOrNull { it.name == packageName }?.let { `package` ->
-                    /**
-                     * Check if the package version matches.
-                     * If experimental is true, version matching will be skipped.
-                     */
-
-                    /**
-                     * Check if the package version matches.
-                     * If experimental is true, version matching will be skipped.
-                     */
-
-                    val matchesVersion = experimental || `package`.versions.let {
-                        it.isEmpty() || it.any { version -> version == packageVersion }
-                    }
-
-                    if (!matchesVersion) return@patch logger.warn(
-                        "${patch.patchName} is incompatible with version $packageVersion. " +
-                                "This patch is only compatible with version " +
-                                packages.joinToString(";") { pkg ->
-                                    "${pkg.name}: ${pkg.versions.joinToString(", ")}"
-                                }
-                    )
-
-                } ?: return@patch logger.trace(
-                    "${patch.patchName} is incompatible with $packageName. " +
-                            "This patch is only compatible with " +
-                            packages.joinToString(", ") { `package` -> `package`.name }
-                )
-
-                return@let
-            } ?: logger.trace("$formattedPatchName: No constraint on packages.")
-
-            /**
-             * Check if the patch is explicitly included.
-             *
-             * Cases:
-             *  1. --exclusive
-             *  2. --exclusive -i patch.name
-             */
-
-            /**
-             * Check if the patch is explicitly included.
-             *
-             * Cases:
-             *  1. --exclusive
-             *  2. --exclusive -i patch.name
-             */
-
-            val explicitlyIncluded = includedPatches.contains(formattedPatchName)
-
-            val implicitlyIncluded = !exclusive && patch.include // Case 3.
-            val exclusivelyIncluded = exclusive && explicitlyIncluded // Case 2.
-
-            val included = implicitlyIncluded || exclusivelyIncluded
-            if (!included) return@patch logger.info("${patch.patchName} excluded by default") // Case 1.
-
-            logger.trace("Adding $formattedPatchName")
-
-            add(patch)
-        }
-    }
-
-    /**
-     * Create a new aligned APK file.
-     *
-     * @param result The result of the patching process.
-     * @param outputFile The file to save the aligned APK to.
-     */
-    private fun File.newAlignedFile(
-        result: PatcherResult,
-        outputFile: File
-    ): File {
-        logger.info("Aligning $name")
-
-        if (outputFile.exists()) outputFile.delete()
-
-        ZipFile(outputFile).use { file ->
-            result.dexFiles.forEach {
-                file.addEntryCompressData(
-                    ZipEntry.createWithName(it.name),
-                    it.stream.readBytes()
-                )
-            }
-
-            result.resourceFile?.let {
-                file.copyEntriesFromFileAligned(
-                    ZipFile(it),
-                    ZipAligner::getEntryAlignment
-                )
-            }
-
-            // TODO: Do not compress result.doNotCompress
-
-            file.copyEntriesFromFileAligned(
-                ZipFile(this),
-                ZipAligner::getEntryAlignment
-            )
-        }
-
-        return outputFile
-    }
-
-    /**
-     * Sign the APK file.
-     *
-     * @param inputFile The APK file to sign.
-     * @return The signed APK file. If [mount] is true, the input file will be returned.
-     */
-    private fun sign(inputFile: File) = if (mount)
-        inputFile
-    else {
-        logger.info("Signing ${inputFile.name}")
-
-        val keyStoreFilePath = keystorePath ?: outputFilePath
-            .absoluteFile.parentFile.resolve("${outputFilePath.nameWithoutExtension}.keystore").canonicalPath
-
-        val options = SigningOptions(
-            commonName,
-            password,
-            keyStoreFilePath
-        )
-
-        ApkSigner(options)
-            .signApk(
-                inputFile,
-                resourceCachePath.resolve("${outputFilePath.nameWithoutExtension}_signed.apk")
-            )
-    }
-
-    private fun purge(resourceCachePath: File) {
-        val result = if (resourceCachePath.deleteRecursively())
-            "Purged resource cache directory"
-        else
-            "Failed to purge resource cache directory"
-        logger.info(result)
-    }
-}

src/main/kotlin/app/revanced/cli/command/UninstallCommand.kt

@@ -1,44 +0,0 @@
-package app.revanced.cli.command
-
-import app.revanced.utils.adb.AdbManager
-import picocli.CommandLine.*
-import picocli.CommandLine.Help.Visibility.ALWAYS
-
-
-@Command(
-    name = "uninstall",
-    description = ["Uninstall a patched APK file from the devices with the supplied ADB device serials"]
-)
-internal object UninstallCommand : Runnable {
-    @Parameters(
-        description = ["ADB device serials"],
-        arity = "1..*"
-    )
-    lateinit var deviceSerials: Array<String>
-
-    @Option(
-        names = ["-p", "--package-name"],
-        description = ["Package name to uninstall"],
-        required = true
-    )
-    lateinit var packageName: String
-
-    @Option(
-        names = ["-u", "--unmount"],
-        description = ["Uninstall by unmounting the patched package"],
-        showDefaultValue = ALWAYS
-    )
-    var unmount: Boolean = false
-
-    override fun run() = try {
-        deviceSerials.forEach {deviceSerial ->
-            if (unmount) {
-                AdbManager.RootAdbManager(deviceSerial, logger)
-            } else {
-                AdbManager.UserAdbManager(deviceSerial, logger)
-            }.uninstall(packageName)
-        }
-    } catch (e: AdbManager.DeviceNotFoundException) {
-        logger.error(e.toString())
-    }
-}

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

@@ -0,0 +1,8 @@
+package app.revanced.cli.main
+
+import app.revanced.cli.command.MainCommand
+import picocli.CommandLine
+
+internal fun main(args: Array<String>) {
+    CommandLine(MainCommand).execute(*args)
+}

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

@@ -0,0 +1,23 @@
+package app.revanced.cli.patcher
+
+import app.revanced.cli.command.PatchList
+import app.revanced.patcher.PatcherResult
+import app.revanced.utils.patcher.addPatchesFiltered
+import app.revanced.utils.patcher.applyPatchesVerbose
+import app.revanced.utils.patcher.mergeFiles
+
+internal object Patcher {
+    internal fun start(
+        patcher: app.revanced.patcher.Patcher,
+        allPatches: PatchList
+    ): PatcherResult {
+        // merge files like necessary integrations
+        patcher.mergeFiles()
+        // add patches, but filter incompatible or excluded patches
+        patcher.addPatchesFiltered(allPatches)
+        // apply patches
+        patcher.applyPatchesVerbose()
+
+        return patcher.save()
+    }
+}

src/main/kotlin/app/revanced/cli/signing/Signing.kt

@@ -0,0 +1,12 @@
+package app.revanced.cli.signing
+
+import app.revanced.cli.command.MainCommand.logger
+import app.revanced.utils.signing.Signer
+import java.io.File
+
+object Signing {
+    fun sign(alignedFile: File, signedOutput: File, signingOptions: SigningOptions) {
+        logger.info("Signing ${alignedFile.name} to ${signedOutput.name}")
+        Signer(signingOptions).signApk(alignedFile, signedOutput)
+    }
+}

src/main/kotlin/app/revanced/cli/signing/SigningOptions.kt

@@ -1,4 +1,4 @@
-package app.revanced.utils.signing
+package app.revanced.cli.signing
 
 data class SigningOptions(
     val cn: String,

src/main/kotlin/app/revanced/utils/adb/Adb.kt

@@ -0,0 +1,113 @@
+package app.revanced.utils.adb
+
+import app.revanced.cli.command.MainCommand.logger
+import se.vidstige.jadb.JadbConnection
+import se.vidstige.jadb.JadbDevice
+import se.vidstige.jadb.managers.PackageManager
+import java.io.File
+import java.util.concurrent.Executors
+
+internal class Adb(
+    private val file: File,
+    private val packageName: String,
+    deviceName: String,
+    private val modeInstall: Boolean = false,
+    private val logging: Boolean = true
+) {
+    private val device: JadbDevice
+
+    init {
+        device = JadbConnection().devices.let { device -> device.find { it.serial == deviceName } ?: device.first() }
+            ?: throw IllegalArgumentException("No such device with name $deviceName")
+
+        if (!modeInstall && device.run("su -h", false) != 0)
+            throw IllegalArgumentException("Root required on $deviceName. Task failed")
+    }
+
+    private fun String.replacePlaceholder(with: String? = null): String {
+        return this.replace(Constants.PLACEHOLDER, with ?: packageName)
+    }
+
+    internal fun deploy() {
+        if (modeInstall) {
+            logger.info("Installing without mounting")
+
+            PackageManager(device).install(file)
+        } else {
+            logger.info("Installing by mounting")
+
+            // push patched file
+            device.copy(Constants.PATH_INIT_PUSH, file)
+
+            // create revanced folder path
+            device.run("${Constants.COMMAND_CREATE_DIR} ${Constants.PATH_REVANCED}")
+
+            // prepare mounting the apk
+            device.run(Constants.COMMAND_PREPARE_MOUNT_APK.replacePlaceholder())
+
+            // push mount script
+            device.createFile(
+                Constants.PATH_INIT_PUSH,
+                Constants.CONTENT_MOUNT_SCRIPT.replacePlaceholder()
+            )
+            // install mount script
+            device.run(Constants.COMMAND_INSTALL_MOUNT.replacePlaceholder())
+
+            // unmount the apk for sanity
+            device.run(Constants.COMMAND_UMOUNT.replacePlaceholder())
+            // mount the apk
+            device.run(Constants.PATH_MOUNT.replacePlaceholder())
+
+            // relaunch app
+            device.run(Constants.COMMAND_RESTART.replacePlaceholder())
+
+            // log the app
+            log()
+        }
+    }
+
+    internal fun uninstall() {
+        logger.info("Uninstalling by unmounting")
+
+        // unmount the apk
+        device.run(Constants.COMMAND_UMOUNT.replacePlaceholder())
+
+        // delete revanced app
+        device.run(Constants.COMMAND_DELETE.replacePlaceholder(Constants.PATH_REVANCED_APP).replacePlaceholder())
+
+        // delete mount script
+        device.run(Constants.COMMAND_DELETE.replacePlaceholder(Constants.PATH_MOUNT).replacePlaceholder())
+
+        logger.info("Finished uninstalling")
+    }
+
+    private fun log() {
+        val executor = Executors.newSingleThreadExecutor()
+        val pipe = if (logging) {
+            ProcessBuilder.Redirect.INHERIT
+        } else {
+            ProcessBuilder.Redirect.PIPE
+        }
+
+        val process = device.buildCommand(Constants.COMMAND_LOGCAT.replacePlaceholder())
+            .redirectOutput(pipe)
+            .redirectError(pipe)
+            .useExecutor(executor)
+            .start()
+
+        Thread.sleep(500) // give the app some time to start up.
+        while (true) {
+            try {
+                while (device.run("${Constants.COMMAND_PID_OF} $packageName") == 0) {
+                    Thread.sleep(1000)
+                }
+                break
+            } catch (e: Exception) {
+                throw RuntimeException("An error occurred while monitoring the state of app", e)
+            }
+        }
+        logger.info("Stopped logging because the app was closed")
+        process.destroy()
+        executor.shutdown()
+    }
+}

src/main/kotlin/app/revanced/utils/adb/AdbManager.kt

@@ -1,135 +0,0 @@
-package app.revanced.utils.adb
-
-import app.revanced.cli.logging.CliLogger
-import app.revanced.utils.adb.AdbManager.Apk
-import app.revanced.utils.adb.Constants.COMMAND_CREATE_DIR
-import app.revanced.utils.adb.Constants.COMMAND_DELETE
-import app.revanced.utils.adb.Constants.COMMAND_INSTALL_MOUNT
-import app.revanced.utils.adb.Constants.COMMAND_PREPARE_MOUNT_APK
-import app.revanced.utils.adb.Constants.COMMAND_RESTART
-import app.revanced.utils.adb.Constants.COMMAND_UMOUNT
-import app.revanced.utils.adb.Constants.CONTENT_MOUNT_SCRIPT
-import app.revanced.utils.adb.Constants.PATH_INIT_PUSH
-import app.revanced.utils.adb.Constants.PATH_INSTALLATION
-import app.revanced.utils.adb.Constants.PATH_MOUNT
-import app.revanced.utils.adb.Constants.PATH_PATCHED_APK
-import app.revanced.utils.adb.Constants.PLACEHOLDER
-import se.vidstige.jadb.JadbConnection
-import se.vidstige.jadb.managers.Package
-import se.vidstige.jadb.managers.PackageManager
-import java.io.Closeable
-import java.io.File
-
-/**
- * Adb manager. Used to install and uninstall [Apk] files.
- *
- * @param deviceSerial The serial of the device.
- */
-internal sealed class AdbManager(deviceSerial: String? = null, protected val logger: CliLogger? = null) : Closeable {
-    protected val device = JadbConnection().devices.find { device -> device.serial == deviceSerial }
-        ?: throw DeviceNotFoundException(deviceSerial)
-
-    init {
-        logger?.trace("Established connection to $deviceSerial")
-    }
-
-    /**
-     * Installs the [Apk] file.
-     *
-     * @param apk The [Apk] file.
-     */
-    open fun install(apk: Apk) {
-        logger?.info("Finished installing ${apk.file.name}")
-    }
-
-    /**
-     * Uninstalls the package.
-     *
-     * @param packageName The package name.
-     */
-    open fun uninstall(packageName: String) {
-        logger?.info("Finished uninstalling $packageName")
-    }
-
-    /**
-     * Closes the [AdbManager] instance.
-     */
-    override fun close() {
-        logger?.trace("Closed")
-    }
-
-    class RootAdbManager(deviceSerial: String, logger: CliLogger? = null) : AdbManager(deviceSerial, logger) {
-        init {
-            if (!device.hasSu()) throw IllegalArgumentException("Root required on $deviceSerial. Task failed")
-        }
-
-        override fun install(apk: Apk) {
-            logger?.info("Installing by mounting")
-
-            val applyReplacement = getPlaceholderReplacement(
-                apk.packageName ?: throw IllegalArgumentException("Package name is required")
-            )
-
-            device.copyFile(apk.file, PATH_INIT_PUSH)
-
-            device.run("$COMMAND_CREATE_DIR $PATH_INSTALLATION")
-            device.run(COMMAND_PREPARE_MOUNT_APK.applyReplacement())
-
-            device.createFile(PATH_INIT_PUSH, CONTENT_MOUNT_SCRIPT.applyReplacement())
-
-            device.run(COMMAND_INSTALL_MOUNT.applyReplacement())
-            device.run(COMMAND_UMOUNT.applyReplacement()) // Sanity check.
-            device.run(PATH_MOUNT.applyReplacement())
-            device.run(COMMAND_RESTART.applyReplacement())
-
-            super.install(apk)
-        }
-
-        override fun uninstall(packageName: String) {
-            logger?.info("Uninstalling $packageName by unmounting and deleting the package")
-
-            val applyReplacement = getPlaceholderReplacement(packageName)
-
-            device.run(COMMAND_UMOUNT.applyReplacement(packageName))
-            device.run(COMMAND_DELETE.applyReplacement(PATH_PATCHED_APK).applyReplacement())
-            device.run(COMMAND_DELETE.applyReplacement(PATH_MOUNT).applyReplacement())
-
-            super.uninstall(packageName)
-        }
-
-        companion object Utils {
-            private fun getPlaceholderReplacement(with: String): String.() -> String = { replace(PLACEHOLDER, with) }
-            private fun String.applyReplacement(with: String) = replace(PLACEHOLDER, with)
-        }
-    }
-
-    class UserAdbManager(deviceSerial: String, logger: CliLogger? = null) : AdbManager(deviceSerial, logger) {
-        private val packageManager = PackageManager(device)
-
-        override fun install(apk: Apk) {
-            PackageManager(device).install(apk.file)
-
-            super.install(apk)
-        }
-
-        override fun uninstall(packageName: String) {
-            logger?.info("Uninstalling $packageName")
-
-            packageManager.uninstall(Package(packageName))
-
-            super.uninstall(packageName)
-        }
-    }
-
-    /**
-     * Apk file for [AdbManager].
-     *
-     * @param file The [Apk] file.
-     */
-    internal class Apk(val file: File, val packageName: String? = null)
-
-    internal class DeviceNotFoundException(deviceSerial: String?) :
-        Exception(deviceSerial?.let {
-            "The device with the ADB device serial \"$deviceSerial\" can not be found"
-        } ?: "No ADB device found")
-}

src/main/kotlin/app/revanced/utils/adb/Commands.kt

@@ -2,28 +2,28 @@ package app.revanced.utils.adb
 
 import se.vidstige.jadb.JadbDevice
 import se.vidstige.jadb.RemoteFile
+import se.vidstige.jadb.ShellProcessBuilder
 import java.io.File
-import java.util.concurrent.Callable
-import java.util.concurrent.Executors
 
-// return the input or output stream, depending on which first returns a value
+internal fun JadbDevice.buildCommand(command: String, su: Boolean = true): ShellProcessBuilder {
-internal fun JadbDevice.run(command: String, su: Boolean = false) = with(this.startCommand(command, su)) {
+    if (su) {
-    Executors.newFixedThreadPool(2).let { service ->
+        return shellProcessBuilder("su -c \'$command\'")
-        arrayOf(inputStream, errorStream).map { stream ->
-            Callable { stream.bufferedReader().use { it.readLine() } }
-        }.let { tasks -> service.invokeAny(tasks).also { service.shutdown() } }
-    }
     }
 
-internal fun JadbDevice.hasSu() =
+    val args = command.split(" ") as ArrayList<String>
-    this.startCommand("su -h", false).waitFor() == 0
+    val cmd = args.removeFirst()
 
-internal fun JadbDevice.copyFile(file: File, targetFile: String) =
+    return shellProcessBuilder(cmd, *args.toTypedArray())
-    push(file, RemoteFile(targetFile))
+}
 
-internal fun JadbDevice.createFile(targetFile: String, content: String) =
+internal fun JadbDevice.run(command: String, su: Boolean = true): Int {
+    return this.buildCommand(command, su).start().waitFor()
+}
+
+internal fun JadbDevice.copy(targetPath: String, file: File) {
+    push(file, RemoteFile(targetPath))
+}
+
+internal fun JadbDevice.createFile(targetFile: String, content: String) {
     push(content.byteInputStream(), System.currentTimeMillis(), 644, RemoteFile(targetFile))
-
+}
-
-private fun JadbDevice.startCommand(command: String, su: Boolean) =
-    shellProcessBuilder(if (su) "su -c '$command'" else command).start()

src/main/kotlin/app/revanced/utils/adb/Constants.kt

@@ -1,40 +1,57 @@
 package app.revanced.utils.adb
 
 internal object Constants {
+    // template placeholder to replace a string in commands
     internal const val PLACEHOLDER = "TEMPLATE_PACKAGE_NAME"
 
-    internal const val PATH_INIT_PUSH = "/data/local/tmp/revanced.delete"
+    // utility commands
-    internal const val PATH_INSTALLATION = "/data/adb/revanced/"
+    private const val COMMAND_CHMOD_MOUNT = "chmod +x"
-    internal const val PATH_PATCHED_APK = "$PATH_INSTALLATION$PLACEHOLDER.apk"
+    internal const val COMMAND_PID_OF = "pidof -s"
-    internal const val PATH_MOUNT = "/data/adb/service.d/mount_revanced_$PLACEHOLDER.sh"
-
-    internal const val COMMAND_DELETE = "rm -rf $PLACEHOLDER"
     internal const val COMMAND_CREATE_DIR = "mkdir -p"
-    internal const val COMMAND_RESTART = "pm resolve-activity --brief $PLACEHOLDER | tail -n 1 | " +
+    internal const val COMMAND_LOGCAT = "logcat -c && logcat | grep AndroidRuntime"
-            "xargs am start -n && kill ${'$'}(pidof -s $PLACEHOLDER)"
+    internal const val COMMAND_RESTART = "pm resolve-activity --brief $PLACEHOLDER | tail -n 1 | xargs am start -n && kill ${'$'}($COMMAND_PID_OF $PLACEHOLDER)"
 
-    internal const val COMMAND_PREPARE_MOUNT_APK = "base_path=\"$PATH_PATCHED_APK\" && " +
+    // default mount file name
-            "mv $PATH_INIT_PUSH ${'$'}base_path && " +
+    private const val NAME_MOUNT_SCRIPT = "mount_revanced_$PLACEHOLDER.sh"
-            "chmod 644 ${'$'}base_path && " +
-            "chown system:system ${'$'}base_path && " +
-            "chcon u:object_r:apk_data_file:s0  ${'$'}base_path"
 
+    // initial directory to push files to via adb push
+    internal const val PATH_INIT_PUSH = "/data/local/tmp/revanced.delete"
+
+    // revanced path
+    internal const val PATH_REVANCED = "/data/adb/revanced/"
+
+    // revanced apk path
+    internal const val PATH_REVANCED_APP = "$PATH_REVANCED$PLACEHOLDER.apk"
+
+    // delete command
+    internal const val COMMAND_DELETE = "rm -rf $PLACEHOLDER"
+
+    // mount script path
+    internal const val PATH_MOUNT = "/data/adb/service.d/$NAME_MOUNT_SCRIPT"
+
+    // move to revanced apk path & set permissions
+    internal const val COMMAND_PREPARE_MOUNT_APK =
+        "base_path=\"$PATH_REVANCED_APP\" && mv $PATH_INIT_PUSH ${'$'}base_path && chmod 644 ${'$'}base_path && chown system:system ${'$'}base_path && chcon u:object_r:apk_data_file:s0  ${'$'}base_path"
+
+    // unmount command
     internal const val COMMAND_UMOUNT =
         "grep $PLACEHOLDER /proc/mounts | while read -r line; do echo ${'$'}line | cut -d \" \" -f 2 | sed 's/apk.*/apk/' | xargs -r umount -l; done"
 
-    internal const val COMMAND_INSTALL_MOUNT = "mv $PATH_INIT_PUSH $PATH_MOUNT && chmod +x $PATH_MOUNT"
+    // install mount script & set permissions
+    internal const val COMMAND_INSTALL_MOUNT = "mv $PATH_INIT_PUSH $PATH_MOUNT && $COMMAND_CHMOD_MOUNT $PATH_MOUNT"
 
-    internal const val CONTENT_MOUNT_SCRIPT =
+    // mount script
+    internal val CONTENT_MOUNT_SCRIPT =
         """
             #!/system/bin/sh
             MAGISKTMP="${'$'}(magisk --path)" || MAGISKTMP=/sbin
             MIRROR="${'$'}MAGISKTMP/.magisk/mirror"
             while [ "${'$'}(getprop sys.boot_completed | tr -d '\r')" != "1" ]; do sleep 1; done
             
-            base_path="$PATH_PATCHED_APK"
+            base_path="$PATH_REVANCED_APP"
             stock_path=${'$'}( pm path $PLACEHOLDER | grep base | sed 's/package://g' )
 
             chcon u:object_r:apk_data_file:s0  ${'$'}base_path
             mount -o bind ${'$'}MIRROR${'$'}base_path ${'$'}stock_path
-        """
+        """.trimIndent()
 }

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

@@ -0,0 +1,75 @@
+package app.revanced.utils.patcher
+
+import app.revanced.cli.command.MainCommand.args
+import app.revanced.cli.command.MainCommand.logger
+import app.revanced.cli.command.PatchList
+import app.revanced.patcher.Patcher
+import app.revanced.patcher.data.Context
+import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
+import app.revanced.patcher.extensions.PatchExtensions.include
+import app.revanced.patcher.extensions.PatchExtensions.patchName
+import app.revanced.patcher.patch.Patch
+
+fun Patcher.addPatchesFiltered(allPatches: PatchList) {
+    val packageName = this.context.packageMetadata.packageName
+    val packageVersion = this.context.packageMetadata.packageVersion
+
+    val includedPatches = mutableListOf<Class<out Patch<Context>>>()
+    allPatches.forEach patchLoop@{ patch ->
+        val compatiblePackages = patch.compatiblePackages
+        val patchName = patch.patchName.lowercase().replace(" ", "-")
+        val args = args.patchArgs?.patchingArgs!!
+
+        val prefix = "Skipping $patchName"
+
+        if (compatiblePackages == null) logger.trace("$patchName: No constraint on packages.")
+        else {
+            if (!compatiblePackages.any { it.name == packageName }) {
+                logger.trace("$prefix: Incompatible with $packageName. This patch is only compatible with ${
+                    compatiblePackages.joinToString(
+                        ", "
+                    ) { it.name }
+                }")
+                return@patchLoop
+            }
+
+            if (!(args.experimental || compatiblePackages.any { it.versions.isEmpty() || it.versions.any { version -> version == packageVersion } })) {
+                val compatibleWith = compatiblePackages.joinToString(";") { _package ->
+                    "${_package.name}: ${_package.versions.joinToString(", ")}"
+                }
+                logger.warn("$prefix: Incompatible with version $packageVersion. This patch is only compatible with $compatibleWith")
+                return@patchLoop
+            }
+        }
+
+        if (args.excludedPatches.contains(patchName)) {
+            logger.info("$prefix: Manually excluded")
+            return@patchLoop
+        } else if ((!patch.include || args.exclusive) && !args.includedPatches.contains(patchName)) {
+            logger.info("$prefix: Excluded by default")
+            return@patchLoop
+        }
+
+        logger.trace("Adding $patchName")
+        includedPatches.add(patch)
+    }
+
+    this.addPatches(includedPatches)
+}
+
+fun Patcher.applyPatchesVerbose() {
+    this.executePatches().forEach { (patch, result) ->
+        if (result.isSuccess) {
+            logger.info("$patch succeeded")
+            return@forEach
+        }
+        logger.error("$patch failed:")
+        result.exceptionOrNull()!!.printStackTrace()
+    }
+}
+
+fun Patcher.mergeFiles() {
+    this.addIntegrations(args.patchArgs?.patchingArgs!!.mergeFiles) { file ->
+        logger.info("Merging $file")
+    }
+}

src/main/kotlin/app/revanced/utils/signing/Signer.kt

@@ -1,6 +1,7 @@
 package app.revanced.utils.signing
 
-import app.revanced.cli.command.logger
+import app.revanced.cli.command.MainCommand.logger
+import app.revanced.cli.signing.SigningOptions
 import com.android.apksig.ApkSigner
 import org.bouncycastle.asn1.x500.X500Name
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo
@@ -17,40 +18,10 @@ import java.security.*
 import java.security.cert.X509Certificate
 import java.util.*
 
-internal class ApkSigner(
+internal class Signer(
     private val signingOptions: SigningOptions
 ) {
-    private val signer: ApkSigner.Builder
     private val passwordCharArray = signingOptions.password.toCharArray()
-
-    init {
-        Security.addProvider(BouncyCastleProvider())
-
-        val keyStore = KeyStore.getInstance("BKS", "BC")
-        val alias = keyStore.let { store ->
-            FileInputStream(File(signingOptions.keyStoreFilePath).also {
-                if (!it.exists()) {
-                    logger.info("Creating keystore at ${it.absolutePath}")
-                    newKeystore(it)
-                } else {
-                    logger.info("Using keystore at ${it.absolutePath}")
-                }
-            }).use { fis -> store.load(fis, null) }
-            store.aliases().nextElement()
-        }
-
-        with(
-            ApkSigner.SignerConfig.Builder(
-                signingOptions.cn,
-                keyStore.getKey(alias, passwordCharArray) as PrivateKey,
-                listOf(keyStore.getCertificate(alias) as X509Certificate)
-            ).build()
-        ) {
-            this@ApkSigner.signer = ApkSigner.Builder(listOf(this))
-            signer.setCreatedBy(signingOptions.cn)
-        }
-    }
-
     private fun newKeystore(out: File) {
         val (publicKey, privateKey) = createKey()
         val privateKS = KeyStore.getInstance("BKS", "BC")
@@ -79,12 +50,30 @@ internal class ApkSigner(
         return JcaX509CertificateConverter().getCertificate(builder.build(signer)) to pair.private
     }
 
-    fun signApk(input: File, output: File): File {
+    fun signApk(input: File, output: File) {
+        Security.addProvider(BouncyCastleProvider())
+
+        // TODO: keystore should be saved securely
+        val ks = File(signingOptions.keyStoreFilePath)
+        if (!ks.exists()) newKeystore(ks) else {
+            logger.info("Found existing keystore: ${ks.name}")
+        }
+
+        val keyStore = KeyStore.getInstance("BKS", "BC")
+        FileInputStream(ks).use { fis -> keyStore.load(fis, null) }
+        val alias = keyStore.aliases().nextElement()
+
+        val config = ApkSigner.SignerConfig.Builder(
+            signingOptions.cn,
+            keyStore.getKey(alias, passwordCharArray) as PrivateKey,
+            listOf(keyStore.getCertificate(alias) as X509Certificate)
+        ).build()
+
+        val signer = ApkSigner.Builder(listOf(config))
+        signer.setCreatedBy(signingOptions.cn)
         signer.setInputApk(input)
         signer.setOutputApk(output)
 
         signer.build().sign()
-
-        return output
     }
 }

src/main/kotlin/app/revanced/utils/signing/align/ZipAligner.kt

@@ -1,6 +1,6 @@
-package app.revanced.utils.align
+package app.revanced.utils.signing.align
 
-import app.revanced.utils.align.zip.structures.ZipEntry
+import app.revanced.utils.signing.align.zip.structures.ZipEntry
 
 internal object ZipAligner {
     private const val DEFAULT_ALIGNMENT = 4

src/main/kotlin/app/revanced/utils/signing/align/zip/Extensions.kt

@@ -1,4 +1,4 @@
-package app.revanced.utils.align.zip
+package app.revanced.utils.signing.align.zip
 
 import java.io.DataInput
 import java.io.DataOutput

src/main/kotlin/app/revanced/utils/signing/align/zip/ZipFile.kt

@@ -1,7 +1,7 @@
-package app.revanced.utils.align.zip
+package app.revanced.utils.signing.align.zip
 
-import app.revanced.utils.align.zip.structures.ZipEndRecord
+import app.revanced.utils.signing.align.zip.structures.ZipEndRecord
-import app.revanced.utils.align.zip.structures.ZipEntry
+import app.revanced.utils.signing.align.zip.structures.ZipEntry
 import java.io.Closeable
 import java.io.File
 import java.io.RandomAccessFile
@@ -11,15 +11,15 @@ import java.util.zip.CRC32
 import java.util.zip.Deflater
 
 class ZipFile(file: File) : Closeable {
-    private var entries: MutableList<ZipEntry> = mutableListOf()
+    var entries: MutableList<ZipEntry> = mutableListOf()
 
     private val filePointer: RandomAccessFile = RandomAccessFile(file, "rw")
-    private var centralDirectoryNeedsRewrite = false
+    private var CDNeedsRewrite = false
 
     private val compressionLevel = 5
 
     init {
-        // If file isn't empty try to load entries.
+        //if file isn't empty try to load entries
         if (file.length() > 0) {
             val endRecord = findEndRecord()
 
@@ -29,17 +29,17 @@ class ZipFile(file: File) : Closeable {
             entries = readEntries(endRecord).toMutableList()
         }
 
-        // Seek back to start for writing.
+        //seek back to start for writing
         filePointer.seek(0)
     }
 
     private fun findEndRecord(): ZipEndRecord {
-        // Look from end to start since end record is at the end.
+        //look from end to start since end record is at the end
         for (i in filePointer.length() - 1 downTo 0) {
             filePointer.seek(i)
-            // Possible beginning of signature.
+            //possible beginning of signature
             if (filePointer.readByte() == 0x50.toByte()) {
-                // Seek back to get the full int.
+                //seek back to get the full int
                 filePointer.seek(i)
                 val possibleSignature = filePointer.readUIntLE()
                 if (possibleSignature == ZipEndRecord.ECD_SIGNATURE) {
@@ -76,7 +76,7 @@ class ZipFile(file: File) : Closeable {
     }
 
     private fun writeCD() {
-        val centralDirectoryStartOffset = filePointer.channel.position().toUInt()
+        val CDStart = filePointer.channel.position().toUInt()
 
         entries.forEach {
             filePointer.channel.write(it.toCDE())
@@ -89,8 +89,8 @@ class ZipFile(file: File) : Closeable {
             0u,
             entriesCount,
             entriesCount,
-            filePointer.channel.position().toUInt() - centralDirectoryStartOffset,
+            filePointer.channel.position().toUInt() - CDStart,
-            centralDirectoryStartOffset,
+            CDStart,
             ""
         )
 
@@ -98,7 +98,7 @@ class ZipFile(file: File) : Closeable {
     }
 
     private fun addEntry(entry: ZipEntry, data: ByteBuffer) {
-        centralDirectoryNeedsRewrite = true
+        CDNeedsRewrite = true
 
         entry.localHeaderOffset = filePointer.channel.position().toUInt()
 
@@ -114,7 +114,8 @@ class ZipFile(file: File) : Closeable {
         compressor.finish()
 
         val uncompressedSize = data.size
-        val compressedData = ByteArray(uncompressedSize) // I'm guessing compression won't make the data bigger.
+        val compressedData =
+            ByteArray(uncompressedSize) //i'm guessing compression won't make the data bigger
 
         val compressedDataLength = compressor.deflate(compressedData)
         val compressedBuffer =
@@ -125,7 +126,7 @@ class ZipFile(file: File) : Closeable {
         val crc = CRC32()
         crc.update(data)
 
-        entry.compression = 8u // Deflate compression.
+        entry.compression = 8u //deflate compression
         entry.uncompressedSize = uncompressedSize.toUInt()
         entry.compressedSize = compressedDataLength.toUInt()
         entry.crc32 = crc.value.toUInt()
@@ -135,14 +136,14 @@ class ZipFile(file: File) : Closeable {
 
     private fun addEntryCopyData(entry: ZipEntry, data: ByteBuffer, alignment: Int? = null) {
         alignment?.let {
-            // Calculate where data would end up.
+            //calculate where data would end up
             val dataOffset = filePointer.filePointer + entry.LFHSize
 
             val mod = dataOffset % alignment
 
-            // Wrong alignment.
+            //wrong alignment
             if (mod != 0L) {
-                // Add padding at end of extra field.
+                //add padding at end of extra field
                 entry.localExtraField =
                     entry.localExtraField.copyOf((entry.localExtraField.size + (alignment - mod)).toInt())
             }
@@ -151,7 +152,7 @@ class ZipFile(file: File) : Closeable {
         addEntry(entry, data)
     }
 
-    private fun getDataForEntry(entry: ZipEntry): ByteBuffer {
+    fun getDataForEntry(entry: ZipEntry): ByteBuffer {
         return filePointer.channel.map(
             FileChannel.MapMode.READ_ONLY,
             entry.dataOffset.toLong(),
@@ -159,15 +160,9 @@ class ZipFile(file: File) : Closeable {
         )
     }
 
-    /**
-     * Copies all entries from [file] to this file but skip already existing entries.
-     *
-     * @param file The file to copy entries from.
-     * @param entryAlignment A function that returns the alignment for a given entry.
-     */
     fun copyEntriesFromFileAligned(file: ZipFile, entryAlignment: (entry: ZipEntry) -> Int?) {
         for (entry in file.entries) {
-            if (entries.any { it.fileName == entry.fileName }) continue // Skip duplicates
+            if (entries.any { it.fileName == entry.fileName }) continue //don't add duplicates
 
             val data = file.getDataForEntry(entry)
             addEntryCopyData(entry, data, entryAlignment(entry))
@@ -175,7 +170,7 @@ class ZipFile(file: File) : Closeable {
     }
 
     override fun close() {
-        if (centralDirectoryNeedsRewrite) writeCD()
+        if (CDNeedsRewrite) writeCD()
         filePointer.close()
     }
 }

src/main/kotlin/app/revanced/utils/signing/align/zip/structures/ZipEndRecord.kt

@@ -1,9 +1,9 @@
-package app.revanced.utils.align.zip.structures
+package app.revanced.utils.signing.align.zip.structures
 
-import app.revanced.utils.align.zip.putUInt
+import app.revanced.utils.signing.align.zip.putUInt
-import app.revanced.utils.align.zip.putUShort
+import app.revanced.utils.signing.align.zip.putUShort
-import app.revanced.utils.align.zip.readUIntLE
+import app.revanced.utils.signing.align.zip.readUIntLE
-import app.revanced.utils.align.zip.readUShortLE
+import app.revanced.utils.signing.align.zip.readUShortLE
 import java.io.DataInput
 import java.nio.ByteBuffer
 import java.nio.ByteOrder

src/main/kotlin/app/revanced/utils/signing/align/zip/structures/ZipEntry.kt

@@ -1,6 +1,6 @@
-package app.revanced.utils.align.zip.structures
+package app.revanced.utils.signing.align.zip.structures
 
-import app.revanced.utils.align.zip.*
+import app.revanced.utils.signing.align.zip.*
 import java.io.DataInput
 import java.nio.ByteBuffer
 import java.nio.ByteOrder

src/main/resources/app/revanced/cli/version.properties

@@ -1 +0,0 @@
-version=${projectVersion}

src/test/kotlin/app/revanced/patcher/options/PatchOptionOptionsTest.kt

@@ -2,10 +2,7 @@ package app.revanced.patcher.options
 
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.data.Context
-import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.*
-import app.revanced.patcher.patch.OptionsContainer
-import app.revanced.patcher.patch.Patch
-import app.revanced.patcher.patch.PatchOption
 import app.revanced.utils.Options
 import app.revanced.utils.Options.setOptions
 import org.junit.jupiter.api.MethodOrderer
@@ -14,8 +11,8 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestMethodOrder
 
 class PatchOptionsTestPatch : BytecodePatch() {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
-        // Do nothing
+        return PatchResultSuccess()
     }
 
     companion object : OptionsContainer() {
@@ -35,7 +32,7 @@ class PatchOptionsTestPatch : BytecodePatch() {
 
 @TestMethodOrder(MethodOrderer.OrderAnnotation::class)
 internal object PatchOptionOptionsTest {
-    private var patches = listOf(PatchOptionsTestPatch::class.java as Class<out Patch<Context<*>>>)
+    private var patches = listOf(PatchOptionsTestPatch::class.java as Class<out Patch<Context>>)
 
     @Test
     @Order(1)