Compare commits

..

9 Commits

Author SHA1 Message Date
semantic-release-bot
61235d7c41 chore(release): 1.1.3 [skip ci]
## [1.1.3](https://github.com/revanced/revanced-cli/compare/v1.1.2...v1.1.3) (2022-05-25)

### Bug Fixes

* only accept directories when looking for files in resource patch ([c76da7e](c76da7e5ff))
2022-05-25 22:42:14 +00:00
oSumAtrIX
817154dd66 Merge pull request #18 from danthe1st/main
fix: only accept directories when looking for files in resource patch
2022-05-26 00:40:39 +02:00
danthe1st
c76da7e5ff fix: only accept directories when looking for files in resource patch 2022-05-26 00:31:29 +02:00
oSumAtrIX
d946333c96 Merge remote-tracking branch 'origin/main' 2022-05-24 02:10:15 +02:00
oSumAtrIX
97a036bfbc chore: update kotlin jvm
Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>
2022-05-24 00:17:02 +02:00
oSumAtrIX
153d8ce746 chore: update dependencies
Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>
2022-05-23 20:56:22 +02:00
oSumAtrIX
5cd3ea291c refactor: remove unused Patches class
Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>
2022-05-23 20:35:03 +02:00
semantic-release-bot
c8a5e97f0d chore(release): 1.1.2 [skip ci]
## [1.1.2](https://github.com/revanced/revanced-cli/compare/v1.1.1...v1.1.2) (2022-05-22)

### Bug Fixes

* delete `outputFile` after deploying ([329f8a3](329f8a383f))
2022-05-22 20:39:34 +00:00
oSumAtrIX
329f8a383f fix: delete outputFile after deploying 2022-05-22 22:38:27 +02:00
7 changed files with 28 additions and 14 deletions

2
.idea/vcs.xml generated
View File

@@ -8,5 +8,7 @@
</component>
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../revanced-patcher" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../revanced-patches" vcs="Git" />
</component>
</project>

View File

@@ -1,3 +1,17 @@
## [1.1.3](https://github.com/revanced/revanced-cli/compare/v1.1.2...v1.1.3) (2022-05-25)
### Bug Fixes
* only accept directories when looking for files in resource patch ([c76da7e](https://github.com/revanced/revanced-cli/commit/c76da7e5ffa208860eea008dad358e4e3bb3d735))
## [1.1.2](https://github.com/revanced/revanced-cli/compare/v1.1.1...v1.1.2) (2022-05-22)
### Bug Fixes
* delete `outputFile` after deploying ([329f8a3](https://github.com/revanced/revanced-cli/commit/329f8a383fe52f4c2a66075d893c6599d3550bee))
## [1.1.1](https://github.com/revanced/revanced-cli/compare/v1.1.0...v1.1.1) (2022-05-22)

View File

@@ -1,5 +1,5 @@
plugins {
kotlin("jvm") version "1.6.20"
kotlin("jvm") version "1.6.21"
id("com.github.johnrengelman.shadow") version "7.1.2"
java
`maven-publish`
@@ -23,15 +23,15 @@ repositories {
}
dependencies {
implementation(kotlin("stdlib"))
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
implementation("app.revanced:revanced-patcher:+")
implementation("app.revanced:revanced-patches:+")
implementation("info.picocli:picocli:+")
implementation("info.picocli:picocli:4.6.3")
implementation("com.github.li-wjohnson:jadb:master-SNAPSHOT") // using a fork instead.
implementation("org.bouncycastle:bcpkix-jdk15on:+")
implementation(kotlin("reflect"))
implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.21")
}
java {

View File

@@ -1,2 +1,2 @@
kotlin.code.style = official
version = 1.1.1
version = 1.1.3

View File

@@ -87,11 +87,10 @@ internal object MainCommand : Runnable {
Patcher.start(patcher)
if (clean) {
File(cacheDirectory).deleteRecursively()
outputFile.delete()
}
if (clean) File(cacheDirectory).deleteRecursively()
adb?.deploy()
if (clean) outputFile.delete()
}
}
}

View File

@@ -6,6 +6,7 @@ import app.revanced.utils.patcher.applyPatchesPrint
import app.revanced.utils.patcher.mergeFiles
import app.revanced.utils.signing.Signer
import java.io.File
import java.io.FileFilter
internal class Patcher {
internal companion object {
@@ -30,7 +31,7 @@ internal class Patcher {
}
if (MainCommand.patchResources) {
for (file in File(MainCommand.cacheDirectory).resolve("build/").listFiles()?.first()?.listFiles()!!) {
for (file in File(MainCommand.cacheDirectory).resolve("build/").listFiles(FileFilter { it.isDirectory })?.first()?.listFiles()!!) {
if (!file.isDirectory) {
zipFileSystem.replaceFile(file.name, file.readBytes())
continue

View File

@@ -1,2 +0,0 @@
package app.revanced.patch