mirror of
https://github.com/ReVanced/revanced-cli.git
synced 2026-01-18 17:03:58 +00:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1781612789 | ||
|
|
3829136c49 | ||
|
|
00145f2bb6 |
@@ -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)
|
# [1.6.0](https://github.com/revanced/revanced-cli/compare/v1.5.1...v1.6.0) (2022-06-21)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
kotlin.code.style = official
|
kotlin.code.style = official
|
||||||
version = 1.6.0
|
version = 1.6.1
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ internal object MainCommand : Runnable {
|
|||||||
@Option(names = ["-r", "--resource-patcher"], description = ["Disable patching resources"])
|
@Option(names = ["-r", "--resource-patcher"], description = ["Disable patching resources"])
|
||||||
var disableResourcePatching: Boolean = false
|
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
|
var experimental: Boolean = false
|
||||||
|
|
||||||
@Option(names = ["-m", "--merge"], description = ["One or more dex file containers to merge"])
|
@Option(names = ["-m", "--merge"], description = ["One or more dex file containers to merge"])
|
||||||
|
|||||||
@@ -24,13 +24,11 @@ fun Patcher.addPatchesFiltered(
|
|||||||
|
|
||||||
val prefix = "[skipped] $patchName"
|
val prefix = "[skipped] $patchName"
|
||||||
|
|
||||||
val args = MainCommand.args.pArgs!!
|
val args = MainCommand.args.pArgs!!
|
||||||
|
|
||||||
if (excludePatches) {
|
if (excludePatches && args.excludedPatches.contains(patchName)) {
|
||||||
if (args.excludedPatches.contains(patchName)) {
|
println("$prefix: Explicitly excluded.")
|
||||||
println("$prefix: Explicitly excluded.")
|
return@patch
|
||||||
return@patch
|
|
||||||
}
|
|
||||||
} else if (!patch.include) {
|
} else if (!patch.include) {
|
||||||
println("$prefix: Implicitly excluded.")
|
println("$prefix: Implicitly excluded.")
|
||||||
return@patch
|
return@patch
|
||||||
@@ -43,7 +41,7 @@ fun Patcher.addPatchesFiltered(
|
|||||||
return@patch
|
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.")
|
println("$prefix: The package version is $packageVersion and is incompatible.")
|
||||||
return@patch
|
return@patch
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user