Skip to content

Commit 206f202

Browse files
committed
fix: invalid code flow when adding patches
1 parent 04e0027 commit 206f202

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

.github/workflows/release.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: Release
22
on:
3+
workflow_dispatch:
34
push:
45
branches:
56
- main

build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ repositories {
2424

2525
dependencies {
2626
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
27-
implementation("app.revanced:revanced-patcher:1.0.0-dev.16")
27+
implementation("app.revanced:revanced-patcher:1.0.0-dev.17")
2828
implementation("app.revanced:revanced-patches:1.0.0-dev.11")
2929

3030
implementation("info.picocli:picocli:4.6.3")
@@ -68,4 +68,4 @@ publishing {
6868
from(components["java"])
6969
}
7070
}
71-
}
71+
}

src/main/kotlin/app/revanced/cli/MainCommand.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ internal object MainCommand : Runnable {
5858
for (it in JarPatchBundle(patchBundlePath).loadPatches())
5959
println(
6060
"[available] ${
61-
it.javaClass.findAnnotationRecursively(
61+
it.findAnnotationRecursively(
6262
Name::class.java
63-
)?.name ?: Name::class.java.name
63+
)?.name ?: it::class.java.name
6464
}"
6565
)
6666
return

src/main/kotlin/app/revanced/utils/patcher/Patcher.kt

+5-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fun Patcher.addPatchesFiltered(
2424

2525
val compatibilityAnnotation = patch.javaClass.findAnnotationRecursively(Compatibility::class.java)
2626

27-
val patchName = patch.javaClass.findAnnotationRecursively(Name::class.java)?.name ?: Name::class.java.name
27+
val patchName = patch.javaClass.findAnnotationRecursively(Name::class.java)?.name ?: patch.javaClass.name
2828

2929
val prefix = "[skipped] $patchName"
3030

@@ -47,9 +47,10 @@ fun Patcher.addPatchesFiltered(
4747
return@patch
4848
}
4949

50-
if (!packageVersionCompatibilityFilter || compatiblePackage.versions.any { it == packageVersion }) return@patch
51-
println("$prefix: Unsupported version.")
52-
return@patch
50+
if (packageVersionCompatibilityFilter && !compatiblePackage.versions.any { it == packageVersion }) {
51+
println("$prefix: Unsupported version.")
52+
return@patch
53+
}
5354
}
5455
}
5556

0 commit comments

Comments
 (0)