From 38fac235d38b852bc6cc6a763642b8403be11c7e Mon Sep 17 00:00:00 2001 From: IndusAryan Date: Wed, 20 Dec 2023 17:31:43 +0530 Subject: [PATCH] move buildconfig to and upgrade gradle,work ktx,ksp,navigation,material,acra --- app/build.gradle.kts | 18 +++++++++++------- .../lagradost/cloudstream3/utils/UIHelper.kt | 4 +--- build.gradle.kts | 4 ++-- gradle.properties | 1 - gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bae407fa..b1bc69d4 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" } @@ -159,15 +163,15 @@ dependencies { // Android Core & Lifecycle implementation("androidx.core:core-ktx:1.12.0") implementation("androidx.appcompat:appcompat:1.6.1") - implementation("androidx.navigation:navigation-ui-ktx:2.7.5") + implementation("androidx.navigation:navigation-ui-ktx:2.7.6") implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2") - implementation("androidx.navigation:navigation-fragment-ktx:2.7.5") + implementation("androidx.navigation:navigation-fragment-ktx:2.7.6") // Design & UI implementation("jp.wasabeef:glide-transformations:4.3.0") implementation("androidx.preference:preference-ktx:1.2.1") - implementation("com.google.android.material:material:1.10.0") + implementation("com.google.android.material:material:1.11.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") @@ -200,8 +204,8 @@ dependencies { 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) @@ -224,8 +228,8 @@ dependencies { Level 25 or Less. */ // Downloading & Networking - implementation("androidx.work:work-runtime:2.8.1") - implementation("androidx.work:work-runtime-ktx:2.8.1") + implementation("androidx.work:work-runtime:2.9.0") + implementation("androidx.work:work-runtime-ktx:2.9.0") implementation("com.github.Blatzar:NiceHttp:0.4.4") // HTTP Lib } 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 09ea151d..ae14a6c9 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt @@ -179,9 +179,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..6684c059 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:8.1.4") + classpath("com.android.tools.build:gradle:8.2.0") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21") classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10") @@ -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.21-1.0.16" apply false } tasks.register("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