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))

CHANGELOG.md

@@ -1,17 +1,3 @@
-## [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)
 
 

gradle.properties

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

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

@@ -43,7 +43,6 @@ internal object MainCommand : Runnable {
     lateinit var args: Args
 
     class Args {
-        // TODO: Move this so it is not required when listing patches
         @Option(names = ["-a", "--apk"], description = ["Input APK file to be patched"], required = true)
         lateinit var inputFile: File
 
@@ -242,7 +241,7 @@ internal object MainCommand : Runnable {
                     }
 
                     // Add patch name
-                    val patchName = patch.patchName.lowercase().replace(" ", "-").padStart(25)
+                    val patchName = patch.patchName.lowercase().replace("-", " ").padStart(25)
                     append(patchName)
 
                     // Add description if flag is set.

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

@@ -17,11 +17,12 @@ fun Patcher.addPatchesFiltered(allPatches: PatchList) {
     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 ${patch.patchName}"
+        val prefix = "Skipping $patchName"
 
-        if (compatiblePackages == null) logger.trace("${patch.patchName}: No package constraints.")
+        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 ${
@@ -41,16 +42,15 @@ fun Patcher.addPatchesFiltered(allPatches: PatchList) {
             }
         }
 
-        val kebabCasedPatchName = patch.patchName.lowercase().replace(" ", "-")
-        if (args.excludedPatches.contains(kebabCasedPatchName)) {
+        if (args.excludedPatches.contains(patchName)) {
             logger.info("$prefix: Manually excluded")
             return@patchLoop
-        } else if ((!patch.include || args.exclusive) && !args.includedPatches.contains(kebabCasedPatchName)) {
+        } else if ((!patch.include || args.exclusive) && !args.includedPatches.contains(patchName)) {
             logger.info("$prefix: Excluded by default")
             return@patchLoop
         }
 
-        logger.trace("Adding ${patch.patchName}")
+        logger.trace("Adding $patchName")
         includedPatches.add(patch)
     }