chore(release): 3.0.0-dev.6 [skip ci]

# [3.0.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v3.0.0-dev.5...v3.0.0-dev.6) (2023-12-05)

### Features

* **Twitch - Settings:** Support version `16.1.0` and `15.4.1` ([#3377](https://github.com/ReVanced/revanced-patches/issues/3377)) ([ba58edb](ba58edbd7f))

CHANGELOG.md

@@ -1,3 +1,29 @@
+# [3.0.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v3.0.0-dev.5...v3.0.0-dev.6) (2023-12-05)
+
+
+### Features
+
+* **Twitch - Settings:** Support version `16.1.0` and `15.4.1` ([#3377](https://github.com/ReVanced/revanced-patches/issues/3377)) ([062310d](https://github.com/ReVanced/revanced-patches/commit/062310dcc3923568c96171420c7fb9c0c2144233))
+
+# [3.0.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v3.0.0-dev.4...v3.0.0-dev.5) (2023-12-04)
+
+
+### Bug Fixes
+
+* Use correct class loader to load resources ([1d5f1f8](https://github.com/ReVanced/revanced-patches/commit/1d5f1f83be1f4eb78381887cd59f1649f1ed6d71))
+
+
+### Features
+
+* **Photomath:** Constrain patches to last working version ([f9a5dc6](https://github.com/ReVanced/revanced-patches/commit/f9a5dc6c91f37e9d7018e631739ca61511940d29))
+
+# [3.0.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v3.0.0-dev.3...v3.0.0-dev.4) (2023-12-04)
+
+
+### Bug Fixes
+
+* **YouTube - Minimized playback:** Fix PIP incorrectly shown for some Shorts playback ([#3364](https://github.com/ReVanced/revanced-patches/issues/3364)) ([84607ff](https://github.com/ReVanced/revanced-patches/commit/84607ff5f4bd30d328cdc4e1d46070a86d6c56bf))
+
 # [3.0.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v3.0.0-dev.2...v3.0.0-dev.3) (2023-12-04)
 
 

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 3.0.0-dev.3
+version = 3.0.0-dev.6

src/main/kotlin/app/revanced/patches/photomath/detection/deviceid/SpoofDeviceIdPatch.kt

@@ -14,7 +14,7 @@ import kotlin.random.Random
     name = "Spoof device ID",
     description = "Spoofs device ID to mitigate manual bans by developers.",
     dependencies = [SignatureDetectionPatch::class],
-    compatiblePackages = [CompatiblePackage("com.microblink.photomath")]
+    compatiblePackages = [CompatiblePackage("com.microblink.photomath", ["8.32.0"])]
 )
 @Suppress("unused")
 object SpoofDeviceIdPatch : BytecodePatch(

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

@@ -13,7 +13,7 @@ import app.revanced.patches.photomath.misc.unlockplus.fingerprints.IsPlusUnlocke
 @Patch(
     name = "Unlock plus",
     dependencies = [SignatureDetectionPatch::class, EnableBookpointPatch::class],
-    compatiblePackages = [CompatiblePackage("com.microblink.photomath")]
+    compatiblePackages = [CompatiblePackage("com.microblink.photomath", ["8.32.0"])]
 )
 @Suppress("unused")
 object UnlockPlusPatch : BytecodePatch(

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

@@ -30,7 +30,7 @@ import java.io.Closeable
     description = "Adds settings menu to Twitch.",
     dependencies = [IntegrationsPatch::class, SettingsResourcePatch::class],
     compatiblePackages = [
-        CompatiblePackage("tv.twitch.android.app", ["16.9.1"])
+        CompatiblePackage("tv.twitch.android.app", ["15.4.1", "16.1.0", "16.9.1"])
     ]
 )
 object SettingsPatch : BytecodePatch(

src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/MinimizedPlaybackPatch.kt

@@ -17,13 +17,19 @@ import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.Minimize
 import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackSettingsParentFingerprint
 import app.revanced.patches.youtube.misc.playertype.PlayerTypeHookPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
+import app.revanced.patches.youtube.video.information.VideoInformationPatch
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
 @Patch(
     name = "Minimized playback",
     description = "Enables minimized and background playback.",
-    dependencies = [IntegrationsPatch::class, PlayerTypeHookPatch::class, SettingsPatch::class],
+    dependencies = [
+        IntegrationsPatch::class,
+        PlayerTypeHookPatch::class,
+        VideoInformationPatch::class,
+        SettingsPatch::class
+    ],
     compatiblePackages = [
         CompatiblePackage(
             "com.google.android.youtube",
@@ -65,7 +71,7 @@ object MinimizedPlaybackPatch : BytecodePatch(
             mutableMethod.addInstructions(
                 0,
                 """
-                    invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->isPlaybackNotShort()Z
+                    invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->playbackIsNotShort()Z
                     move-result v0
                     return v0
                 """

src/main/kotlin/app/revanced/util/ResourceUtils.kt

@@ -8,6 +8,8 @@ import org.w3c.dom.Node
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
 
+private val classLoader = object {}.javaClass.classLoader
+
 /**
  * Recursively traverse the DOM tree starting from the given root node.
  *
@@ -45,7 +47,6 @@ fun ResourceContext.mergeStrings(host: String) {
  * @param resources The resources to copy.
  */
 fun ResourceContext.copyResources(sourceResourceDirectory: String, vararg resources: ResourceGroup) {
-    val classLoader = javaClass.classLoader
     val targetResourceDirectory = this["res"]
 
     for (resourceGroup in resources) {
@@ -77,7 +78,7 @@ fun ResourceContext.iterateXmlNodeChildren(
     targetTag: String,
     callback: (node: Node) -> Unit
 ) =
-    xmlEditor[javaClass.classLoader.getResourceAsStream(resource)!!].use {
+    xmlEditor[classLoader.getResourceAsStream(resource)!!].use {
         val stringsNode = it.file.getElementsByTagName(targetTag).item(0).childNodes
         for (i in 1 until stringsNode.length - 1) callback(stringsNode.item(i))
     }