From 01f21e0fe81059b7ed73f5d84ddcf49f31094383 Mon Sep 17 00:00:00 2001
From: IndusAryan <125901294+IndusAryan@users.noreply.github.com>
Date: Sat, 20 Jan 2024 01:39:07 +0530
Subject: [PATCH] refactor: move buildconfig, bump ksp & better trailer
 scraping (#834)

---
 app/build.gradle.kts                                   | 10 +++++++---
 .../cloudstream3/extractors/YoutubeExtractor.kt        |  7 +++----
 .../java/com/lagradost/cloudstream3/utils/UIHelper.kt  |  4 +---
 build.gradle.kts                                       |  6 +++---
 gradle.properties                                      |  1 -
 gradle/wrapper/gradle-wrapper.properties               |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9ecae616..229b141d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -139,6 +139,10 @@ android {
         abortOnError = false
         checkReleaseBuilds = false
     }
+    
+    buildFeatures {
+        buildConfig = true
+    }
 
     namespace = "com.lagradost.cloudstream3"
 }
@@ -195,13 +199,13 @@ dependencies {
     // PlayBack
     implementation("com.jaredrummler:colorpicker:1.1.0") // Subtitle Color Picker
     implementation("com.github.recloudstream:media-ffmpeg:1.1.0") // Custom FF-MPEG Lib for Audio Codecs
-    implementation("com.github.teamnewpipe:NewPipeExtractor:eac850") /* For Trailers
+    implementation("com.github.teamnewpipe:NewPipeExtractor:6dc25f7") /* For Trailers
     ^ Update to Latest Commits if Trailers Misbehave, github.com/TeamNewPipe/NewPipeExtractor/commits/dev */
     implementation("com.github.albfernandez:juniversalchardet:2.4.0") // Subtitle Decoding
 
     // Crash Reports (AcraApplication.kt)
-    implementation("ch.acra:acra-core:5.11.2")
-    implementation("ch.acra:acra-toast:5.11.2")
+    implementation("ch.acra:acra-core:5.11.3")
+    implementation("ch.acra:acra-toast:5.11.3")
 
     // UI Stuff
     implementation("com.facebook.shimmer:shimmer:0.5.0") // Shimmering Effect (Loading Skeleton)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
index 23704e90..4e854630 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
@@ -70,19 +70,18 @@ open class YoutubeExtractor : ExtractorApi() {
             }
         }
         ytVideos[url]?.mapNotNull {
-            if (it.isVideoOnly || it.height <= 0) return@mapNotNull null
+            if (it.isVideoOnly() || it.height <= 0) return@mapNotNull null
 
             ExtractorLink(
                 this.name,
                 this.name,
-                it.url ?: return@mapNotNull null,
+                it.content ?: return@mapNotNull null,
                 "",
                 it.height
             )
         }?.forEach(callback)
         ytVideosSubtitles[url]?.mapNotNull {
-            SubtitleFile(it.languageTag ?: return@mapNotNull null, it.url ?: return@mapNotNull null)
+            SubtitleFile(it.languageTag ?: return@mapNotNull null, it.content ?: return@mapNotNull null)
         }?.forEach(subtitleCallback)
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
index 388a0c3c..76142f72 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
@@ -184,9 +184,7 @@ object UIHelper {
         try {
             if (this is FragmentActivity) {
                 val navHostFragment = supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as? NavHostFragment?
-                navHostFragment?.navController?.let {
-                    it.navigate(navigation, arguments)
-                }
+                navHostFragment?.navController?.navigate(navigation, arguments)
             }
         } catch (t: Throwable) {
             logError(t)
diff --git a/build.gradle.kts b/build.gradle.kts
index 939c62a6..d2959529 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,8 +5,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.1.4")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21")
+        classpath("com.android.tools.build:gradle:8.2.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10")
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -22,7 +22,7 @@ allprojects {
 }
 
 plugins {
-    id("com.google.devtools.ksp") version "1.9.21-1.0.15" apply false
+    id("com.google.devtools.ksp") version "1.9.22-1.0.16" apply false
 }
 
 tasks.register<Delete>("clean") {
diff --git a/gradle.properties b/gradle.properties
index b8aa1f91..6a873a6a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,6 +19,5 @@ android.useAndroidX=true
 # android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d7c9c9bc..fc2d0f86 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Apr 30 17:11:15 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME