Compare commits

...

2 Commits

Author SHA1 Message Date
semantic-release-bot
a1bcd1fdaf chore(release): 1.1.5 [skip ci]
## [1.1.5](https://github.com/revanced/revanced-cli/compare/v1.1.4...v1.1.5) (2022-05-27)

### Bug Fixes

* invalid code flow when adding patches ([206f202](206f2029d7))
2022-05-27 10:27:42 +00:00
oSumAtrIX
206f2029d7 fix: invalid code flow when adding patches 2022-05-27 12:25:44 +02:00
6 changed files with 18 additions and 9 deletions

View File

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

View File

@@ -1,3 +1,10 @@
## [1.1.5](https://github.com/revanced/revanced-cli/compare/v1.1.4...v1.1.5) (2022-05-27)
### Bug Fixes
* invalid code flow when adding patches ([206f202](https://github.com/revanced/revanced-cli/commit/206f2029d7498b6474c16a47cbe451c170fdd31f))
## [1.1.4](https://github.com/revanced/revanced-cli/compare/v1.1.3...v1.1.4) (2022-05-26) ## [1.1.4](https://github.com/revanced/revanced-cli/compare/v1.1.3...v1.1.4) (2022-05-26)

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")

View File

@@ -1,2 +1,2 @@
kotlin.code.style = official kotlin.code.style = official
version = 1.1.4 version = 1.1.5

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

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,9 +47,10 @@ 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
}
} }
} }