CHANGELOG.md

@@ -1,65 +1,3 @@
-## [5.0.1](https://github.com/ReVanced/revanced-cli/compare/v5.0.0...v5.0.1) (2025-04-14)
-
-
-### Bug Fixes
-
-* Make mounting work again by bumping dependencies ([#359](https://github.com/ReVanced/revanced-cli/issues/359)) ([68a4872](https://github.com/ReVanced/revanced-cli/commit/68a48724ebf01a0c8f8adc0fec63037bff672dc9))
-
-## [5.0.1-dev.1](https://github.com/ReVanced/revanced-cli/compare/v5.0.0...v5.0.1-dev.1) (2025-02-26)
-
-
-### Bug Fixes
-
-* Make mounting work again by bumping dependencies ([#359](https://github.com/ReVanced/revanced-cli/issues/359)) ([68a4872](https://github.com/ReVanced/revanced-cli/commit/68a48724ebf01a0c8f8adc0fec63037bff672dc9))
-
-# [5.0.0](https://github.com/ReVanced/revanced-cli/compare/v4.6.0...v5.0.0) (2024-11-10)
-
-
-### Bug Fixes
-
-* Check for null when no device serial was specified ([1da8ae9](https://github.com/ReVanced/revanced-cli/commit/1da8ae9e46000dd3c4eecd793c559e75012cf535))
-* List if patch option is required ([#346](https://github.com/ReVanced/revanced-cli/issues/346)) ([98ff0c3](https://github.com/ReVanced/revanced-cli/commit/98ff0c34fa71c3b3ecd96157d45a30ee2b8979c6))
-* Make CLI ArgGroup non-exclusive to be able to disable and enable patches at the same time ([1bb0d13](https://github.com/ReVanced/revanced-cli/commit/1bb0d13726fd5790c59cb6d28df3618c7606710d))
-* Make patches selectable by using a mutable collection for the selection option ([751fa1d](https://github.com/ReVanced/revanced-cli/commit/751fa1d889f40c51b291116029fd84f2b051f2f0))
-* Make the patch command work without specifying any selection ([ba159a3](https://github.com/ReVanced/revanced-cli/commit/ba159a35a9a99d18a4c1e04128b08ae336a49b3e))
-* Print in new line correctly ([c2dc9d7](https://github.com/ReVanced/revanced-cli/commit/c2dc9d76be33c98284741e23c406500483c47753))
-* Use the first connected device when no ADB device is specified ([5f952f3](https://github.com/ReVanced/revanced-cli/commit/5f952f35f5cb388b6509b2b4d905b8143ebc7996))
-
-
-### Features
-
-* Set patch options via CLI ([#336](https://github.com/ReVanced/revanced-cli/issues/336)) ([2300243](https://github.com/ReVanced/revanced-cli/commit/23002434b2d51c2a3b30b33dd0526261432d90ce))
-* Show error about no installation device found at the beginning ([3300e6b](https://github.com/ReVanced/revanced-cli/commit/3300e6b4333ed1c4e6785cb82eca9016fc6d4a20))
-* Simplify command and option names and descriptions ([#338](https://github.com/ReVanced/revanced-cli/issues/338)) ([6e7797a](https://github.com/ReVanced/revanced-cli/commit/6e7797a3f0525a8f48af7182157da0d045600ac2))
-* Simplify option descriptions ([45c998b](https://github.com/ReVanced/revanced-cli/commit/45c998b335b65ac233fece8b804dc7410142691c))
-
-
-### BREAKING CHANGES
-
-* Options have been renamed.
-* This commit changes various CLI options and removes the `options.json` file. Instead, patch options can now be passed via CLI options
-
-# [5.0.0-dev.11](https://github.com/ReVanced/revanced-cli/compare/v5.0.0-dev.10...v5.0.0-dev.11) (2024-11-10)
-
-
-### Bug Fixes
-
-* List if patch option is required ([#346](https://github.com/ReVanced/revanced-cli/issues/346)) ([98ff0c3](https://github.com/ReVanced/revanced-cli/commit/98ff0c34fa71c3b3ecd96157d45a30ee2b8979c6))
-
-# [5.0.0-dev.10](https://github.com/ReVanced/revanced-cli/compare/v5.0.0-dev.9...v5.0.0-dev.10) (2024-11-05)
-
-
-### Bug Fixes
-
-* Make CLI ArgGroup non-exclusive to be able to disable and enable patches at the same time ([1bb0d13](https://github.com/ReVanced/revanced-cli/commit/1bb0d13726fd5790c59cb6d28df3618c7606710d))
-
-# [5.0.0-dev.9](https://github.com/ReVanced/revanced-cli/compare/v5.0.0-dev.8...v5.0.0-dev.9) (2024-11-05)
-
-
-### Bug Fixes
-
-* Print in new line correctly ([c2dc9d7](https://github.com/ReVanced/revanced-cli/commit/c2dc9d76be33c98284741e23c406500483c47753))
-
 # [5.0.0-dev.8](https://github.com/ReVanced/revanced-cli/compare/v5.0.0-dev.7...v5.0.0-dev.8) (2024-10-17)
 
 # [5.0.0-dev.7](https://github.com/ReVanced/revanced-cli/compare/v5.0.0-dev.6...v5.0.0-dev.7) (2024-10-16)

README.md

@@ -63,11 +63,11 @@
 ![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/ReVanced/revanced-cli/release.yml)
 ![GPLv3 License](https://img.shields.io/badge/License-GPL%20v3-yellow.svg)
 
-Command-line application to use ReVanced.
+Command line application to use ReVanced.
 
 ## ❓ About
 
-ReVanced CLI is a command-line application that uses [ReVanced Patcher](https://github.com/revanced/revanced-patcher) to patch Android apps.
+ReVanced CLI is a command line application that uses [ReVanced Patcher](https://github.com/revanced/revanced-patcher) to patch Android apps.
 
 ## 💪 Features
 
@@ -75,7 +75,7 @@ Some of the features ReVanced CLI provides are:
 
 - 💉 **Patch apps**: Harness ReVanced Patcher to patch Android apps
 - 💾 **Install and uninstall apps**: Install and uninstall Apps via ADB,
-  using the Android package manager or by mounting using root permissions
+  using the Android package manager, or by mounting using root permissions
 - 📃 **List patches from patch bundles**: List available patches, compatible packages, and versions
 - 💪 **Flexibility and functionality**: Apply any combination of patches to any version of Android apps
 

build.gradle.kts

@@ -59,10 +59,10 @@ tasks {
     }
 
     shadowJar {
-        exclude("/prebuilt/linux/aapt", "/prebuilt/windows/aapt.exe", "/prebuilt/*/aapt_*")
         minimize {
+            exclude(dependency("org.jetbrains.kotlin:.*"))
             exclude(dependency("org.bouncycastle:.*"))
-            exclude(dependency("app.revanced:revanced-patcher"))
+            exclude(dependency("app.revanced:.*"))
         }
     }
 

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 5.0.1
+version = 5.0.0-dev.8

gradle/libs.versions.toml

@@ -3,8 +3,8 @@ shadow = "8.1.1"
 kotlin = "2.0.20"
 kotlinx = "1.8.1"
 picocli = "4.7.6"
-revanced-patcher = "21.0.0"
+revanced-patcher = "20.0.2"
-revanced-library = "3.1.0"
+revanced-library = "3.0.0"
 
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }

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

@@ -89,7 +89,6 @@ internal object ListPatchesCommand : Runnable {
             buildString {
                 appendLine("Title: $title")
                 description?.let { appendLine("Description: $it") }
-                appendLine("Required: $required")
                 default?.let {
                     appendLine("Key: $key")
                     append("Default: $it")
@@ -112,7 +111,7 @@ internal object ListPatchesCommand : Runnable {
 
                     if (withDescriptions) append("\nDescription: ${patch.description}")
 
-                    append("\nEnabled: ${patch.use}")
+                    append("Enabled: ${patch.use}")
 
                     if (withOptions && patch.options.isNotEmpty()) {
                         appendLine("\nOptions:")

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

@@ -29,11 +29,11 @@ internal object PatchCommand : Runnable {
     @Spec
     private lateinit var spec: CommandSpec
 
-    @ArgGroup(exclusive = false, multiplicity = "0..*")
+    @ArgGroup(multiplicity = "0..*")
     private var selection = mutableSetOf<Selection>()
 
     internal class Selection {
-        @ArgGroup(exclusive = false)
+        @ArgGroup(exclusive = false, multiplicity = "1")
         internal var enabled: EnableSelection? = null
 
         internal class EnableSelection {
@@ -65,7 +65,7 @@ internal object PatchCommand : Runnable {
             internal var options = mutableMapOf<String, Any?>()
         }
 
-        @ArgGroup(exclusive = false)
+        @ArgGroup(exclusive = false, multiplicity = "1")
         internal var disable: DisableSelection? = null
 
         internal class DisableSelection {
@@ -291,6 +291,7 @@ internal object PatchCommand : Runnable {
                 patcherTemporaryFilesPath,
                 aaptBinaryPath?.path,
                 patcherTemporaryFilesPath.absolutePath,
+                true,
             ),
         ).use { patcher ->
             val packageName = patcher.context.packageMetadata.packageName
@@ -356,6 +357,8 @@ internal object PatchCommand : Runnable {
         // region Install.
 
         deviceSerial?.let {
+            val deviceSerial = it.ifEmpty { null }
+
             runBlocking {
                 when (val result = installer!!.install(Installer.Apk(outputFilePath, packageName))) {
                     RootInstallerResult.FAILURE -> logger.severe("Failed to mount the patched APK file")