From 4ae9ad09d64a3f69512ccb037f816cb847d7350f Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Tue, 4 Oct 2022 08:16:58 +0200 Subject: [PATCH] feat: remove unused annotation `SincePatcher` BREAKING CHANGE: The annotation does not exist anymore and any use should be removed --- src/main/kotlin/app/revanced/patcher/Patcher.kt | 13 +------------ .../app/revanced/patcher/annotation/SincePatcher.kt | 13 ------------- .../patcher/extensions/AnnotationExtensions.kt | 1 - 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 src/main/kotlin/app/revanced/patcher/annotation/SincePatcher.kt diff --git a/src/main/kotlin/app/revanced/patcher/Patcher.kt b/src/main/kotlin/app/revanced/patcher/Patcher.kt index 1299043f..c187fbe1 100644 --- a/src/main/kotlin/app/revanced/patcher/Patcher.kt +++ b/src/main/kotlin/app/revanced/patcher/Patcher.kt @@ -5,7 +5,6 @@ import app.revanced.patcher.data.impl.findIndexed import app.revanced.patcher.extensions.PatchExtensions.dependencies import app.revanced.patcher.extensions.PatchExtensions.deprecated import app.revanced.patcher.extensions.PatchExtensions.patchName -import app.revanced.patcher.extensions.PatchExtensions.sincePatcherVersion import app.revanced.patcher.extensions.nullOutputStream import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve import app.revanced.patcher.patch.Patch @@ -213,17 +212,7 @@ class Patcher(private val options: PatcherOptions) { }.dependencies?.forEach { it.java.isResource() } } - data.patches.addAll( - patches.onEach(Class>::isResource).onEach { patch -> - val needsVersion = patch.sincePatcherVersion - if (needsVersion != null && needsVersion > version) { - logger.error("Patch '${patch.patchName}' requires Patcher version $needsVersion or higher") - logger.error("Current Patcher version is $version") - logger.warn("Skipping '${patch.patchName}'!") - return@onEach // TODO: continue or halt/throw? - } - } - ) + data.patches.addAll(patches.onEach(Class>::isResource)) } /** diff --git a/src/main/kotlin/app/revanced/patcher/annotation/SincePatcher.kt b/src/main/kotlin/app/revanced/patcher/annotation/SincePatcher.kt deleted file mode 100644 index 880096d2..00000000 --- a/src/main/kotlin/app/revanced/patcher/annotation/SincePatcher.kt +++ /dev/null @@ -1,13 +0,0 @@ -package app.revanced.patcher.annotation - -import app.revanced.patcher.patch.Patch -import app.revanced.patcher.Patcher - -/** - * Declares a [Patch] deprecated for removal. - * @param version The minimum version of the [Patcher] this [Patch] supports. - */ -@Target(AnnotationTarget.CLASS) -@Retention(AnnotationRetention.RUNTIME) -@MustBeDocumented -annotation class SincePatcher(val version: String) diff --git a/src/main/kotlin/app/revanced/patcher/extensions/AnnotationExtensions.kt b/src/main/kotlin/app/revanced/patcher/extensions/AnnotationExtensions.kt index 91d44c79..6c26d84c 100644 --- a/src/main/kotlin/app/revanced/patcher/extensions/AnnotationExtensions.kt +++ b/src/main/kotlin/app/revanced/patcher/extensions/AnnotationExtensions.kt @@ -58,7 +58,6 @@ object PatchExtensions { if (cl == Patch::class) null else cl } } - val Class>.sincePatcherVersion get() = recursiveAnnotation(SincePatcher::class)?.version @JvmStatic fun Class>.dependsOn(patch: Class>): Boolean {