build(Needs bump): Bump dependencies

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

@@ -1,13 +1,8 @@
 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 app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.options.PatchOption
 import picocli.CommandLine.*
 import picocli.CommandLine.Help.Visibility.ALWAYS
 import java.io.File
@@ -48,11 +43,11 @@ internal object ListPatchesCommand : Runnable {
     private var withOptions: Boolean = false
 
     override fun run() {
-        fun Package.buildString() = buildString {
-            if (withVersions && versions.isNotEmpty()) {
+        fun Patch.CompatiblePackage.buildString() = buildString {
+            if (withVersions && versions != null) {
                 appendLine("Package name: $name")
                 appendLine("Compatible versions:")
-                append(versions.joinToString("\n") { version -> version }.prependIndent("\t"))
+                append(versions!!.joinToString("\n") { version -> version }.prependIndent("\t"))
             } else append("Package name: $name")
         }
 
@@ -66,15 +61,17 @@ internal object ListPatchesCommand : Runnable {
             } ?: append("Key: $key")
         }
 
-        fun PatchClass.buildString() = buildString {
-            append("Name: $patchName")
+        fun Patch<*>.buildString() = buildString {
+            append("Name: $name")
 
             if (withDescriptions) append("\nDescription: $description")
 
-            if (withOptions && options != null) {
+            if (withOptions && options.isNotEmpty()) {
                 appendLine("\nOptions:")
                 append(
-                    options!!.joinToString("\n\n") { option -> option.buildString() }.prependIndent("\t")
+                    options.values.joinToString("\n\n") { option ->
+                        option.buildString()
+                    }.prependIndent("\t")
                 )
             }
 

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

@@ -1,7 +1,6 @@
 package app.revanced.cli.command
 
 import app.revanced.cli.command.utility.UtilityCommand
-import app.revanced.patcher.patch.PatchClass
 import picocli.CommandLine
 import picocli.CommandLine.Command
 import picocli.CommandLine.IVersionProvider
@@ -40,8 +39,6 @@ fun main(args: Array<String>) {
     CommandLine(MainCommand).execute(*args)
 }
 
-internal typealias PatchList = List<PatchClass>
-
 private object CLIVersionProvider : IVersionProvider {
     override fun getVersion(): Array<String> {
         Properties().apply {

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

@@ -1,12 +1,6 @@
 package app.revanced.cli.command
 
-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.patcher.*
 import app.revanced.utils.Options
 import app.revanced.utils.Options.setOptions
 import app.revanced.utils.adb.AdbManager
@@ -187,9 +181,9 @@ internal object PatchCommand : Runnable {
                     patchResult.exception?.let {
                         StringWriter().use { writer ->
                             it.printStackTrace(PrintWriter(writer))
-                            logger.severe("${patchResult.patchName} failed: $writer")
+                            logger.severe("${patchResult.patch.name} failed: $writer")
                         }
-                    } ?: logger.info("${patchResult.patchName} succeeded")
+                    } ?: logger.info("${patchResult.patch.name} succeeded")
                 }
             }
         }.get()
@@ -231,7 +225,7 @@ internal object PatchCommand : Runnable {
      * @param patches The patches to filter.
      * @return The filtered patches.
      */
-    private fun Patcher.filterPatchSelection(patches: PatchList) = buildList {
+    private fun Patcher.filterPatchSelection(patches: PatchSet) = buildList {
         // TODO: Remove this eventually because
         //  patches named "patch-name" and "patch name" will conflict.
         fun String.format() = lowercase().replace(" ", "-")
@@ -243,39 +237,41 @@ internal object PatchCommand : Runnable {
         val packageVersion = context.packageMetadata.packageVersion
 
         patches.forEach patch@{ patch ->
-            val formattedPatchName = patch.patchName.format()
+            val patchName = patch.name!!
+            val formattedPatchName = patchName.format()
 
             val explicitlyExcluded = formattedExcludedPatches.contains(formattedPatchName)
-            if (explicitlyExcluded) return@patch logger.info("Excluding ${patch.patchName}")
+            if (explicitlyExcluded) return@patch logger.info("Excluding ${patchName}")
 
             // 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 {
-                        it.isEmpty() || it.any { version -> version == packageVersion }
-                    }
+                    val matchesVersion = force || `package`.versions?.let {
+                        it.any { version -> version == packageVersion }
+                    } ?: true
 
                     if (!matchesVersion) return@patch logger.warning(
-                        "${patch.patchName} is incompatible with version $packageVersion. "
+                        "$patchName is incompatible with version $packageVersion. "
                                 + "This patch is only compatible with version "
                                 + packages.joinToString(";") { pkg ->
-                            "${pkg.name}: ${pkg.versions.joinToString(", ")}"
+                            "${pkg.name}: ${pkg.versions!!.joinToString(", ")}"
                         }
                     )
-                } ?: return@patch logger.fine("${patch.patchName} is incompatible with $packageName. "
+                } ?: return@patch logger.fine(
+                    "$patchName is incompatible with $packageName. "
                         + "This patch is only compatible with "
                         + packages.joinToString(", ") { `package` -> `package`.name })
 
                 return@let
             } ?: logger.fine("$formattedPatchName: No constraint on packages.")
 
-            // If the patch is implicitly included, it will be only included if [exclusive] is false.
-            val implicitlyIncluded = !exclusive && patch.include
-            // If the patch is explicitly included, it will be included even if [exclusive] is false.
+            // If the patch is implicitly used, it will be only included if [exclusive] is false.
+            val implicitlyIncluded = !exclusive && patch.use
+            // If the patch is explicitly used, it will be included even if [exclusive] is false.
             val explicitlyIncluded = formattedIncludedPatches.contains(formattedPatchName)
 
             val included = implicitlyIncluded || explicitlyIncluded
-            if (!included) return@patch logger.info("${patch.patchName} excluded by default") // Case 1.
+            if (!included) return@patch logger.info("$patchName excluded by default") // Case 1.
 
             logger.fine("Adding $formattedPatchName")