Upgrade libraries version and gradle wrapper

Author: diogob003

app/build.gradle.kts

@@ -5,9 +5,9 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
-    id("com.android.application")
-    id("kotlin-android")
-    id("org.jetbrains.dokka")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.dokka.gradle.plugin)
+    alias(libs.plugins.kotlin.android)
 }
 
 val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())

app/src/main/java/com/lagradost/cloudstream3/ui/player/UpdatedMatroskaExtractor.kt

@@ -37,11 +37,11 @@ import androidx.media3.common.util.Log
 import androidx.media3.common.util.ParsableByteArray
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.common.util.Util
+import androidx.media3.container.DolbyVisionConfig;
 import androidx.media3.container.NalUnitUtil
 import androidx.media3.extractor.AacUtil
 import androidx.media3.extractor.AvcConfig
 import androidx.media3.extractor.ChunkIndex
-import androidx.media3.extractor.DolbyVisionConfig
 import androidx.media3.extractor.Extractor
 import androidx.media3.extractor.ExtractorInput
 import androidx.media3.extractor.ExtractorOutput
@@ -51,11 +51,11 @@ import androidx.media3.extractor.MpegAudioUtil
 import androidx.media3.extractor.PositionHolder
 import androidx.media3.extractor.SeekMap
 import androidx.media3.extractor.SeekMap.Unseekable
+import androidx.media3.extractor.text.SubtitleParser
+import androidx.media3.extractor.text.SubtitleTranscodingExtractorOutput
 import androidx.media3.extractor.TrackOutput
 import androidx.media3.extractor.TrackOutput.CryptoData
 import androidx.media3.extractor.TrueHdSampleRechunker
-import androidx.media3.extractor.text.SubtitleParser
-import androidx.media3.extractor.text.SubtitleTranscodingExtractorOutput
 import com.google.common.collect.ImmutableList
 import java.io.IOException
 import java.nio.ByteBuffer

build.gradle.kts

@@ -1,23 +1,30 @@
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.buildkonfig.gradle.plugin) apply false // Universal build config
+    alias(libs.plugins.dokka.gradle.plugin) apply false
+    alias(libs.plugins.gradle.versions.plugin) // do not "apply false" as it's used only in the root project
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin.jvm) apply false
+    alias(libs.plugins.kotlin.multiplatform) apply false
+}
 
-    dependencies {
-        classpath(libs.gradle)
-        classpath(libs.jetbrains.kotlin.gradle.plugin)
-        classpath(libs.dokka.gradle.plugin)
-        // Universal build config
-        classpath(libs.buildkonfig.gradle.plugin)
+// Task to list dependencies updates // https://github.com/ben-manes/gradle-versions-plugin
+tasks.withType<com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask> {
+    rejectVersionIf {
+        isNonStable(candidate.version)
     }
 }
 
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        mavenLocal()
-        maven("https://jitpack.io")
+fun isNonStable(version: String): Boolean {
+    var containsUnstableKeyword = listOf("alpha", "beta", "rc", "cr", "m", "preview", "snapshot").any {
+        version.contains(it, ignoreCase = true)
+    }
+    val containsStableKeyword = listOf("release", "final", "ga").any {
+        version.contains(it, ignoreCase = true)
     }
+    val matchesGitCommitRegex = Regex("""^([0-9a-f]{40}|[0-9a-f]{6,8})$""").matches(version)
+    val matchesStableRegex = Regex("""^[0-9,.v-]+(-r)?$""").matches(version)
+    val isStable = containsStableKeyword || matchesStableRegex || matchesGitCommitRegex
+    return containsUnstableKeyword || !isStable
 }

docs/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    kotlin("jvm")
-    id("org.jetbrains.dokka")
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.dokka.gradle.plugin)
 }
 
 dependencies {

gradle/libs.versions.toml

@@ -1,49 +1,53 @@
+# https://docs.gradle.org/current/userguide/plugins.html#sec:version_catalog_plugin_application
+# https://docs.gradle.org/current/userguide/dependency_versions.html#sec:strict-version
 [versions]
 acraCore = "5.12.0"
+androidGradlePlugin = { strictly = "8.9.3" } # "android in all their incompetence makes gradle version very tied to the IDE version of Android Studio. Due to this, gradle should lag behind"
+androidToolsUtp = "31.12.0"
 appcompat = "1.7.1"
-biometric = "1.4.0-alpha04"
-buildkonfigGradlePlugin = "0.15.2"
-coil = "3.1.0"
+biometric = { require = "1.4.0-alpha04" }
+buildkonfigGradlePlugin = "0.17.1"
+coil = { strictly = "[3.1, 3.3[", prefer = "3.2.0"} # do not update above 3.2, it's tied to "kotlinGradlePlugin" version
 colorpicker = "6b46b49bd5"
-conscryptAndroid = "2.5.2"
+conscryptAndroid = { strictly = "2.5.2" } # 2.5.3+ crashes everything for everyone.
 constraintlayout = "2.2.1"
 coreKtx = "1.16.0"
 desugar_jdk_libs_nio = "2.1.5"
 dokkaGradlePlugin = "2.0.0"
-espressoCore = "3.6.1"
+espressoCore = "3.7.0"
 fuzzywuzzy = "1.4.0"
-gradle = "8.9.3"
-jacksonModuleKotlin = "2.13.1"
-json = "20250107"
+gradleVersionsPlugin = "0.52.0"
+jacksonModuleKotlin = { strictly = "2.13.1" } # do not upgrade above 2.13.1, Crashes on Android TV's and FireSticks that have Min API Level 25 or Less.
+json = "20250517"
 junit = "4.13.2"
-junitKtx = "1.2.1"
-junitVersion = "1.2.1"
+junitKtx = "1.3.0"
+junitVersion = "1.3.0"
 juniversalchardet = "2.5.0"
-kotlinGradlePluginVersion = "2.1.10"
-kotlinxCoroutinesCore = "1.10.1"
-lifecycleLivedataKtx = "2.8.7"
-lifecycleViewmodelKtx = "2.8.7"
+kotlinGradlePlugin = { strictly = "[2.1, 2.2[" } # do not upgrade above 2.1, it's tied to "androidGradle" version
+kotlinxCoroutinesCore = "1.10.2"
+lifecycleLivedataKtx = "2.9.2"
+lifecycleViewmodelKtx = "2.9.2"
 material = "1.12.0"
-media3 = "1.6.1"
-navigationKtx = "2.8.9"
-newpipeextractor = "v0.24.6"
+media3 = "1.8.0"
+navigationKtx = "2.9.3"
+newpipeextractor = "0.24.8"
 nextlibMedia3 = "0.8.4"
 nicehttp = "0.4.13"
 overlappingpanels = "0.1.5"
 paletteKtx = "1.0.0"
 preferenceKtx = "1.2.1"
 previewseekbarMedia3 = "1.1.1.0"
-qrcodeKotlin = "4.3.0"
+qrcodeKotlin = "4.5.0"
 rhino = "1.8.0"
 safefile = "0.0.8"
 shimmer = "0.5.0"
 swiperefreshlayout = "1.1.0"
-tmdbJava = "2.11.0"
+tmdbJava = "2.12.0"
 torrentserver = "7861970e038b35cd8c6918384e49caf26903e09e"
-tvprovider = "1.0.0"
+tvprovider = "1.1.0"
 video = "1.0.0"
-workRuntime = "2.10.0"
-workRuntimeKtx = "2.10.0"
+workRuntime = "2.10.3"
+workRuntimeKtx = "2.10.3"
 
 jvmTarget = "1.8"
 minSdk = "21"
@@ -53,34 +57,34 @@ targetSdk = "35"
 [libraries]
 acra-core = { module = "ch.acra:acra-core", version.ref = "acraCore" }
 acra-toast = { module = "ch.acra:acra-toast", version.ref = "acraCore" }
+android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }
-buildkonfig-gradle-plugin = { module = "com.codingfeline.buildkonfig:buildkonfig-gradle-plugin", version.ref = "buildkonfigGradlePlugin" }
 coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
 coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
 colorpicker = { module = "com.github.recloudstream:color-picker-android", version.ref = "colorpicker" }
 conscrypt-android = { module = "org.conscrypt:conscrypt-android", version.ref = "conscryptAndroid" }
 constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
 core = { module = "androidx.test:core" }
 core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
+databinding = { module = "androidx.databinding:viewbinding", version.ref = "androidGradlePlugin" }
 desugar_jdk_libs_nio = { module = "com.android.tools:desugar_jdk_libs_nio", version.ref = "desugar_jdk_libs_nio" }
-dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokkaGradlePlugin" }
 espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
 ext-junit = { module = "androidx.test.ext:junit", version.ref = "junitVersion" }
 fuzzywuzzy = { module = "me.xdrop:fuzzywuzzy", version.ref = "fuzzywuzzy" }
-gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
 jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jacksonModuleKotlin" }
-jetbrains-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinGradlePluginVersion" }
 json = { module = "org.json:json", version.ref = "json" }
 junit = { module = "junit:junit", version.ref = "junit" }
 junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "junitKtx" }
 juniversalchardet = { module = "com.github.albfernandez:juniversalchardet", version.ref = "juniversalchardet" }
+kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinGradlePlugin" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
 lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycleLivedataKtx" }
 lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" }
 material = { module = "com.google.android.material:material", version.ref = "material" }
 media3-cast = { module = "androidx.media3:media3-cast", version.ref = "media3" }
 media3-common = { module = "androidx.media3:media3-common", version.ref = "media3" }
+media3-container  = { module = "androidx.media3:media3-container ", version.ref = "media3" }
 media3-datasource-okhttp = { module = "androidx.media3:media3-datasource-okhttp", version.ref = "media3" }
 media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3" }
 media3-exoplayer-dash = { module = "androidx.media3:media3-exoplayer-dash", version.ref = "media3" }
@@ -98,8 +102,8 @@ palette-ktx = { module = "androidx.palette:palette-ktx", version.ref = "paletteK
 preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preferenceKtx" }
 previewseekbar-media3 = { module = "com.github.rubensousa:previewseekbar-media3", version.ref = "previewseekbarMedia3" }
 qrcode-kotlin = { module = "io.github.g0dkar:qrcode-kotlin", version.ref = "qrcodeKotlin" }
-rhino = { module = "org.mozilla:rhino", version.ref = "rhino" }
 quickjs = { module = "app.cash.quickjs:quickjs-android", version = "0.9.2" }
+rhino = { module = "org.mozilla:rhino", version.ref = "rhino" }
 safefile = { module = "com.github.LagradOst:SafeFile", version.ref = "safefile" }
 shimmer = { module = "com.facebook.shimmer:shimmer", version.ref = "shimmer" }
 swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" }
@@ -111,8 +115,16 @@ work-runtime = { module = "androidx.work:work-runtime", version.ref = "workRunti
 work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workRuntimeKtx" }
 
 [plugins]
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
+buildkonfig-gradle-plugin = { id = "com.codingfeline.buildkonfig", version.ref = "buildkonfigGradlePlugin" }
+dokka-gradle-plugin = { id = "org.jetbrains.dokka", version.ref = "dokkaGradlePlugin" }
+gradle-versions-plugin = { id = "com.github.ben-manes.versions", version.ref = "gradleVersionsPlugin" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinGradlePlugin" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm" , version.ref = "kotlinGradlePlugin" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlinGradlePlugin" }
 
 [bundles]
 media3 = ["media3-cast", "media3-common", "media3-datasource-okhttp", "media3-exoplayer", "media3-exoplayer-dash", "media3-exoplayer-hls", "media3-session", "media3-ui"]
-nextlibMedia3 = ["nextlib-media3ext", "nextlib-mediainfo"]
 navigationKtx = ["navigation-ui-ktx", "navigation-fragment-ktx"]
+nextlibMedia3 = ["nextlib-media3ext", "nextlib-mediainfo"]

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME