Merge 9baf58e333 into 0ac949dc1b

This change comes from TeamNewPipe/NewPipe@6c5d58bed3.

android/app/build.gradle

@@ -122,7 +122,7 @@ flutter {
 
 def glanceVersion = "1.1.1"
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.0.4'
 
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
     // other deps so just ignore
@@ -137,4 +137,4 @@ dependencies {
 
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3"
     implementation 'com.google.code.gson:gson:2.11.0'
-}
+}

android/app/proguard-rules.pro

@@ -27,6 +27,7 @@
 -keep class org.schabi.newpipe.extractor.timeago.patterns.** { *; }
 -keep class org.mozilla.javascript.** { *; }
 -keep class org.mozilla.classfile.ClassFileWriter
+-dontwarn com.google.re2j.**
 -dontwarn org.mozilla.javascript.tools.**
 
 -dontwarn javax.script.AbstractScriptEngine
@@ -56,4 +57,9 @@
 -dontwarn jdk.dynalink.linker.TypeBasedGuardingDynamicLinker
 -dontwarn jdk.dynalink.linker.support.CompositeTypeBasedGuardingDynamicLinker
 -dontwarn jdk.dynalink.linker.support.Guards
--dontwarn jdk.dynalink.support.ChainedCallSite
+-dontwarn jdk.dynalink.support.ChainedCallSite
+# Rules for jsoup
+# Ignore intended-to-be-optional re2j classes - only needed if using re2j for jsoup regex
+# jsoup safely falls back to JDK regex if re2j not on classpath, but has concrete re2j refs
+# See https://github.com/jhy/jsoup/issues/2459 - may be resolved in future, then this may be removed
+-dontwarn com.google.re2j.**

pubspec.lock

@@ -745,11 +745,11 @@ packages:
     dependency: transitive
     description:
       path: "."
-      ref: master
+      ref: HEAD
-      resolved-ref: "922f9f9eafd8b501da83dca67d56b2887fa8f916"
+      resolved-ref: "458046cd9a88924e5074d96ba45397219d53b230"
-      url: "https://github.com/TiffApps/fk_user_agent.git"
+      url: "https://github.com/maeltoukap/fk_user_agent.git"
     source: git
-    version: "2.1.1"
+    version: "2.1.0"
   fluentui_system_icons:
     dependency: "direct main"
     description:
@@ -946,9 +946,9 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: ab3ff415114b7b43593e6ee718ad3d760af18350
+      ref: HEAD
       resolved-ref: ab3ff415114b7b43593e6ee718ad3d760af18350
-      url: "https://github.com/KRTirtho/flutter_new_pipe_extractor.git"
+      url: "https://github.com/KRTirtho/flutter_new_pipe_extractor"
     source: git
     version: "0.1.0"
   flutter_plugin_android_lifecycle:
@@ -1189,7 +1189,7 @@ packages:
     description:
       path: "."
       ref: main
-      resolved-ref: "32828156bc111d147709f8d644804227bbdfe8f1"
+      resolved-ref: d85dd429241d464a8b5b0c2b3d870143eeba8b46
       url: "https://github.com/KRTirtho/hetu_spotube_plugin.git"
     source: git
     version: "0.0.2"

pubspec.yaml

@@ -121,8 +121,7 @@ dependencies:
       ref: 4e5310e14af74bdbb51e2a4766e66d6c6a2562a8
   flutter_new_pipe_extractor:
     git:
-      url: https://github.com/KRTirtho/flutter_new_pipe_extractor.git
+      url: https://github.com/KRTirtho/flutter_new_pipe_extractor
-      ref: ab3ff415114b7b43593e6ee718ad3d760af18350
   http_parser: ^4.1.2
   collection: any
   archive: ^4.0.7
@@ -240,6 +239,8 @@ flutter:
     - packages/hetu_std/assets/bytecode/std.out
     - packages/hetu_otp_util/assets/bytecode/otp_util.out
     - packages/hetu_spotube_plugin/assets/bytecode/spotube_plugin.out
+    # NewPipe binaries (desktop only)
+    - packages/flutter_new_pipe_extractor/assets/
   fonts:
     - family: RadixIcons
       fonts: