From 31e4a41dd20f5fa62f840cd8e3b92fe0814eda87 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sun, 1 Jan 2023 18:05:37 +0100 Subject: [PATCH 1/3] fix: do not list compatible packages if patches do not define them --- src/main/kotlin/app/revanced/cli/command/MainCommand.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/app/revanced/cli/command/MainCommand.kt b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt index 4ebd462..85eec70 100644 --- a/src/main/kotlin/app/revanced/cli/command/MainCommand.kt +++ b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt @@ -220,7 +220,7 @@ internal object MainCommand : Runnable { for (patchBundlePath in args.patchArgs?.patchBundles!!) for (patch in PatchBundle.Jar(patchBundlePath) .loadPatches()) { if (patch.patchName in logged) continue - for (compatiblePackage in patch.compatiblePackages!!) { + for (compatiblePackage in patch.compatiblePackages ?: continue) { val packageEntryStr = buildString { // Add package if flag is set if (args.patchArgs?.listingArgs?.withPackages == true) { From 07a423b19ec72e9f020aeb0222f4ced571036dbe Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sun, 1 Jan 2023 18:08:15 +0100 Subject: [PATCH 2/3] feat: remove option `--with-descriptions` --- .../kotlin/app/revanced/cli/command/MainCommand.kt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/app/revanced/cli/command/MainCommand.kt b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt index 85eec70..0c1c845 100644 --- a/src/main/kotlin/app/revanced/cli/command/MainCommand.kt +++ b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt @@ -71,9 +71,6 @@ internal object MainCommand : Runnable { @Option(names = ["--with-packages"], description = ["List patches with compatible packages"]) var withPackages: Boolean = false - - @Option(names = ["--with-descriptions"], description = ["List patches with their descriptions"]) - var withDescriptions: Boolean = true } class PatchingArgs { @@ -228,14 +225,15 @@ internal object MainCommand : Runnable { append(packageName) append("\t") } + // Add patch name val patchName = patch.patchName.padStart(25) append(patchName) + // Add description if flag is set. - if (args.patchArgs?.listingArgs?.withDescriptions == true) { - append("\t") - append(patch.description) - } + append("\t") + append(patch.description) + // Add compatible versions, if flag is set if (args.patchArgs?.listingArgs?.withVersions == true) { val compatibleVersions = compatiblePackage.versions.joinToString(separator = ", ") From 1957a2c4ff0242d2aa5c02daa94faa3071203a58 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sun, 1 Jan 2023 17:12:07 +0000 Subject: [PATCH 3/3] chore(release): 2.20.0-dev.1 [skip ci] # [2.20.0-dev.1](https://github.com/revanced/revanced-cli/compare/v2.19.0...v2.20.0-dev.1) (2023-01-01) ### Bug Fixes * do not list compatible packages if patches do not define them ([31e4a41](https://github.com/revanced/revanced-cli/commit/31e4a41dd20f5fa62f840cd8e3b92fe0814eda87)) ### Features * remove option `--with-descriptions` ([07a423b](https://github.com/revanced/revanced-cli/commit/07a423b19ec72e9f020aeb0222f4ced571036dbe)) --- CHANGELOG.md | 12 ++++++++++++ gradle.properties | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 460278d..b73c5b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# [2.20.0-dev.1](https://github.com/revanced/revanced-cli/compare/v2.19.0...v2.20.0-dev.1) (2023-01-01) + + +### Bug Fixes + +* do not list compatible packages if patches do not define them ([31e4a41](https://github.com/revanced/revanced-cli/commit/31e4a41dd20f5fa62f840cd8e3b92fe0814eda87)) + + +### Features + +* remove option `--with-descriptions` ([07a423b](https://github.com/revanced/revanced-cli/commit/07a423b19ec72e9f020aeb0222f4ced571036dbe)) + # [2.19.0](https://github.com/revanced/revanced-cli/compare/v2.18.2...v2.19.0) (2022-12-31) diff --git a/gradle.properties b/gradle.properties index ef382a7..d2c4167 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ kotlin.code.style = official -version = 2.19.0 +version = 2.20.0-dev.1