build(Needs bump): Bump dependencies (#2946)

Co-authored-by: Ushie <ushiekane@gmail.com>
Co-authored-by: aAbed <aabedhkhan@gmail.com>
Co-authored-by: CnC-Robert <CnC.Rob3rt@gmail.com>

src/main/kotlin/app/revanced/patches/reddit/ad/banner/HideBannerPatch.kt

@@ -1,13 +1,13 @@
-package app.revanced.patches.reddit.ad.banner.patch
+package app.revanced.patches.reddit.ad.banner
 
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotation.Patch
+
+@Patch(description = "Hides banner ads from comments on subreddits.")
+object HideBannerPatch : ResourcePatch() {
+    private const val RESOURCE_FILE_PATH = "res/layout/merge_listheader_link_detail.xml"
 
-@Name("Hide subreddit banner")
-@Description("Hides banner ads from comments on subreddits.")
-class HideBannerPatch : ResourcePatch {
     override fun execute(context: ResourceContext) {
         context.xmlEditor[RESOURCE_FILE_PATH].use {
             it.file.getElementsByTagName("merge").item(0).childNodes.apply {
@@ -29,9 +29,5 @@ class HideBannerPatch : ResourcePatch {
             }
         }
     }
-
-    private companion object {
-        const val RESOURCE_FILE_PATH = "res/layout/merge_listheader_link_detail.xml"
-    }
 }
 

src/main/kotlin/app/revanced/patches/reddit/ad/comments/HideCommentAdsPatch.kt

@@ -0,0 +1,22 @@
+package app.revanced.patches.reddit.ad.comments
+
+import app.revanced.extensions.exception
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.reddit.ad.comments.fingerprints.HideCommentAdsFingerprint
+
+@Patch(description = "Removes ads in the comments.",)
+object HideCommentAdsPatch : BytecodePatch(
+    setOf(HideCommentAdsFingerprint)
+) {
+    // Returns a blank object instead of the comment ad.
+    override fun execute(context: BytecodeContext) = HideCommentAdsFingerprint.result?.mutableMethod?.addInstructions(
+        0, """
+            new-instance v0, Ljava/lang/Object;
+            invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+            return-object v0
+            """
+    ) ?: throw HideCommentAdsFingerprint.exception
+}

src/main/kotlin/app/revanced/patches/reddit/ad/comments/patch/HideCommentAdsPatch.kt

@@ -1,27 +0,0 @@
-package app.revanced.patches.reddit.ad.comments.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patches.reddit.ad.comments.fingerprints.HideCommentAdsFingerprint
-
-@Name("Hide comment ads")
-@Description("Removes all comment ads.")
-class HideCommentAdsPatch : BytecodePatch(
-    listOf(HideCommentAdsFingerprint)
-) {
-    override fun execute(context: BytecodeContext) {
-        val method = HideCommentAdsFingerprint.result!!.mutableMethod
-        // Returns a blank object instead of the comment ad.
-        method.addInstructions(
-            0,
-            """
-            new-instance v0, Ljava/lang/Object;
-            invoke-direct {v0}, Ljava/lang/Object;-><init>()V
-            return-object v0
-            """
-        )
-    }
-}

src/main/kotlin/app/revanced/patches/reddit/ad/general/HideAdsPatch.kt

@@ -1,17 +1,13 @@
-package app.revanced.patches.reddit.ad.general.patch
+package app.revanced.patches.reddit.ad.general
 
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.annotations.RequiresIntegrations
-import app.revanced.patches.reddit.ad.banner.patch.HideBannerPatch
-import app.revanced.patches.reddit.ad.comments.patch.HideCommentAdsPatch
-import app.revanced.patches.reddit.ad.general.annotations.HideAdsCompatibility
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.reddit.ad.banner.HideBannerPatch
+import app.revanced.patches.reddit.ad.comments.HideCommentAdsPatch
 import app.revanced.patches.reddit.ad.general.fingerprints.AdPostFingerprint
 import app.revanced.patches.reddit.ad.general.fingerprints.NewAdPostFingerprint
 import com.android.tools.smali.dexlib2.Opcode
@@ -20,15 +16,19 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction22c
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
-@Patch
-@Name("Hide ads")
-@Description("Removes ads from the Reddit.")
-@DependsOn([HideBannerPatch::class, HideCommentAdsPatch::class])
-@HideAdsCompatibility
-@RequiresIntegrations
-class HideAdsPatch : BytecodePatch(
-    listOf(AdPostFingerprint, NewAdPostFingerprint)
-) {
+
+@Patch(
+    name = "Hide ads",
+    dependencies = [HideBannerPatch::class, HideCommentAdsPatch::class],
+    compatiblePackages = [CompatiblePackage("com.reddit.frontpage")],
+    requiresIntegrations = true,
+)
+@Suppress("unused")
+object HideAdsPatch : BytecodePatch(setOf(AdPostFingerprint, NewAdPostFingerprint)) {
+    private const val FILTER_METHOD_DESCRIPTOR =
+        "Lapp/revanced/reddit/patches/FilterPromotedLinksPatch;" +
+                "->filterChildren(Ljava/lang/Iterable;)Ljava/util/List;"
+
     override fun execute(context: BytecodeContext) {
         // region Filter promoted ads (does not work in popular or latest feed)
 
@@ -77,10 +77,4 @@ class HideAdsPatch : BytecodePatch(
 
         // endregion
     }
-
-    private companion object {
-        private const val FILTER_METHOD_DESCRIPTOR =
-            "Lapp/revanced/reddit/patches/FilterPromotedLinksPatch;" +
-                    "->filterChildren(Ljava/lang/Iterable;)Ljava/util/List;"
-    }
 }

src/main/kotlin/app/revanced/patches/reddit/ad/general/annotations/HideAdsCompatibility.kt

@@ -1,8 +0,0 @@
-package app.revanced.patches.reddit.ad.general.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.reddit.frontpage")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideAdsCompatibility