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/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt

@@ -0,0 +1,47 @@
+package app.revanced.patches.youtube.interaction.copyvideourl
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.youtube.misc.playercontrols.PlayerControlsBytecodePatch
+import app.revanced.patches.youtube.video.information.VideoInformationPatch
+
+@Patch(
+    name = "Copy video url",
+    description = "Adds buttons in player to copy video links.",
+    dependencies = [
+        CopyVideoUrlResourcePatch::class,
+        PlayerControlsBytecodePatch::class,
+        VideoInformationPatch::class
+    ],
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.google.android.youtube",
+            [
+                "18.16.37",
+                "18.19.35",
+                "18.20.39",
+                "18.23.35",
+                "18.29.38",
+                "18.32.39"
+            ]
+        )
+    ]
+)
+@Suppress("unused")
+object CopyVideoUrlBytecodePatch : BytecodePatch() {
+    private const val INTEGRATIONS_PLAYER_PACKAGE = "Lapp/revanced/integrations/videoplayer"
+    private val BUTTONS_DESCRIPTORS = listOf(
+        "$INTEGRATIONS_PLAYER_PACKAGE/CopyVideoUrlButton;",
+        "$INTEGRATIONS_PLAYER_PACKAGE/CopyVideoUrlTimestampButton;"
+    )
+
+    override fun execute(context: BytecodeContext) {
+        // Initialize buttons and inject visibility control
+        BUTTONS_DESCRIPTORS.forEach { descriptor ->
+            PlayerControlsBytecodePatch.initializeControl("$descriptor->initializeButton(Landroid/view/View;)V")
+            PlayerControlsBytecodePatch.injectVisibilityCheckCall("$descriptor->changeVisibility(Z)V")
+        }
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlResourcePatch.kt

@@ -1,19 +1,24 @@
-package app.revanced.patches.youtube.interaction.copyvideourl.resource.patch
+package app.revanced.patches.youtube.interaction.copyvideourl
 
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.playercontrols.resource.patch.BottomControlsResourcePatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.playercontrols.BottomControlsResourcePatch
+import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.util.resources.ResourceUtils
 import app.revanced.util.resources.ResourceUtils.copyResources
 import app.revanced.util.resources.ResourceUtils.mergeStrings
 
-@DependsOn([BottomControlsResourcePatch::class, SettingsPatch::class])
-class CopyVideoUrlResourcePatch : ResourcePatch {
+@Patch(
+    dependencies = [
+        BottomControlsResourcePatch::class,
+        SettingsPatch::class
+    ]
+)
+object CopyVideoUrlResourcePatch : ResourcePatch() {
     override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(
             PreferenceScreen(

src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/annotation/CopyVideoUrlCompatibility.kt

@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.interaction.copyvideourl.annotation
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35", "18.29.38", "18.32.39"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class CopyVideoUrlCompatibility

src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/bytecode/patch/CopyVideoUrlBytecodePatch.kt

@@ -1,40 +0,0 @@
-package app.revanced.patches.youtube.interaction.copyvideourl.bytecode.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.interaction.copyvideourl.annotation.CopyVideoUrlCompatibility
-import app.revanced.patches.youtube.interaction.copyvideourl.resource.patch.CopyVideoUrlResourcePatch
-import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
-import app.revanced.patches.youtube.video.information.patch.VideoInformationPatch
-
-@Patch
-@Name("Copy video url")
-@Description("Adds buttons in player to copy video links.")
-@DependsOn([
-    CopyVideoUrlResourcePatch::class,
-    PlayerControlsBytecodePatch::class,
-    VideoInformationPatch::class
-])
-@CopyVideoUrlCompatibility
-class CopyVideoUrlBytecodePatch : BytecodePatch() {
-    private companion object {
-        const val INTEGRATIONS_PLAYER_PACKAGE = "Lapp/revanced/integrations/videoplayer"
-        val BUTTONS_DESCRIPTORS = listOf(
-            "$INTEGRATIONS_PLAYER_PACKAGE/CopyVideoUrlButton;",
-            "$INTEGRATIONS_PLAYER_PACKAGE/CopyVideoUrlTimestampButton;"
-        )
-    }
-
-    override fun execute(context: BytecodeContext) {
-
-        // Initialize buttons and inject visibility control
-        BUTTONS_DESCRIPTORS.forEach { descriptor ->
-            PlayerControlsBytecodePatch.initializeControl("$descriptor->initializeButton(Landroid/view/View;)V")
-            PlayerControlsBytecodePatch.injectVisibilityCheckCall("$descriptor->changeVisibility(Z)V")
-        }
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/ExternalDownloadsBytecodePatch.kt

@@ -0,0 +1,51 @@
+package app.revanced.patches.youtube.interaction.downloads
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.youtube.misc.playercontrols.PlayerControlsBytecodePatch
+import app.revanced.patches.youtube.video.information.VideoInformationPatch
+
+@Patch(
+    name = "External downloads",
+    description = "Adds support to download and save YouTube videos using an external app.",
+    dependencies = [
+        ExternalDownloadsResourcePatch::class,
+        PlayerControlsBytecodePatch::class,
+        VideoInformationPatch::class
+    ],
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.google.android.youtube",
+            [
+                "18.16.37",
+                "18.19.35",
+                "18.20.39",
+                "18.23.35",
+                "18.29.38",
+                "18.32.39"
+            ]
+        ),
+    ]
+)
+@Suppress("unused")
+object ExternalDownloadsBytecodePatch : BytecodePatch() {
+    private const val BUTTON_DESCRIPTOR = "Lapp/revanced/integrations/videoplayer/ExternalDownloadButton;"
+
+    override fun execute(context: BytecodeContext) {
+        /*
+        initialize the control
+         */
+
+        PlayerControlsBytecodePatch.initializeControl(
+            "$BUTTON_DESCRIPTOR->initializeButton(Landroid/view/View;)V")
+
+        /*
+         add code to change the visibility of the control
+         */
+
+        PlayerControlsBytecodePatch.injectVisibilityCheckCall(
+            "$BUTTON_DESCRIPTOR->changeVisibility(Z)V")
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/ExternalDownloadsResourcePatch.kt

@@ -1,17 +1,22 @@
-package app.revanced.patches.youtube.interaction.downloads.resource.patch
+package app.revanced.patches.youtube.interaction.downloads
 
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.shared.settings.preference.impl.*
-import app.revanced.patches.youtube.misc.playercontrols.resource.patch.BottomControlsResourcePatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.playercontrols.BottomControlsResourcePatch
+import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.util.resources.ResourceUtils
 import app.revanced.util.resources.ResourceUtils.copyResources
 import app.revanced.util.resources.ResourceUtils.mergeStrings
 
-@DependsOn([BottomControlsResourcePatch::class, SettingsPatch::class])
-class ExternalDownloadsResourcePatch : ResourcePatch {
+@Patch(
+    dependencies = [
+        BottomControlsResourcePatch::class,
+        SettingsPatch::class
+    ]
+)
+object ExternalDownloadsResourcePatch : ResourcePatch() {
 
     override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(

src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/annotation/ExternalDownloadsCompatibility.kt

@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.interaction.downloads.annotation
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35", "18.29.38", "18.32.39"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class ExternalDownloadsCompatibility
-

src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/bytecode/patch/ExternalDownloadsBytecodePatch.kt

@@ -1,39 +0,0 @@
-package app.revanced.patches.youtube.interaction.downloads.bytecode.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.interaction.downloads.annotation.ExternalDownloadsCompatibility
-import app.revanced.patches.youtube.interaction.downloads.resource.patch.ExternalDownloadsResourcePatch
-import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
-import app.revanced.patches.youtube.video.information.patch.VideoInformationPatch
-
-@Patch
-@Name("External downloads")
-@DependsOn([ExternalDownloadsResourcePatch::class, PlayerControlsBytecodePatch::class, VideoInformationPatch::class])
-@Description("Adds support to download and save YouTube videos using an external app.")
-@ExternalDownloadsCompatibility
-class ExternalDownloadsBytecodePatch : BytecodePatch() {
-    private companion object {
-        const val BUTTON_DESCRIPTOR = "Lapp/revanced/integrations/videoplayer/ExternalDownloadButton;"
-    }
-
-    override fun execute(context: BytecodeContext) {
-        /*
-        initialize the control
-         */
-
-        PlayerControlsBytecodePatch.initializeControl(
-            "$BUTTON_DESCRIPTOR->initializeButton(Landroid/view/View;)V")
-
-        /*
-         add code to change the visibility of the control
-         */
-
-        PlayerControlsBytecodePatch.injectVisibilityCheckCall(
-            "$BUTTON_DESCRIPTOR->changeVisibility(Z)V")
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt

@@ -1,33 +1,47 @@
-package app.revanced.patches.youtube.interaction.seekbar.patch
+package app.revanced.patches.youtube.interaction.seekbar
 
 import app.revanced.extensions.exception
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 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.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.youtube.interaction.seekbar.annotation.SeekbarTappingCompatibility
 import app.revanced.patches.youtube.interaction.seekbar.fingerprints.OnTouchEventHandlerFingerprint
 import app.revanced.patches.youtube.interaction.seekbar.fingerprints.SeekbarTappingFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.instruction.NarrowLiteralInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
+import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
-@Patch
-@DependsOn([IntegrationsPatch::class, EnableSeekbarTappingResourcePatch::class])
-@Name("Seekbar tapping")
-@Description("Enables tap-to-seek on the seekbar of the video player.")
-@SeekbarTappingCompatibility
-class EnableSeekbarTappingPatch : BytecodePatch(
-    listOf(OnTouchEventHandlerFingerprint, SeekbarTappingFingerprint)
+@Patch(
+    name = "Seekbar tapping",
+    description = "Enables tap-to-seek on the seekbar of the video player.",
+    dependencies = [
+        IntegrationsPatch::class,
+        EnableSeekbarTappingResourcePatch::class
+    ],
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.google.android.youtube",
+            [
+                "18.16.37",
+                "18.19.35",
+                "18.20.39",
+                "18.23.35",
+                "18.29.38",
+                "18.32.39"
+            ]
+        )
+    ]
+)
+@Suppress("unused")
+object EnableSeekbarTappingPatch : BytecodePatch(
+    setOf(
+        OnTouchEventHandlerFingerprint,
+        SeekbarTappingFingerprint
+    )
 ) {
     override fun execute(context: BytecodeContext) {
         // Find the required methods to tap the seekbar.

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingResourcePatch.kt

@@ -1,14 +1,16 @@
-package app.revanced.patches.youtube.interaction.seekbar.patch
+package app.revanced.patches.youtube.interaction.seekbar
 
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.SettingsPatch
 
-@DependsOn([SettingsPatch::class])
-class EnableSeekbarTappingResourcePatch : ResourcePatch {
+@Patch(
+    dependencies = [SettingsPatch::class]
+)
+object EnableSeekbarTappingResourcePatch : ResourcePatch() {
     override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(
             SwitchPreference(

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/annotation/SeekbarTappingCompatibility.kt

@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.interaction.seekbar.annotation
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35", "18.29.38", "18.32.39"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class SeekbarTappingCompatibility
-

src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsBytecodePatch.kt

@@ -1,36 +1,44 @@
-package app.revanced.patches.youtube.interaction.swipecontrols.patch.bytecode
+package app.revanced.patches.youtube.interaction.swipecontrols
 
 import app.revanced.extensions.transformMethods
 import app.revanced.extensions.traverseClassHierarchy
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 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.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patches.shared.fingerprints.WatchWhileActivityFingerprint
-import app.revanced.patches.youtube.interaction.swipecontrols.annotation.SwipeControlsCompatibility
 import app.revanced.patches.youtube.interaction.swipecontrols.fingerprints.SwipeControlsHostActivityFingerprint
-import app.revanced.patches.youtube.interaction.swipecontrols.patch.resource.SwipeControlsResourcePatch
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
+import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
+import app.revanced.patches.youtube.misc.playertype.PlayerTypeHookPatch
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
 
-@Patch
-@Name("Swipe controls")
-@Description("Adds volume and brightness swipe controls.")
-@SwipeControlsCompatibility
-@DependsOn(
-    [
+@Patch(
+    name = "Swipe controls",
+    description = "Adds volume and brightness swipe controls.",
+    dependencies = [
         IntegrationsPatch::class,
         PlayerTypeHookPatch::class,
         SwipeControlsResourcePatch::class
+    ],
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.google.android.youtube",
+            [
+                "18.16.37",
+                "18.19.35",
+                "18.20.39",
+                "18.23.35",
+                "18.29.38",
+                "18.32.39"
+            ]
+        )
     ]
 )
-class SwipeControlsBytecodePatch : BytecodePatch(
-    listOf(
+@Suppress("unused")
+object SwipeControlsBytecodePatch : BytecodePatch(
+    setOf(
         WatchWhileActivityFingerprint,
         SwipeControlsHostActivityFingerprint
     )

src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsResourcePatch.kt

@@ -1,15 +1,17 @@
-package app.revanced.patches.youtube.interaction.swipecontrols.patch.resource
+package app.revanced.patches.youtube.interaction.swipecontrols
 
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.shared.settings.preference.impl.*
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.util.resources.ResourceUtils
 import app.revanced.util.resources.ResourceUtils.copyResources
 
-@DependsOn([SettingsPatch::class])
-class SwipeControlsResourcePatch : ResourcePatch {
+@Patch(
+    dependencies = [SettingsPatch::class]
+)
+object SwipeControlsResourcePatch : ResourcePatch() {
     override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(
             PreferenceScreen(

src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/annotation/SwipeControlsCompatibility.kt

@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.interaction.swipecontrols.annotation
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35", "18.29.38", "18.32.39"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class SwipeControlsCompatibility