chore: merge branch dev to main (#1664)

.gitignore

@@ -121,3 +121,6 @@ gradle-app.setting
 
 # Dependency directories
 node_modules/
+
+# gradle properties, due to Github token
+./gradle.properties

CHANGELOG.md

@@ -1,3 +1,31 @@
+# [2.166.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.165.1...v2.166.0-dev.1) (2023-03-14)
+
+
+### Bug Fixes
+
+* **backdrops/pro-unlock:** constrain to most recent working app version ([#1677](https://github.com/revanced/revanced-patches/issues/1677)) ([7680838](https://github.com/revanced/revanced-patches/commit/768083882952f49b8c867043518ba888603b3049))
+* **instagram/hide-timeline-ads:** fix compatibility with newer versions ([#1672](https://github.com/revanced/revanced-patches/issues/1672)) ([b803e3e](https://github.com/revanced/revanced-patches/commit/b803e3e1a743e32809195e8a358568572a59dac2))
+* **twitch:** misspelling annotations ([675c970](https://github.com/revanced/revanced-patches/commit/675c970041abc30440533f763c5be709abd3f725))
+* **youtube/general-ads:** remove duplicate preference ([89820c6](https://github.com/revanced/revanced-patches/commit/89820c60bb393a6a94bbc868a6fae0501c91d811))
+* **youtube/return-youtube-dislike:** add missing strings ([19047b6](https://github.com/revanced/revanced-patches/commit/19047b6963ff578a70d3d327306e1050f7ce1c70))
+
+
+### Features
+
+* **myexpenses/unlock-pro:** constrain to last working version ([f68c87b](https://github.com/revanced/revanced-patches/commit/f68c87b0edc88e80ef2f3110f75be86236dffdb7))
+* **reddit:** add more compatibility constraints ([65e5c26](https://github.com/revanced/revanced-patches/commit/65e5c2639084f07e1f19b9933febcebc43ad12c4))
+* **reddit:** bump compatibility to `2023.09.1` ([#1729](https://github.com/revanced/revanced-patches/issues/1729)) ([c8997e8](https://github.com/revanced/revanced-patches/commit/c8997e8ca587aedfa4318ace9fc119c262f00933))
+* **twitch:** constraint compatibility to `14.6.1` ([#1736](https://github.com/revanced/revanced-patches/issues/1736)) ([7d4294f](https://github.com/revanced/revanced-patches/commit/7d4294f691e1e2e8a2679e2504a9fd5dc7e05201))
+* **youtube/custom-video-buffer:** replace patch with removal notice ([#1718](https://github.com/revanced/revanced-patches/issues/1718)) ([29f952d](https://github.com/revanced/revanced-patches/commit/29f952d73e07f8f666d4744d6d97374bebfdc3c6))
+* **youtube/disable-player-popup-panels:** use better patch description ([7150662](https://github.com/revanced/revanced-patches/commit/71506625aca42aa4901878c0f706793e17ca5607))
+* **youtube/general-ads:** do not hide components in library tab ([d56d3bd](https://github.com/revanced/revanced-patches/commit/d56d3bd94b8f06ff9f915fe0b0ba3d5f484ea971))
+* **youtube/general-ads:** hide image shelf from search results ([e4c2450](https://github.com/revanced/revanced-patches/commit/e4c2450ebac4cacae64a81060de8c146ba542e37))
+* **youtube/hide-autoplay-button:** do not disable autoplay button when hidden ([98d0084](https://github.com/revanced/revanced-patches/commit/98d00848c9a0aa0247d77e9ae16450697a6c154c))
+* **youtube:** `hide-floating-microphone-button` patch ([8f33b11](https://github.com/revanced/revanced-patches/commit/8f33b110facb8f8a04416459f3d715bc77002231))
+* **youtube:** bump compatibility to `18.05.40` ([#1704](https://github.com/revanced/revanced-patches/issues/1704)) ([77fe23b](https://github.com/revanced/revanced-patches/commit/77fe23b53e27b7b6a1c48ba0cfeb182ae99f9ab8))
+* **youtube:** bump compatibility to `18.05.40` ([#1743](https://github.com/revanced/revanced-patches/issues/1743)) ([1090388](https://github.com/revanced/revanced-patches/commit/109038839574f7ba07f91ef27b61d6a650f2ef34))
+* **youtubevanced:** `general-ads` patch ([#1693](https://github.com/revanced/revanced-patches/issues/1693)) ([b6ca3b4](https://github.com/revanced/revanced-patches/commit/b6ca3b4491cc0a5c42b6a52ec48ad0ff8a54f0b2))
+
 ## [2.165.1](https://github.com/revanced/revanced-patches/compare/v2.165.0...v2.165.1) (2023-03-14)
 
 

README.md

@@ -9,59 +9,60 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `always-autorepeat` | Always repeats the playing video again. | 18.03.36 |
+| `always-autorepeat` | Always repeats the playing video again. | 18.05.40 |
 | `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
-| `comments` | Hides components related to comments. | 18.03.36 |
+| `comments` | Hides components related to comments. | 18.05.40 |
-| `copy-video-url` | Adds buttons in player to copy video links. | 18.03.36 |
+| `copy-video-url` | Adds buttons in player to copy video links. | 18.05.40 |
 | `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
-| `custom-video-buffer` | Lets you change the buffers of videos. | 18.03.36 |
+| `custom-video-buffer` | Lets you change the buffers of videos. | 18.05.40 |
-| `custom-video-speed` | Adds more video speed options. | 18.03.36 |
+| `custom-video-speed` | Adds more video speed options. | 18.05.40 |
 | `debugging` | Adds debugging options. | all |
-| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 18.03.36 |
+| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 18.05.40 |
-| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 18.03.36 |
+| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 18.05.40 |
-| `disable-fullscreen-panels-auto-popup` | Disables fullscreen panels from appearing automatically when going fullscreen (playlist or live chat). | 18.03.36 |
+| `disable-player-popup-panels` | Disables panels from appearing automatically when going into fullscreen (playlist or live chat). | 18.05.40 |
-| `disable-shorts-on-startup` | Disables playing YouTube Shorts when launching YouTube. | 18.03.36 |
+| `disable-shorts-on-startup` | Disables playing YouTube Shorts when launching YouTube. | 18.05.40 |
 | `disable-zoom-haptics` | Disables haptics when zooming. | all |
-| `downloads` | Enables downloading music and videos from YouTube. | 18.03.36 |
+| `downloads` | Enables downloading music and videos from YouTube. | 18.05.40 |
-| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 18.03.36 |
+| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 18.05.40 |
-| `general-ads` | Removes general ads. | 18.03.36 |
+| `general-ads` | Removes general ads. | 18.05.40 |
-| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 18.03.36 |
+| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 18.05.40 |
-| `hide-album-cards` | Hides the album cards below the artist description. | 18.03.36 |
+| `hide-album-cards` | Hides the album cards below the artist description. | 18.05.40 |
-| `hide-artist-card` | Hides the artist card below the searchbar. | 18.03.36 |
+| `hide-artist-card` | Hides the artist card below the searchbar. | 18.05.40 |
-| `hide-autoplay-button` | Hides the autoplay button in the video player. | 18.03.36 |
+| `hide-autoplay-button` | Hides the autoplay button in the video player. | 18.05.40 |
-| `hide-breaking-news-shelf` | Hides the breaking news shelf on the homepage tab. | 18.03.36 |
+| `hide-breaking-news-shelf` | Hides the breaking news shelf on the homepage tab. | 18.05.40 |
-| `hide-captions-button` | Hides the captions button on video player. | 18.03.36 |
+| `hide-captions-button` | Hides the captions button on video player. | 18.05.40 |
 | `hide-cast-button` | Hides the cast button in the video player. | all |
-| `hide-create-button` | Hides the create button in the navigation bar. | 18.03.36 |
+| `hide-create-button` | Hides the create button in the navigation bar. | 18.05.40 |
-| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 18.03.36 |
+| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 18.05.40 |
-| `hide-email-address` | Hides the email address in the account switcher. | 18.03.36 |
+| `hide-email-address` | Hides the email address in the account switcher. | 18.05.40 |
-| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 18.03.36 |
+| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 18.05.40 |
-| `hide-info-cards` | Hides info cards in videos. | 18.03.36 |
+| `hide-floating-microphone-button` | Hides the floating microphone button which appears in search. | 18.05.40 |
-| `hide-my-mix` | Hides mix playlists. | 18.03.36 |
+| `hide-info-cards` | Hides info cards in videos. | 18.05.40 |
+| `hide-my-mix` | Hides mix playlists. | 18.05.40 |
 | `hide-player-buttons` | Adds the option to hide video player previous and next buttons. | all |
-| `hide-seekbar` | Hides the seekbar. | 18.03.36 |
+| `hide-seekbar` | Hides the seekbar. | 18.05.40 |
-| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 18.03.36 |
+| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 18.05.40 |
-| `hide-time` | Hides the videos time. | 18.03.36 |
+| `hide-timestamp` | Hides timestamp in video player. | 18.05.40 |
-| `hide-video-action-buttons` | Adds the options to hide action buttons under a video. | 18.03.36 |
+| `hide-video-action-buttons` | Adds the options to hide action buttons under a video. | 18.05.40 |
-| `hide-watch-in-vr` | Hides the option to watch in VR from the player settings flyout panel. | 18.03.36 |
+| `hide-watch-in-vr` | Hides the option to watch in VR from the player settings flyout panel. | 18.05.40 |
-| `hide-watermark` | Hides creator's watermarks on videos. | 18.03.36 |
+| `hide-watermark` | Hides creator's watermarks on videos. | 18.05.40 |
-| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 18.03.36 |
+| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 18.05.40 |
-| `minimized-playback` | Enables minimized and background playback. | 18.03.36 |
+| `minimized-playback` | Enables minimized and background playback. | 18.05.40 |
-| `old-quality-layout` | Enables the original video quality flyout in the video player settings | 18.03.36 |
+| `old-quality-layout` | Enables the original video quality flyout in the video player settings | 18.05.40 |
-| `open-links-externally` | Open links outside of the app directly in your browser. | 18.03.36 |
+| `open-links-externally` | Open links outside of the app directly in your browser. | 18.05.40 |
 | `premium-heading` | Shows premium branding on the home screen. | all |
-| `remember-playback-rate` | Adds the ability to remember the playback rate you chose in the video playback rate flyout. | 18.03.36 |
+| `remember-playback-rate` | Adds the ability to remember the playback rate you chose in the video playback rate flyout. | 18.05.40 |
-| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 18.03.36 |
+| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 18.05.40 |
-| `remove-player-button-background` | Removes the background from the video player buttons. | 18.03.36 |
+| `remove-player-button-background` | Removes the background from the video player buttons. | 18.05.40 |
-| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 18.03.36 |
+| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 18.05.40 |
-| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 18.03.36 |
+| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 18.05.40 |
-| `sponsorblock` | Integrates SponsorBlock which allows skipping video segments such as sponsored content. | 18.03.36 |
+| `sponsorblock` | Integrates SponsorBlock which allows skipping video segments such as sponsored content. | 18.05.40 |
-| `spoof-app-version` | Tricks YouTube into thinking, you are running an older version of the app. One of the side effects also includes restoring the old UI. | 18.03.36 |
+| `spoof-app-version` | Tricks YouTube into thinking, you are running an older version of the app. One of the side effects also includes restoring the old UI. | 18.05.40 |
-| `spoof-signature-verification` | Spoofs the client to prevent playback issues. | 18.03.36 |
+| `spoof-signature-verification` | Spoofs the client to prevent playback issues. | 18.05.40 |
-| `swipe-controls` | Adds volume and brightness swipe controls. | 18.03.36 |
+| `swipe-controls` | Adds volume and brightness swipe controls. | 18.05.40 |
-| `tablet-mini-player` | Enables the tablet mini player layout. | 18.03.36 |
+| `tablet-mini-player` | Enables the tablet mini player layout. | 18.05.40 |
 | `theme` | Applies a custom theme. | all |
-| `video-ads` | Removes ads in the video player. | 18.03.36 |
+| `video-ads` | Removes ads in the video player. | 18.05.40 |
 </details>
 
 ### [📦 `com.google.android.apps.youtube.music`](https://play.google.com/store/apps/details?id=com.google.android.apps.youtube.music)
@@ -118,9 +119,9 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `block-audio-ads` | Blocks audio ads in streams and VODs. | all |
+| `block-audio-ads` | Blocks audio ads in streams and VODs. | 14.6.1 |
-| `block-embedded-ads` | Blocks embedded steam ads using services like TTV.lol or PurpleAdBlocker. | all |
+| `block-embedded-ads` | Blocks embedded steam ads using services like TTV.lol or PurpleAdBlocker. | 14.6.1 |
-| `block-video-ads` | Blocks video ads in streams and VODs. | all |
+| `block-video-ads` | Blocks video ads in streams and VODs. | 14.6.1 |
 | `debug-mode` | Enables Twitch's internal debugging mode. | all |
 | `settings` | Adds settings menu to Twitch. | all |
 | `show-deleted-messages` | Shows deleted chat messages behind a clickable spoiler. | all |
@@ -153,11 +154,20 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | 2023.05.0 |
+| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | 2023.09.1 |
-| `hide-subreddit-banner` | Hides banner ads from comments on subreddits. | 2023.05.0 |
+| `hide-subreddit-banner` | Hides banner ads from comments on subreddits. | 2023.09.1 |
 | `premium-icon-reddit` | Unlocks premium Reddit app icons. | all |
 </details>
 
+### [📦 `com.vanced.android.youtube`](https://play.google.com/store/apps/details?id=com.vanced.android.youtube)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
+| `hide-ads` | Removes general ads. | all |
+</details>
+
 ### [📦 `at.gv.bmf.bmf2go`](https://play.google.com/store/apps/details?id=at.gv.bmf.bmf2go)
 <details>
 
@@ -176,14 +186,6 @@ The official Patch bundle provided by ReVanced and the community.
 | `spoof-signature` | Spoofs the signature of the app. | 2.5.2 |
 </details>
 
-### [📦 `com.vanced.android.youtube`](https://play.google.com/store/apps/details?id=com.vanced.android.youtube)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
-</details>
-
 ### [📦 `com.myprog.hexedit`](https://play.google.com/store/apps/details?id=com.myprog.hexedit)
 <details>
 
@@ -229,7 +231,7 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `pro-unlock` | Unlocks pro-only functions. | all |
+| `pro-unlock` | Unlocks pro-only functions. | 4.52 |
 </details>
 
 ### [📦 `de.dwd.warnapp`](https://play.google.com/store/apps/details?id=de.dwd.warnapp)
@@ -288,6 +290,22 @@ The official Patch bundle provided by ReVanced and the community.
 | `unlock-prime` | Unlocks Nova Prime and all functions of the app. | all |
 </details>
 
+### [📦 `org.totschnig.myexpenses`](https://play.google.com/store/apps/details?id=org.totschnig.myexpenses)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all professional features. | 3.4.9 |
+</details>
+
+### [📦 `com.awedea.nyx`](https://play.google.com/store/apps/details?id=com.awedea.nyx)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all pro features. | all |
+</details>
+
 ### [📦 `co.windyapp.android`](https://play.google.com/store/apps/details?id=co.windyapp.android)
 <details>
 
@@ -296,6 +314,14 @@ The official Patch bundle provided by ReVanced and the community.
 | `unlock-pro` | Unlocks all pro features. | all |
 </details>
 
+### [📦 `ginlemon.iconpackstudio`](https://play.google.com/store/apps/details?id=ginlemon.iconpackstudio)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all pro features. | all |
+</details>
+
 ### [📦 `com.ithebk.expensemanager`](https://play.google.com/store/apps/details?id=com.ithebk.expensemanager)
 <details>
 
@@ -304,30 +330,6 @@ The official Patch bundle provided by ReVanced and the community.
 | `unlock-pro` | Unlocks pro features. | all |
 </details>
 
-### [📦 `ginlemon.iconpackstudio`](https://play.google.com/store/apps/details?id=ginlemon.iconpackstudio)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks all pro features. | all |
-</details>
-
-### [📦 `com.awedea.nyx`](https://play.google.com/store/apps/details?id=com.awedea.nyx)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks all pro features. | all |
-</details>
-
-### [📦 `org.totschnig.myexpenses`](https://play.google.com/store/apps/details?id=org.totschnig.myexpenses)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks all professional features. | all |
-</details>
-
 ### [📦 `com.ticktick.task`](https://play.google.com/store/apps/details?id=com.ticktick.task)
 <details>
 

build.gradle.kts

@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation("app.revanced:revanced-patcher:6.4.3")
+    implementation("app.revanced:revanced-patcher:7.0.0")
     implementation("app.revanced:multidexlib2:2.5.3-a3836654")
     // Required for meta
     implementation("com.google.code.gson:gson:2.10.1")

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.165.1
+version = 2.166.0-dev.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
+# Resolve links: $0 may be a link
-APP_BASE_NAME=`basename "$0"`
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,105 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-            MAX_FD="$MAX_FD_LIMIT"
+        # shellcheck disable=SC3045
-        fi
+        MAX_FD=$( ulimit -H -n ) ||
-        ulimit -n $MAX_FD
+            warn "Could not query maximum file descriptor limit"
-        if [ $? -ne 0 ] ; then
+    esac
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+    case $MAX_FD in  #(
-        fi
+      '' | soft) :;; #(
-    else
+      *)
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-    fi
+        # shellcheck disable=SC3045
-fi
+        ulimit -n "$MAX_FD" ||
-
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=`save "$@"`
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/main/kotlin/app/revanced/patches/backdrops/misc/pro/annotations/ProUnlockCompatibility.kt

@@ -3,5 +3,5 @@ package app.revanced.patches.backdrops.misc.pro.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("com.backdrops.wallpapers")])
+@Compatibility([Package("com.backdrops.wallpapers", arrayOf("4.52"))])
 internal annotation class ProUnlockCompatibility

src/main/kotlin/app/revanced/patches/finanzonline/detection/shared/annotations/DetectionCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("at.gv.bmf.bmf2go", arrayOf("2.2.0"))])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class DetectionCompatibility

src/main/kotlin/app/revanced/patches/hexeditor/ad/annotations/HexEditorAdsCompatibility.kt

@@ -9,5 +9,4 @@ import app.revanced.patcher.annotation.Package
     ]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class HexEditorAdsCompatibility

src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/annotations/UnlockProCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("ginlemon.iconpackstudio")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class UnlockProCompatibility

src/main/kotlin/app/revanced/patches/idaustria/detection/shared/annotations/DetectionCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("at.gv.oe.app", arrayOf("2.5.2"))])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class DetectionCompatibility

src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ShowAdFingerprint.kt

@@ -21,6 +21,5 @@ object ShowAdFingerprint : MethodFingerprint(
         Opcode.CONST_4,
         Opcode.GOTO,
         Opcode.CONST_4,
-        Opcode.RETURN,
     ),
 )

src/main/kotlin/app/revanced/patches/irplus/ad/annotations/IrplusAdsCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("net.binarymode.android.irplus")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class IrplusAdsCompatibility

src/main/kotlin/app/revanced/patches/moneymanager/annotations/UnlockProCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.ithebk.expensemanager")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class UnlockProCompatibility

src/main/kotlin/app/revanced/patches/music/ad/video/annotations/MusicVideoAdsCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.google.android.apps.youtube.music")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class MusicVideoAdsCompatibility

src/main/kotlin/app/revanced/patches/music/audio/codecs/annotations/CodecsUnlockCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.google.android.apps.youtube.music")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class CodecsUnlockCompatibility

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/annotations/ExclusiveAudioCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.google.android.apps.youtube.music")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class ExclusiveAudioCompatibility

src/main/kotlin/app/revanced/patches/music/layout/compactheader/annotations/CompactHeaderCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.google.android.apps.youtube.music")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class CompactHeaderCompatibility

src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.google.android.apps.youtube.music")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class MinimizedPlaybackCompatibility

src/main/kotlin/app/revanced/patches/music/layout/premium/annotations/HideGetPremiumCompatibility.kt

@@ -28,5 +28,4 @@ import app.revanced.patcher.annotation.Package
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class HideGetPremiumCompatibility

src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/annotations/RemoveTasteBuilderCompatibility.kt

@@ -10,5 +10,4 @@ import app.revanced.patcher.annotation.Package
  */
 @Compatibility([Package("com.google.android.apps.youtube.music")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class RemoveTasteBuilderCompatibility

src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/annotations/RemoveUpgradeButtonCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.google.android.apps.youtube.music")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class RemoveUpgradeButtonCompatibility

src/main/kotlin/app/revanced/patches/music/misc/microg/annotations/MusicMicroGPatchCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.google.android.apps.youtube.music")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class MusicMicroGPatchCompatibility

src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/annotations/BackgroundPlayCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.google.android.apps.youtube.music")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class BackgroundPlayCompatibility

src/main/kotlin/app/revanced/patches/myexpenses/misc/pro/annotations/UnlockProCompatibility.kt

@@ -3,7 +3,6 @@ package app.revanced.patches.myexpenses.misc.pro.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("org.totschnig.myexpenses")])
+@Compatibility([Package("org.totschnig.myexpenses", arrayOf("3.4.9"))])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class UnlockProCompatibility

src/main/kotlin/app/revanced/patches/netguard/broadcasts/removerestriction/resource/annotations/RemoveBroadcastsRestrictionCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("eu.faircode.netguard")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 annotation class RemoveBroadcastsRestrictionCompatibility

src/main/kotlin/app/revanced/patches/nova/prime/annotations/UnlockPrimeCompatibility.kt

@@ -9,5 +9,4 @@ import app.revanced.patcher.annotation.Package
     ]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class UnlockPrimeCompatibility

src/main/kotlin/app/revanced/patches/nyx/misc/pro/annotations/UnlockProCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.awedea.nyx")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class UnlockProCompatibility

src/main/kotlin/app/revanced/patches/photomath/detection/signature/annotations/DisableSignatureDetectionCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.microblink.photomath")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class DisableSignatureDetectionCompatibility

src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/annotations/UnlockPlusCompatibilty.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.microblink.photomath")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class UnlockPlusCompatibilty

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

@@ -5,9 +5,16 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.reddit.frontpage", arrayOf("2023.05.0")
+        "com.reddit.frontpage", arrayOf(
+            "2023.05.0",
+            "2023.06.0",
+            "2023.07.0", 
+            "2023.07.1",
+            "2023.08.0",
+            "2023.09.0",
+            "2023.09.1"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class HideBannerCompatibility

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

@@ -5,9 +5,18 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.reddit.frontpage", arrayOf("2022.43.0", "2023.05.0")
+        "com.reddit.frontpage", arrayOf(
+            "2021.45.0", 
+            "2022.43.0", 
+            "2023.05.0",
+            "2023.06.0",
+            "2023.07.0", 
+            "2023.07.1",
+            "2023.08.0",
+            "2023.09.0",
+            "2023.09.1"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class GeneralAdsCompatibility

src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/annotations/PremiumIconCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.reddit.frontpage")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class PremiumIconCompatibility

src/main/kotlin/app/revanced/patches/shared/misc/fix/spoof/annotations/ClientSpoofCompatibility.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.fix.spoof.annotations
+package app.revanced.patches.shared.misc.fix.spoof.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@@ -10,5 +10,4 @@ import app.revanced.patcher.annotation.Package
     ]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class ClientSpoofCompatibility

src/main/kotlin/app/revanced/patches/shared/misc/fix/spoof/fingerprints/UserAgentHeaderBuilderFingerprint.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.fix.spoof.fingerprints
+package app.revanced.patches.shared.misc.fix.spoof.fingerprints
 
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

src/main/kotlin/app/revanced/patches/shared/misc/fix/spoof/patch/ClientSpoofPatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.fix.spoof.patch
+package app.revanced.patches.shared.misc.fix.spoof.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -10,8 +10,8 @@ import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.misc.fix.spoof.annotations.ClientSpoofCompatibility
+import app.revanced.patches.shared.misc.fix.spoof.annotations.ClientSpoofCompatibility
-import app.revanced.patches.youtube.misc.fix.spoof.fingerprints.UserAgentHeaderBuilderFingerprint
+import app.revanced.patches.shared.misc.fix.spoof.fingerprints.UserAgentHeaderBuilderFingerprint
 import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
 
 @Patch

src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/annotations/VerticalScrollCompatibility.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.fix.verticalscroll.annotations
+package app.revanced.patches.shared.misc.fix.verticalscroll.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@@ -6,8 +6,8 @@ import app.revanced.patcher.annotation.Package
 @Compatibility(
     [
         Package("com.google.android.youtube"),
+        Package("com.vanced.android.youtube")
     ]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class VerticalScrollCompatibility

src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/fingerprints/CanScrollVerticallyFingerprint.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.fix.verticalscroll.fingerprints
+package app.revanced.patches.shared.misc.fix.verticalscroll.fingerprints
 
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/patch/VerticalScrollPatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.fix.verticalscroll.patch
+package app.revanced.patches.shared.misc.fix.verticalscroll.patch
 
 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
@@ -9,8 +9,8 @@ import app.revanced.patcher.extensions.instruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.youtube.misc.fix.verticalscroll.annotations.VerticalScrollCompatibility
+import app.revanced.patches.shared.misc.fix.verticalscroll.annotations.VerticalScrollCompatibility
-import app.revanced.patches.youtube.misc.fix.verticalscroll.fingerprints.CanScrollVerticallyFingerprint
+import app.revanced.patches.shared.misc.fix.verticalscroll.fingerprints.CanScrollVerticallyFingerprint
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Description("Fixes issues with scrolling on the home screen when the first component is of type EmptyComponent.")

src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/NonInteractivePreference.kt

@@ -0,0 +1,26 @@
+package app.revanced.patches.shared.settings.preference.impl
+
+import app.revanced.patches.shared.settings.preference.BasePreference
+import app.revanced.patches.shared.settings.preference.IResource
+import app.revanced.patches.shared.settings.preference.addSummary
+import org.w3c.dom.Document
+import org.w3c.dom.Element
+
+/**
+ * A simple static title and summary that is not backed by any preference key/value,
+ * and cannot be changed by or interacted with by the user,
+ */
+internal class NonInteractivePreference(
+    title: StringResource,
+    val summary: StringResource,
+) : BasePreference("", title) {
+    override val tag: String = "Preference"
+
+    override fun serialize(ownerDocument: Document, resourceCallback: ((IResource) -> Unit)?): Element {
+        return super.serialize(ownerDocument, resourceCallback).apply {
+            addSummary(summary.also { resourceCallback?.invoke(it)
+                setAttribute("android:selectable", false.toString())
+            })
+        }
+    }
+}

src/main/kotlin/app/revanced/patches/spotify/audio/annotation/DisableCaptureRestrictionCompatibility.kt

@@ -7,6 +7,5 @@ import app.revanced.patcher.annotation.Package
     [Package("com.spotify.music")]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class DisableCaptureRestrictionCompatibility
 

src/main/kotlin/app/revanced/patches/spotify/layout/theme/annotations/ThemeCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.spotify.music")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class ThemeCompatibility

src/main/kotlin/app/revanced/patches/spotify/lite/ondemand/annotations/OnDemandCompatibility.kt

@@ -7,5 +7,4 @@ import app.revanced.patcher.annotation.Package
     [Package("com.spotify.lite")]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class OnDemandCompatibility

src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/annotations/PremiumNavbarTabCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.spotify.music")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class PremiumNavbarTabCompatibility

src/main/kotlin/app/revanced/patches/tasker/trial/unlock/annotations/UnlockTrialCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("net.dinglisch.android.taskerm")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class UnlockTrialCompatibility

src/main/kotlin/app/revanced/patches/ticktick/misc/themeunlock/annotations/UnlockThemesCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.ticktick.task")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class UnlockThemesCompatibility

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

@@ -10,5 +10,4 @@ import app.revanced.patcher.annotation.Package
     ]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class HideAdsCompatibility

src/main/kotlin/app/revanced/patches/tiktok/feedfilter/annotations/FeedFilterCompatibility.kt

@@ -10,5 +10,4 @@ import app.revanced.patcher.annotation.Package
     ]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class FeedFilterCompatibility

src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/annotations/DownloadsCompatibility.kt

@@ -10,5 +10,4 @@ import app.revanced.patcher.annotation.Package
     ]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class DownloadsCompatibility

src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/annotations/ShowSeekbarCompatibility.kt

@@ -10,5 +10,4 @@ import app.revanced.patcher.annotation.Package
     ]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class ShowSeekbarCompatibility

src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/annotations/PlaybackSpeedCompatibility.kt

@@ -10,5 +10,4 @@ import app.revanced.patcher.annotation.Package
     ]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class PlaybackSpeedCompatibility

src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/annotations/IntegrationsCompatibility.kt

@@ -10,5 +10,4 @@ import app.revanced.patcher.annotation.Package
     ]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class IntegrationsCompatibility

src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/patch/IntegrationsPatch.kt

@@ -1,12 +1,14 @@
 package app.revanced.patches.tiktok.misc.integrations.patch
 
 import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.patch.annotations.RequiresIntegrations
+import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch
 import app.revanced.patches.tiktok.misc.integrations.annotations.IntegrationsCompatibility
 import app.revanced.patches.tiktok.misc.integrations.fingerprints.InitFingerprint
-import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch
 
 @Name("integrations")
 @IntegrationsCompatibility
+@RequiresIntegrations
 class IntegrationsPatch : AbstractIntegrationsPatch(
     "Lapp/revanced/tiktok/utils/ReVancedUtils;",
     listOf(InitFingerprint)

src/main/kotlin/app/revanced/patches/tiktok/misc/login/disablerequirement/annotations/DisableLoginRequirementCompatibility.kt

@@ -10,5 +10,4 @@ import app.revanced.patcher.annotation.Package
     ]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class DisableLoginRequirementCompatibility

src/main/kotlin/app/revanced/patches/tiktok/misc/login/fixgoogle/annotations/FixGoogleLoginCompatibility.kt

@@ -10,5 +10,4 @@ import app.revanced.patcher.annotation.Package
     ]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class FixGoogleLoginCompatibility

src/main/kotlin/app/revanced/patches/tiktok/misc/settings/annotations/SettingsCompatibility.kt

@@ -10,5 +10,4 @@ import app.revanced.patcher.annotation.Package
     ]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class SettingsCompatibility

src/main/kotlin/app/revanced/patches/tiktok/misc/spoof/sim/annotations/SpoofSimCompatibility.kt

@@ -10,5 +10,4 @@ import app.revanced.patcher.annotation.Package
     ]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class SpoofSimCompatibility

src/main/kotlin/app/revanced/patches/twitch/ad/audio/annotations/AudioAdsCompatibility.kt

@@ -3,8 +3,20 @@ package app.revanced.patches.twitch.ad.audio.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("tv.twitch.android.app")])
+@Compatibility(
+    [
+        Package(
+            "tv.twitch.android.app", arrayOf(
+                "14.3.3",
+                "14.4.0",
+                "14.5.0", 
+                "14.5.2",
+                "14.6.0",
+                "14.6.1"
+            )
+        )
+    ]
+)
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class AudioAdsCompatibility
 

src/main/kotlin/app/revanced/patches/twitch/ad/embedded/annotations/EmbeddedAdsCompatibility.kt

@@ -3,8 +3,20 @@ package app.revanced.patches.twitch.ad.embedded.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("tv.twitch.android.app")])
+@Compatibility(
+    [
+        Package(
+            "tv.twitch.android.app", arrayOf(
+                "14.3.3",
+                "14.4.0",
+                "14.5.0", 
+                "14.5.2",
+                "14.6.0",
+                "14.6.1"
+            )
+        )
+    ]
+)
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class EmbeddedAdsCompatibility
 

src/main/kotlin/app/revanced/patches/twitch/ad/video/annotations/VideoAdsCompatibility.kt

@@ -3,8 +3,20 @@ package app.revanced.patches.twitch.ad.video.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("tv.twitch.android.app")])
+@Compatibility(
+    [
+        Package(
+            "tv.twitch.android.app", arrayOf(
+                "14.3.3",
+                "14.4.0",
+                "14.5.0", 
+                "14.5.2",
+                "14.6.0",
+                "14.6.1"
+            )
+        )
+    ]
+)
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class VideoAdsCompatibility
 

src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/annotations/ShowDeletedMessagesCompatibility.kt

@@ -5,6 +5,5 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("tv.twitch.android.app")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class ShowDeletedMessagesCompatibility
 

src/main/kotlin/app/revanced/patches/twitch/debug/annotations/DebugModeCompatibility.kt

@@ -5,6 +5,5 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("tv.twitch.android.app")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class DebugModeCompatibility
 

src/main/kotlin/app/revanced/patches/twitch/misc/integrations/annotations/IntegrationsCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("tv.twitch.android.app")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class IntegrationsCompatibility

src/main/kotlin/app/revanced/patches/twitch/misc/integrations/patch/IntegrationsPatch.kt

@@ -1,12 +1,14 @@
 package app.revanced.patches.twitch.misc.integrations.patch
 
 import app.revanced.patcher.annotation.Name
-import app.revanced.patches.twitch.misc.integrations.fingerprints.InitFingerprint
+import app.revanced.patcher.patch.annotations.RequiresIntegrations
-import app.revanced.patches.twitch.misc.integrations.annotations.IntegrationsCompatibility
 import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch
+import app.revanced.patches.twitch.misc.integrations.annotations.IntegrationsCompatibility
+import app.revanced.patches.twitch.misc.integrations.fingerprints.InitFingerprint
 
 @Name("integrations")
 @IntegrationsCompatibility
+@RequiresIntegrations
 class IntegrationsPatch : AbstractIntegrationsPatch(
     "Lapp/revanced/twitch/utils/ReVancedUtils;",
     listOf(InitFingerprint)

src/main/kotlin/app/revanced/patches/twitch/misc/settings/annotations/SettingsCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("tv.twitch.android.app")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class SettingsCompatibility

src/main/kotlin/app/revanced/patches/twitter/layout/hideviews/annotations/HideViewsCompatibility.kt

@@ -9,5 +9,4 @@ import app.revanced.patcher.annotation.Package
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class HideViewsCompatibility

src/main/kotlin/app/revanced/patches/twitter/misc/dynamiccolor/annotations/DynamicColorCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.twitter.android")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class DynamicColorCompatibility

src/main/kotlin/app/revanced/patches/twitter/misc/hook/json/patch/JsonHookPatch.kt

@@ -8,6 +8,7 @@ import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.annotations.RequiresIntegrations
 import app.revanced.patches.twitter.misc.hook.json.fingerprints.JsonHookPatchFingerprint
 import app.revanced.patches.twitter.misc.hook.json.fingerprints.JsonInputStreamFingerprint
 import app.revanced.patches.twitter.misc.hook.json.fingerprints.LoganSquareFingerprint
@@ -16,6 +17,7 @@ import java.io.InvalidClassException
 @Name("json-hook")
 @Description("Hooks the stream which reads JSON responses.")
 @Version("0.0.1")
+@RequiresIntegrations
 class JsonHookPatch : BytecodePatch(
     listOf(LoganSquareFingerprint)
 ) {

src/main/kotlin/app/revanced/patches/twitter/misc/hook/patch/ads/annotations/HideAdsCompatibility.kt

@@ -9,5 +9,4 @@ import app.revanced.patcher.annotation.Package
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class HideAdsCompatibility

src/main/kotlin/app/revanced/patches/twitter/misc/hook/patch/recommendation/annotations/HideRecommendedUsersCompatibility.kt

@@ -9,5 +9,4 @@ import app.revanced.patcher.annotation.Package
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class HideRecommendedUsersCompatibility

src/main/kotlin/app/revanced/patches/twitter/misc/monochrome/annotations/MonochromeIconCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.twitter.android")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class MonochromeIconCompatibility

src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/annotations/FirebaseGetCertPatchCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("de.dwd.warnapp")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class FirebaseGetCertPatchCompatibility

src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/annotations/PromoCodeUnlockCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("de.dwd.warnapp")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class PromoCodeUnlockCompatibility

src/main/kotlin/app/revanced/patches/windyapp/misc/unlockpro/annotations/UnlockProCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("co.windyapp.android")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class UnlockProCompatibility

src/main/kotlin/app/revanced/patches/youtube/ad/general/annotation/GeneralAdsCompatibility.kt

@@ -5,10 +5,18 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.49.37", "18.03.36")
+        "com.google.android.youtube", arrayOf(
+            "17.49.37", 
+            "18.03.36",
+            "18.03.42",
+            "18.04.35",
+            "18.04.41",
+            "18.05.32",
+            "18.05.35",
+            "18.05.40"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class GeneralAdsCompatibility
 

src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralAdsPatch.kt

@@ -18,7 +18,7 @@ import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibilit
 import app.revanced.patches.youtube.ad.general.bytecode.fingerprints.ReelConstructorFingerprint
 import app.revanced.patches.youtube.ad.general.resource.patch.GeneralAdsResourcePatch
 import app.revanced.patches.youtube.misc.fix.backtoexitgesture.patch.FixBackToExitGesturePatch
-import app.revanced.patches.youtube.misc.fix.verticalscroll.patch.VerticalScrollPatch
+import app.revanced.patches.shared.misc.fix.verticalscroll.patch.VerticalScrollPatch
 import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
 import org.jf.dexlib2.iface.instruction.formats.Instruction31i
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c

src/main/kotlin/app/revanced/patches/youtube/ad/general/resource/patch/GeneralAdsResourcePatch.kt

@@ -37,13 +37,6 @@ class GeneralAdsResourcePatch : ResourcePatch {
                 StringResource("revanced_adremover_separator_summary_on", "Gray separators are hidden"),
                 StringResource("revanced_adremover_separator_summary_off", "Gray separators are shown")
             ),
-            SwitchPreference(
-                "revanced_horizontal_video_shelf",
-                StringResource("revanced_horizontal_video_shelf_title", "Hide horizontal video shelf"),
-                true,
-                StringResource("revanced_horizontal_video_shelf_summary_on", "Shelf is hidden"),
-                StringResource("revanced_horizontal_video_shelf_summary_off", "Shelf is shown")
-            ),
             SwitchPreference(
                 "revanced_adremover_hide_channel_guidelines",
                 StringResource("revanced_adremover_hide_channel_guidelines_enabled_title", "Hide channel guidelines"),
@@ -214,12 +207,12 @@ class GeneralAdsResourcePatch : ResourcePatch {
                 StringResource("revanced_hide_related_videos_summary_off", "Related videos are shown")
             ),
             SwitchPreference(
-                "revanced_hide_channel_bar",
+                "revanced_hide_image_shelf",
-                StringResource("revanced_hide_channel_bar_title", "Hide channel bar"),
+                StringResource("revanced_hide_image_shelf", "Hide image shelf in search results"),
-                false,
+                true,
-                StringResource("revanced_hide_channel_bar_summary_on", "Channel bar is hidden"),
+                StringResource("revanced_hide_image_shelf_summary_on", "Image shelf is hidden"),
-                StringResource("revanced_hide_channel_bar_summary_off", "Channel bar is shown")
+                StringResource("revanced_hide_image_shelf_summary_off", "Image shelf is shown")
-            ),
+            )
         )
 
         PreferenceScreen.ADS.addPreferences(

src/main/kotlin/app/revanced/patches/youtube/ad/video/annotations/VideoAdsCompatibility.kt

@@ -5,10 +5,18 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.49.37", "18.03.36")
+        "com.google.android.youtube", arrayOf(
+            "17.49.37", 
+            "18.03.36",
+            "18.03.42",
+            "18.04.35",
+            "18.04.41",
+            "18.05.32",
+            "18.05.35",
+            "18.05.40"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class VideoAdsCompatibility
 

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

@@ -4,10 +4,18 @@ import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
 @Compatibility(
-    [
+    [Package(
-        Package("com.google.android.youtube", arrayOf("17.49.37", "18.03.36"))
+        "com.google.android.youtube", arrayOf(
-    ]
+            "17.49.37", 
+            "18.03.36",
+            "18.03.42",
+            "18.04.35",
+            "18.04.41",
+            "18.05.32",
+            "18.05.35",
+            "18.05.40"
+        )
+    )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class CopyVideoUrlCompatibility

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

@@ -5,10 +5,18 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.49.37", "18.03.36")
+        "com.google.android.youtube", arrayOf(
+            "17.49.37", 
+            "18.03.36",
+            "18.03.42",
+            "18.04.35",
+            "18.04.41",
+            "18.05.32",
+            "18.05.35",
+            "18.05.40"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class DownloadsCompatibility
 

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

@@ -5,10 +5,18 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.49.37", "18.03.36")
+        "com.google.android.youtube", arrayOf(
+            "17.49.37", 
+            "18.03.36",
+            "18.03.42",
+            "18.04.35",
+            "18.04.41",
+            "18.05.32",
+            "18.05.35",
+            "18.05.40"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class SeekbarTappingCompatibility
 

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

@@ -5,9 +5,17 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.49.37", "18.03.36")
+        "com.google.android.youtube", arrayOf(
+            "17.49.37", 
+            "18.03.36",
+            "18.03.42",
+            "18.04.35",
+            "18.04.41",
+            "18.05.32",
+            "18.05.35",
+            "18.05.40"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class SwipeControlsCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/annotations/AutoCaptionsCompatibility.kt

@@ -5,9 +5,17 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.49.37", "18.03.36")
+        "com.google.android.youtube", arrayOf(
+            "17.49.37", 
+            "18.03.36",
+            "18.03.42",
+            "18.04.35",
+            "18.04.41",
+            "18.05.32",
+            "18.05.35",
+            "18.05.40"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class AutoCaptionsCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/annotations/PremiumHeadingCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.google.android.youtube")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class PremiumHeadingCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/annotations/CustomBrandingCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.google.android.youtube")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class CustomBrandingCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/annotations/HideButtonsCompatibility.kt

@@ -5,9 +5,17 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.49.37", "18.03.36")
+        "com.google.android.youtube", arrayOf(
+            "17.49.37", 
+            "18.03.36",
+            "18.03.42",
+            "18.04.35",
+            "18.04.41",
+            "18.05.32",
+            "18.05.35",
+            "18.05.40"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class HideButtonsCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/annotations/AutoplayButtonCompatibility.kt

@@ -5,9 +5,17 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.49.37", "18.03.36")
+        "com.google.android.youtube", arrayOf(
+            "17.49.37", 
+            "18.03.36",
+            "18.03.42",
+            "18.04.35",
+            "18.04.41",
+            "18.05.32",
+            "18.05.35",
+            "18.05.40"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class AutoplayButtonCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/fingerprints/AutoNavInformerFingerprint.kt

@@ -1,20 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.autoplay.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object AutoNavInformerFingerprint : MethodFingerprint(
-    "Z",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    opcodes = listOf(
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-    ),
-    customFingerprint = { it.definingClass.endsWith("WillAutonavInformer;") }
-)

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/patch/HideAutoplayButtonPatch.kt

@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.layout.buttons.autoplay.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -15,7 +16,6 @@ import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.layout.buttons.autoplay.annotations.AutoplayButtonCompatibility
-import app.revanced.patches.youtube.layout.buttons.autoplay.fingerprints.AutoNavInformerFingerprint
 import app.revanced.patches.youtube.layout.buttons.autoplay.fingerprints.LayoutConstructorFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
@@ -31,9 +31,7 @@ import org.jf.dexlib2.iface.reference.MethodReference
 @AutoplayButtonCompatibility
 @Version("0.0.1")
 class HideAutoplayButtonPatch : BytecodePatch(
-    listOf(
+    listOf(LayoutConstructorFingerprint)
-        LayoutConstructorFingerprint, AutoNavInformerFingerprint
-    )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
@@ -43,49 +41,40 @@ class HideAutoplayButtonPatch : BytecodePatch(
                 true,
                 StringResource("revanced_hide_autoplay_button_summary_on", "Autoplay button is hidden"),
                 StringResource("revanced_hide_autoplay_button_summary_off", "Autoplay button is shown")
-            )
+            ),
         )
 
-        val autoNavInformerMethod = AutoNavInformerFingerprint.result!!.mutableMethod
+        LayoutConstructorFingerprint.result?.mutableMethod?.apply {
-
+            val layoutGenMethodInstructions = implementation!!.instructions
-        val layoutGenMethodResult = LayoutConstructorFingerprint.result!!
-        val layoutGenMethod = layoutGenMethodResult.mutableMethod
-        val layoutGenMethodInstructions = layoutGenMethod.implementation!!.instructions
 
             // resolve the offsets such as ...
             val autoNavPreviewStubId = ResourceMappingPatch.resourceMappings.single {
                 it.name == "autonav_preview_stub"
             }.id
+
             // where to insert the branch instructions and ...
             val insertIndex = layoutGenMethodInstructions.indexOfFirst {
                 (it as? WideLiteralInstruction)?.wideLiteral == autoNavPreviewStubId
             }
+
             // where to branch away
-        val branchIndex = layoutGenMethodInstructions.subList(insertIndex + 1, layoutGenMethodInstructions.size - 1).indexOfFirst {
+            val branchIndex =
+                layoutGenMethodInstructions.subList(insertIndex + 1, layoutGenMethodInstructions.size - 1)
+                    .indexOfFirst {
                         ((it as? ReferenceInstruction)?.reference as? MethodReference)?.name == "addOnLayoutChangeListener"
                     } + 2
 
             val jumpInstruction = layoutGenMethodInstructions[insertIndex + branchIndex] as Instruction
-        layoutGenMethod.addInstructions(
+
-            insertIndex, """
+            addInstructions(
+                insertIndex,
+                """
                 invoke-static {}, Lapp/revanced/integrations/patches/HideAutoplayButtonPatch;->isButtonShown()Z
                 move-result v11
                 if-eqz v11, :hidden
             """, listOf(ExternalLabel("hidden", jumpInstruction))
             )
-
+        } ?: return LayoutConstructorFingerprint.toErrorResult()
-        //force disable autoplay since it's hard to do without the button
-        autoNavInformerMethod.addInstructions(
-            0, """
-            invoke-static {}, Lapp/revanced/integrations/patches/HideAutoplayButtonPatch;->isButtonShown()Z
-            move-result v0
-            if-nez v0, :hidden
-            const/4 v0, 0x0
-            return v0
-            :hidden
-            nop
-        """
-        )
 
         return PatchResultSuccess()
     }

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/annotations/HideCaptionsButtonCompatibility.kt

@@ -5,9 +5,17 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.49.37", "18.03.36")
+        "com.google.android.youtube", arrayOf(
+            "17.49.37", 
+            "18.03.36",
+            "18.03.42",
+            "18.04.35",
+            "18.04.41",
+            "18.05.32",
+            "18.05.35",
+            "18.05.40"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class HideCaptionsButtonCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/cast/annotations/CastPatchCompatibility.kt

@@ -5,5 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.google.android.youtube")])
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class CastButtonCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/shared/annotations/PivotBarCompatibility.kt

@@ -5,9 +5,17 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.49.37", "18.03.36")
+        "com.google.android.youtube", arrayOf(
+            "17.49.37", 
+            "18.03.36",
+            "18.03.42",
+            "18.04.35",
+            "18.04.41",
+            "18.05.32",
+            "18.05.35",
+            "18.05.40"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class PivotBarCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/background/annotations/PlayerButtonBackgroundCompatibility.kt

@@ -3,10 +3,18 @@ import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
 @Compatibility(
-    [
+    [Package(
-        Package("com.google.android.youtube", arrayOf("17.49.37", "18.03.36"))
+        "com.google.android.youtube", arrayOf(
-    ]
+            "17.49.37", 
+            "18.03.36",
+            "18.03.42",
+            "18.04.35",
+            "18.04.41",
+            "18.05.32",
+            "18.05.35",
+            "18.05.40"
+        )
+    )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class PlayerButtonBackgroundCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/annotations/HidePlayerButtonsCompatibility.kt

@@ -9,5 +9,4 @@ import app.revanced.patcher.annotation.Package
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class HidePlayerButtonsCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/annotations/AlbumCardsCompatibility.kt

@@ -5,9 +5,17 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.49.37", "18.03.36")
+        "com.google.android.youtube", arrayOf(
+            "17.49.37", 
+            "18.03.36",
+            "18.03.42",
+            "18.04.35",
+            "18.04.41",
+            "18.05.32",
+            "18.05.35",
+            "18.05.40"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class AlbumCardsCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/hide/artistcards/annotations/HideArtistCardCompatibility.kt

@@ -5,9 +5,17 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.49.37", "18.03.36")
+        "com.google.android.youtube", arrayOf(
+            "17.49.37", 
+            "18.03.36",
+            "18.03.42",
+            "18.04.35",
+            "18.04.41",
+            "18.05.32",
+            "18.05.35",
+            "18.05.40"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
 internal annotation class HideArtistCardCompatibility