chore: Lint code

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

@@ -8,78 +8,81 @@ import picocli.CommandLine.Help.Visibility.ALWAYS
 import java.io.File
 import java.util.logging.Logger
 
-
 @Command(
     name = "list-patches",
-    description = ["List patches from supplied patch bundles."]
+    description = ["List patches from supplied patch bundles."],
 )
 internal object ListPatchesCommand : Runnable {
     private val logger = Logger.getLogger(ListPatchesCommand::class.java.name)
 
     @Parameters(
         description = ["Paths to patch bundles."],
-        arity = "1..*"
+        arity = "1..*",
     )
     private lateinit var patchBundles: Array<File>
 
     @Option(
         names = ["-d", "--with-descriptions"],
         description = ["List their descriptions."],
-        showDefaultValue = ALWAYS
+        showDefaultValue = ALWAYS,
     )
     private var withDescriptions: Boolean = true
 
     @Option(
         names = ["-p", "--with-packages"],
         description = ["List the packages the patches are compatible with."],
-        showDefaultValue = ALWAYS
+        showDefaultValue = ALWAYS,
     )
     private var withPackages: Boolean = false
 
     @Option(
         names = ["-v", "--with-versions"],
         description = ["List the versions of the apps the patches are compatible with."],
-        showDefaultValue = ALWAYS
+        showDefaultValue = ALWAYS,
     )
     private var withVersions: Boolean = false
 
     @Option(
         names = ["-o", "--with-options"],
         description = ["List the options of the patches."],
-        showDefaultValue = ALWAYS
+        showDefaultValue = ALWAYS,
     )
     private var withOptions: Boolean = false
 
     @Option(
         names = ["-u", "--with-universal-patches"],
         description = ["List patches which are compatible with any app."],
-        showDefaultValue = ALWAYS
+        showDefaultValue = ALWAYS,
     )
     private var withUniversalPatches: Boolean = true
 
     @Option(
         names = ["-i", "--index"],
         description = ["List the index of each patch in relation to the supplied patch bundles."],
-        showDefaultValue = ALWAYS
+        showDefaultValue = ALWAYS,
     )
     private var withIndex: Boolean = true
 
     @Option(
         names = ["-f", "--filter-package-name"],
-        description = ["Filter patches by package name."]
+        description = ["Filter patches by package name."],
     )
     private var packageName: String? = null
 
     override fun run() {
-        fun Patch.CompatiblePackage.buildString() = buildString {
+        fun Patch.CompatiblePackage.buildString() =
+            buildString {
                 if (withVersions && versions != null) {
                     appendLine("Package name: $name")
                     appendLine("Compatible versions:")
                     append(versions!!.joinToString("\n") { version -> version }.prependIndent("\t"))
-            } else append("Package name: $name")
+                } else {
+                    append("Package name: $name")
+                }
             }
 
-        fun PatchOption<*>.buildString() = buildString {
+        fun PatchOption<*>.buildString() =
+            buildString {
                 appendLine("Title: $title")
                 description?.let { appendLine("Description: $it") }
                 default?.let {
@@ -93,7 +96,8 @@ internal object ListPatchesCommand : Runnable {
                 }
             }
 
-        fun IndexedValue<Patch<*>>.buildString() = let { (index, patch) ->
+        fun IndexedValue<Patch<*>>.buildString() =
+            let { (index, patch) ->
                 buildString {
                     if (withIndex) appendLine("Index: $index")
 
@@ -106,20 +110,23 @@ internal object ListPatchesCommand : Runnable {
                         append(
                             patch.options.values.joinToString("\n\n") { option ->
                                 option.buildString()
-                        }.prependIndent("\t")
+                            }.prependIndent("\t"),
                         )
                     }
 
                     if (withPackages && patch.compatiblePackages != null) {
                         appendLine("\nCompatible packages:")
-                    append(patch.compatiblePackages!!.joinToString("\n") {
+                        append(
+                            patch.compatiblePackages!!.joinToString("\n") {
                                 it.buildString()
-                    }.prependIndent("\t"))
+                            }.prependIndent("\t"),
+                        )
                     }
                 }
             }
 
-        fun Patch<*>.filterCompatiblePackages(name: String) = compatiblePackages?.any { it.name == name }
+        fun Patch<*>.filterCompatiblePackages(name: String) =
+            compatiblePackages?.any { it.name == name }
                 ?: withUniversalPatches
 
         val patches = PatchBundleLoader.Jar(*patchBundles).withIndex().toList()

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

@@ -7,23 +7,24 @@ import picocli.CommandLine.Command
 import picocli.CommandLine.IVersionProvider
 import java.util.*
 
-
 fun main(args: Array<String>) {
     Logger.setDefault()
     CommandLine(MainCommand).execute(*args).let(System::exit)
 }
 
 private object CLIVersionProvider : IVersionProvider {
-    override fun getVersion() = arrayOf(
+    override fun getVersion() =
+        arrayOf(
             MainCommand::class.java.getResourceAsStream(
-            "/app/revanced/cli/version.properties"
+                "/app/revanced/cli/version.properties",
             )?.use { stream ->
                 Properties().apply {
                     load(stream)
                 }.let {
                     "ReVanced CLI v${it.getProperty("version")}"
                 }
-        } ?: "ReVanced CLI")
+            } ?: "ReVanced CLI",
+        )
 }
 
 @Command(
@@ -36,6 +37,6 @@ private object CLIVersionProvider : IVersionProvider {
         PatchCommand::class,
         OptionsCommand::class,
         UtilityCommand::class,
-    ]
+    ],
 )
 private object MainCommand

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

@@ -17,39 +17,42 @@ internal object OptionsCommand : Runnable {
 
     @CommandLine.Parameters(
         description = ["Paths to patch bundles."],
-        arity = "1..*"
+        arity = "1..*",
     )
     private lateinit var patchBundles: Array<File>
 
     @CommandLine.Option(
         names = ["-p", "--path"],
         description = ["Path to patch options JSON file."],
-        showDefaultValue = ALWAYS
+        showDefaultValue = ALWAYS,
     )
     private var filePath: File = File("options.json")
 
     @CommandLine.Option(
         names = ["-o", "--overwrite"],
         description = ["Overwrite existing options file."],
-        showDefaultValue = ALWAYS
+        showDefaultValue = ALWAYS,
     )
     private var overwrite: Boolean = false
 
     @CommandLine.Option(
         names = ["-u", "--update"],
         description = ["Update existing options by adding missing and removing non-existent options."],
-        showDefaultValue = ALWAYS
+        showDefaultValue = ALWAYS,
     )
     private var update: Boolean = false
 
-    override fun run() = try {
+    override fun run() =
+        try {
             PatchBundleLoader.Jar(*patchBundles).let { patches ->
                 val exists = filePath.exists()
                 if (!exists || overwrite) {
                     if (exists && update) patches.setOptions(filePath)
 
                     Options.serialize(patches, prettyPrint = true).let(filePath::writeText)
-            } else throw OptionsFileAlreadyExistsException()
+                } else {
+                    throw OptionsFileAlreadyExistsException()
+                }
             }
         } catch (ex: OptionsFileAlreadyExistsException) {
             logger.severe("Options file already exists, use --overwrite to override it")

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

@@ -219,19 +219,23 @@ internal object PatchCommand : Runnable {
     override fun run() {
         // region Setup
 
-        val outputFilePath = outputFilePath ?: File("").absoluteFile.resolve(
+        val outputFilePath =
+            outputFilePath ?: File("").absoluteFile.resolve(
                 "${apk.nameWithoutExtension}-patched.${apk.extension}",
             )
 
-        val resourceCachePath = resourceCachePath ?: outputFilePath.parentFile.resolve(
+        val resourceCachePath =
+            resourceCachePath ?: outputFilePath.parentFile.resolve(
                 "${outputFilePath.nameWithoutExtension}-resource-cache",
             )
 
-        val optionsFile = optionsFile ?: outputFilePath.parentFile.resolve(
+        val optionsFile =
+            optionsFile ?: outputFilePath.parentFile.resolve(
                 "${outputFilePath.nameWithoutExtension}-options.json",
             )
 
-        val keystoreFilePath = keystoreFilePath ?: outputFilePath.parentFile
+        val keystoreFilePath =
+            keystoreFilePath ?: outputFilePath.parentFile
                 .resolve("${outputFilePath.nameWithoutExtension}.keystore")
 
         // endregion
@@ -265,7 +269,8 @@ internal object PatchCommand : Runnable {
                 true,
             ),
         ).use { patcher ->
-            val filteredPatches = patcher.filterPatchSelection(patches).also { patches ->
+            val filteredPatches =
+                patcher.filterPatchSelection(patches).also { patches ->
                     logger.info("Setting patch options")
 
                     if (optionsFile.exists()) {
@@ -277,7 +282,8 @@ internal object PatchCommand : Runnable {
 
             // region Patch
 
-            val patcherResult = patcher.apply {
+            val patcherResult =
+                patcher.apply {
                     acceptIntegrations(integrations)
                     acceptPatches(filteredPatches.toList())
 
@@ -298,7 +304,8 @@ internal object PatchCommand : Runnable {
 
             // region Save
 
-            val alignedFile = resourceCachePath.resolve(apk.name).apply {
+            val alignedFile =
+                resourceCachePath.resolve(apk.name).apply {
                     ApkUtils.copyAligned(apk, this, patcherResult)
                 }
 
@@ -341,7 +348,8 @@ internal object PatchCommand : Runnable {
      * @param patches The patches to filter.
      * @return The filtered patches.
      */
-    private fun Patcher.filterPatchSelection(patches: PatchSet): PatchSet = buildSet {
+    private fun Patcher.filterPatchSelection(patches: PatchSet): PatchSet =
+        buildSet {
             val packageName = context.packageMetadata.packageName
             val packageVersion = context.packageMetadata.packageVersion
 
@@ -354,7 +362,8 @@ internal object PatchCommand : Runnable {
                 // Make sure the patch is compatible with the supplied APK files package name and version.
                 patch.compatiblePackages?.let { packages ->
                     packages.singleOrNull { it.name == packageName }?.let { `package` ->
-                    val matchesVersion = force || `package`.versions?.let {
+                        val matchesVersion =
+                            force || `package`.versions?.let {
                                 it.any { version -> version == packageVersion }
                             } ?: true
 
@@ -391,7 +400,8 @@ internal object PatchCommand : Runnable {
         }
 
     private fun purge(resourceCachePath: File) {
-        val result = if (resourceCachePath.deleteRecursively()) {
+        val result =
+            if (resourceCachePath.deleteRecursively()) {
                 "Purged resource cache directory"
             } else {
                 "Failed to purge resource cache directory"

src/main/kotlin/app/revanced/cli/command/utility/InstallCommand.kt

@@ -32,7 +32,8 @@ internal object InstallCommand : Runnable {
     private var packageName: String? = null
 
     override fun run() {
-        fun install(deviceSerial: String? = null) = try {
+        fun install(deviceSerial: String? = null) =
+            try {
                 AdbManager.getAdbManager(deviceSerial, packageName != null).install(AdbManager.Apk(apk, packageName))
             } catch (e: AdbManager.DeviceNotFoundException) {
                 logger.severe(e.toString())

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

@@ -5,36 +5,36 @@ import picocli.CommandLine.*
 import picocli.CommandLine.Help.Visibility.ALWAYS
 import java.util.logging.Logger
 
-
 @Command(
     name = "uninstall",
-    description = ["Uninstall a patched app from the devices with the supplied ADB device serials"]
+    description = ["Uninstall a patched app from the devices with the supplied ADB device serials"],
 )
 internal object UninstallCommand : Runnable {
     private val logger = Logger.getLogger(UninstallCommand::class.java.name)
 
     @Parameters(
         description = ["ADB device serials. If not supplied, the first connected device will be used."],
-        arity = "0..*"
+        arity = "0..*",
     )
     private var deviceSerials: Array<String>? = null
 
     @Option(
         names = ["-p", "--package-name"],
         description = ["Package name of the app to uninstall"],
-        required = true
+        required = true,
     )
     private lateinit var packageName: String
 
     @Option(
         names = ["-u", "--unmount"],
         description = ["Uninstall by unmounting the patched APK file"],
-        showDefaultValue = ALWAYS
+        showDefaultValue = ALWAYS,
     )
     private var unmount: Boolean = false
 
     override fun run() {
-        fun uninstall(deviceSerial: String? = null) = try {
+        fun uninstall(deviceSerial: String? = null) =
+            try {
                 AdbManager.getAdbManager(deviceSerial, unmount).uninstall(packageName)
             } catch (e: AdbManager.DeviceNotFoundException) {
                 logger.severe(e.toString())