ReVanced-Mirror/revanced-cli
1
0
Fork 0
mirror of https://github.com/revanced/revanced-cli.git synced 2024-12-03 17:02:54 +01:00
Code Issues Projects Releases Wiki Activity

fix: invalid code flow when adding patches

Browse Source
This commit is contained in:
oSumAtrIX 2022-05-27 12:25:44 +02:00
parent 04e0027c08
commit 206f2029d7
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/release.yml vendored
View File

@ -1,5 +1,6 @@
name: Release name: Release
on: on:
workflow_dispatch:
push: push:
branches: branches:
- main - main

2
build.gradle.kts
View File

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

4
src/main/kotlin/app/revanced/cli/MainCommand.kt
View File

@ -58,9 +58,9 @@ internal object MainCommand : Runnable {
for (it in JarPatchBundle(patchBundlePath).loadPatches()) for (it in JarPatchBundle(patchBundlePath).loadPatches())
println( println(
"[available] ${ "[available] ${
it.javaClass.findAnnotationRecursively( it.findAnnotationRecursively(
Name::class.java Name::class.java
)?.name ?: Name::class.java.name )?.name ?: it::class.java.name
}" }"
) )
return return

5
src/main/kotlin/app/revanced/utils/patcher/Patcher.kt
View File

@ -24,7 +24,7 @@ fun Patcher.addPatchesFiltered(
val compatibilityAnnotation = patch.javaClass.findAnnotationRecursively(Compatibility::class.java) val compatibilityAnnotation = patch.javaClass.findAnnotationRecursively(Compatibility::class.java)
val patchName = patch.javaClass.findAnnotationRecursively(Name::class.java)?.name ?: Name::class.java.name val patchName = patch.javaClass.findAnnotationRecursively(Name::class.java)?.name ?: patch.javaClass.name
val prefix = "[skipped] $patchName" val prefix = "[skipped] $patchName"
@ -47,11 +47,12 @@ fun Patcher.addPatchesFiltered(
return@patch return@patch
} }
if (!packageVersionCompatibilityFilter || compatiblePackage.versions.any { it == packageVersion }) return@patch if (packageVersionCompatibilityFilter && !compatiblePackage.versions.any { it == packageVersion }) {
println("$prefix: Unsupported version.") println("$prefix: Unsupported version.")
return@patch return@patch
} }
} }
}
includedPatches.add(patch) includedPatches.add(patch)
println("[added] $patchName") println("[added] $patchName")