Compare commits

..

3 Commits

Author SHA1 Message Date
semantic-release-bot
1cd0976415 chore(release): 2.7.0 [skip ci]
# [2.7.0](https://github.com/revanced/revanced-cli/compare/v2.6.0...v2.7.0) (2022-07-21)

### Features

* `--custom-aapt2-binary` option ([#104](https://github.com/revanced/revanced-cli/issues/104)) ([d8dbffd](d8dbffd7a7))
2022-07-21 12:13:10 +00:00
Robert
d8dbffd7a7 feat: --custom-aapt2-binary option (#104) 2022-07-21 14:11:26 +02:00
n0k0m3
5f2bccc4e5 refactor: fix typo (#101) 2022-07-19 17:30:31 +02:00
4 changed files with 14 additions and 3 deletions

View File

@@ -1,3 +1,10 @@
# [2.7.0](https://github.com/revanced/revanced-cli/compare/v2.6.0...v2.7.0) (2022-07-21)
### Features
* `--custom-aapt2-binary` option ([#104](https://github.com/revanced/revanced-cli/issues/104)) ([d8dbffd](https://github.com/revanced/revanced-cli/commit/d8dbffd7a7ebc583476d368d2ae78853cbb40382))
# [2.6.0](https://github.com/revanced/revanced-cli/compare/v2.5.3...v2.6.0) (2022-07-18) # [2.6.0](https://github.com/revanced/revanced-cli/compare/v2.5.3...v2.6.0) (2022-07-18)

View File

@@ -1,2 +1,2 @@
kotlin.code.style = official kotlin.code.style = official
version = 2.6.0 version = 2.7.0

View File

@@ -113,6 +113,9 @@ internal object MainCommand : Runnable {
description = ["Clean the temporal resource cache directory. This will be done anyways when running the patcher"] description = ["Clean the temporal resource cache directory. This will be done anyways when running the patcher"]
) )
var clean: Boolean = false var clean: Boolean = false
@Option(names = ["--custom-aapt2-binary"], description = ["Path to custom aapt2 binary"])
var aaptPath: String = ""
} }
override fun run() { override fun run() {
@@ -149,6 +152,7 @@ internal object MainCommand : Runnable {
_args.inputFile, _args.inputFile,
args.cacheDirectory, args.cacheDirectory,
!args.disableResourcePatching, !args.disableResourcePatching,
args.aaptPath,
logger = PatcherLogger logger = PatcherLogger
) )
) )

View File

@@ -26,7 +26,7 @@ fun Patcher.addPatchesFiltered() {
val args = MainCommand.args.sArgs?.pArgs!! val args = MainCommand.args.sArgs?.pArgs!!
if (args.excludedPatches.contains(patchName)) { if (args.excludedPatches.contains(patchName)) {
logger.info("$prefix: Explicitely excluded") logger.info("$prefix: Explicitly excluded")
return@patch return@patch
} else if ((!patch.include || args.defaultExclude) && !args.includedPatches.contains(patchName)) { } else if ((!patch.include || args.defaultExclude) && !args.includedPatches.contains(patchName)) {
logger.info("$prefix: Not explicitly included") logger.info("$prefix: Not explicitly included")