Compare commits

..

3 Commits

Author SHA1 Message Date
semantic-release-bot
1781612789 chore(release): 1.6.1 [skip ci]
## [1.6.1](https://github.com/revanced/revanced-cli/compare/v1.6.0...v1.6.1) (2022-06-21)

### Bug Fixes

* remove `-e` from `experimental` option ([3829136](3829136c49))
2022-06-21 17:06:20 +00:00
oSumAtrIX
3829136c49 fix: remove -e from experimental option 2022-06-21 19:04:32 +02:00
oSumAtrIX
00145f2bb6 chore: merge nested if blocks 2022-06-21 19:00:11 +02:00
4 changed files with 14 additions and 9 deletions

View File

@@ -1,3 +1,10 @@
## [1.6.1](https://github.com/revanced/revanced-cli/compare/v1.6.0...v1.6.1) (2022-06-21)
### Bug Fixes
* remove `-e` from `experimental` option ([3829136](https://github.com/revanced/revanced-cli/commit/3829136c49ddce1dc6b01eda04ce013540b213c2))
# [1.6.0](https://github.com/revanced/revanced-cli/compare/v1.5.1...v1.6.0) (2022-06-21)

View File

@@ -1,2 +1,2 @@
kotlin.code.style = official
version = 1.6.0
version = 1.6.1

View File

@@ -47,7 +47,7 @@ internal object MainCommand : Runnable {
@Option(names = ["-r", "--resource-patcher"], description = ["Disable patching resources"])
var disableResourcePatching: Boolean = false
@Option(names = ["-e", "--experimental"], description = ["Disable patch version compatibility patch"])
@Option(names = ["--experimental"], description = ["Disable patch version compatibility patch"])
var experimental: Boolean = false
@Option(names = ["-m", "--merge"], description = ["One or more dex file containers to merge"])

View File

@@ -24,13 +24,11 @@ fun Patcher.addPatchesFiltered(
val prefix = "[skipped] $patchName"
val args = MainCommand.args.pArgs!!
val args = MainCommand.args.pArgs!!
if (excludePatches) {
if (args.excludedPatches.contains(patchName)) {
println("$prefix: Explicitly excluded.")
return@patch
}
if (excludePatches && args.excludedPatches.contains(patchName)) {
println("$prefix: Explicitly excluded.")
return@patch
} else if (!patch.include) {
println("$prefix: Implicitly excluded.")
return@patch
@@ -43,7 +41,7 @@ fun Patcher.addPatchesFiltered(
return@patch
}
if (!(args.experimental || compatiblePackages.any { it.versions.isEmpty() || it.versions.any { version -> version == packageVersion }})) {
if (!(args.experimental || compatiblePackages.any { it.versions.isEmpty() || it.versions.any { version -> version == packageVersion } })) {
println("$prefix: The package version is $packageVersion and is incompatible.")
return@patch
}