Compare commits

...

8 Commits

Author SHA1 Message Date
semantic-release-bot
bd3773798d chore(release): 1.2.0 [skip ci]
# [1.2.0](https://github.com/revanced/revanced-cli/compare/v1.1.5...v1.2.0) (2022-06-05)

### Bug Fixes

* migrate to latest patcher api changes ([ace70e4](ace70e417f))

### Features

* add path for `cacheDirectory` and enable resource patching by default ([54c0a03](54c0a03d44))
* debugging option ([1b645c6](1b645c67db))
2022-06-05 06:02:17 +00:00
oSumAtrIX
8665661ed7 Merge branch 'dev'
# Conflicts:
#	build.gradle.kts
2022-06-05 08:00:00 +02:00
semantic-release-bot
1c5e5e249d chore(release): 1.2.0-dev.2 [skip ci]
# [1.2.0-dev.2](https://github.com/revanced/revanced-cli/compare/v1.2.0-dev.1...v1.2.0-dev.2) (2022-06-05)

### Features

* debugging option ([1b645c6](1b645c67db))
2022-06-05 05:58:42 +00:00
oSumAtrIX
1b645c67db feat: debugging option 2022-06-05 07:56:53 +02:00
oSumAtrIX
4758289d68 chore: bump patcher dependency 2022-06-04 02:34:03 +02:00
semantic-release-bot
87c0e05d9c chore(release): 1.2.0-dev.1 [skip ci]
# [1.2.0-dev.1](https://github.com/revanced/revanced-cli/compare/v1.1.6-dev.1...v1.2.0-dev.1) (2022-06-04)

### Features

* add path for `cacheDirectory` and enable resource patching by default ([54c0a03](54c0a03d44))
2022-06-04 00:32:25 +00:00
oSumAtrIX
54c0a03d44 feat: add path for cacheDirectory and enable resource patching by default 2022-06-03 17:51:13 +02:00
tillnelown
d6f2609cfa Removes the uneeded revanced-patches dependency 2022-05-31 11:48:45 +02:00
6 changed files with 39 additions and 9 deletions

View File

@@ -1,3 +1,30 @@
# [1.2.0](https://github.com/revanced/revanced-cli/compare/v1.1.5...v1.2.0) (2022-06-05)
### Bug Fixes
* migrate to latest patcher api changes ([ace70e4](https://github.com/revanced/revanced-cli/commit/ace70e417fdf280c7630a5a89a773879fd240e96))
### Features
* add path for `cacheDirectory` and enable resource patching by default ([54c0a03](https://github.com/revanced/revanced-cli/commit/54c0a03d44c8d1b586bc487ee1ca71859d6f0b57))
* debugging option ([1b645c6](https://github.com/revanced/revanced-cli/commit/1b645c67db58eb4d49b5290fd247507c9b43a9c6))
# [1.2.0-dev.2](https://github.com/revanced/revanced-cli/compare/v1.2.0-dev.1...v1.2.0-dev.2) (2022-06-05)
### Features
* debugging option ([1b645c6](https://github.com/revanced/revanced-cli/commit/1b645c67db58eb4d49b5290fd247507c9b43a9c6))
# [1.2.0-dev.1](https://github.com/revanced/revanced-cli/compare/v1.1.6-dev.1...v1.2.0-dev.1) (2022-06-04)
### Features
* add path for `cacheDirectory` and enable resource patching by default ([54c0a03](https://github.com/revanced/revanced-cli/commit/54c0a03d44c8d1b586bc487ee1ca71859d6f0b57))
## [1.1.6-dev.1](https://github.com/revanced/revanced-cli/compare/v1.1.5...v1.1.6-dev.1) (2022-05-31)

View File

@@ -24,7 +24,7 @@ repositories {
dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
implementation("app.revanced:revanced-patcher:1.0.0-dev.17")
implementation("app.revanced:revanced-patcher:1.0.0-dev.18")
implementation("info.picocli:picocli:4.6.3")

View File

@@ -1,2 +1,2 @@
kotlin.code.style = official
version = 1.1.6-dev.1
version = 1.2.0

View File

@@ -22,11 +22,11 @@ internal object MainCommand : Runnable {
@Option(names = ["-p", "--patches"], description = ["One or more bundles of patches"])
internal var patchBundles = arrayOf<String>()
@Option(names = ["-t", "--temp-dir"], description = ["Temporal resource cache directory"], required = true)
internal lateinit var cacheDirectory: String
@Option(names = ["-t", "--temp-dir"], description = ["Temporal resource cache directory"])
internal var cacheDirectory = "revanced-cache"
@Option(names = ["-r", "--resource-patcher"], description = ["Enable patching resources"])
internal var patchResources: Boolean = false
@Option(names = ["-r", "--resource-patcher"], description = ["Disable patching resources"])
internal var disableResourcePatching: Boolean = false
@Option(
names = ["-c", "--clean"],
@@ -52,6 +52,9 @@ internal object MainCommand : Runnable {
@Option(names = ["-d", "--deploy-on"], description = ["If specified, deploy to adb device with given name"])
internal var deploy: String? = null
@Option(names = ["-b", "--debugging"], description = ["Disable patch version compatibility"])
internal var debugging: Boolean = false
override fun run() {
if (listOnly) {
for (patchBundlePath in patchBundles) for (it in JarPatchBundle(patchBundlePath).loadPatches()) {
@@ -65,7 +68,7 @@ internal object MainCommand : Runnable {
return
}
val patcher = app.revanced.patcher.Patcher(PatcherOptions(inputFile, cacheDirectory, patchResources))
val patcher = app.revanced.patcher.Patcher(PatcherOptions(inputFile, cacheDirectory, !disableResourcePatching))
if (signatureCheck) {
patcher.addPatchesFiltered()

View File

@@ -30,7 +30,7 @@ internal class Patcher {
zipFileSystem.replaceFile(name, data.data)
}
if (MainCommand.patchResources) {
if (!MainCommand.disableResourcePatching) {
for (file in File(MainCommand.cacheDirectory).resolve("build/").listFiles(FileFilter { it.isDirectory })
?.first()?.listFiles()!!) {
if (!file.isDirectory) {

View File

@@ -34,7 +34,7 @@ fun Patcher.addPatchesFiltered(
return@patch
}
if (!compatiblePackage.versions.any { it == packageVersion }) {
if (!(MainCommand.debugging || compatiblePackage.versions.any { it == packageVersion })) {
println("$prefix: Unsupported version.")
return@patch
}