From e3f9f255c79c1d6cba31bd804a8aa25269004de4 Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:07:35 +0100
Subject: [PATCH] =?UTF-8?q?Revert=20"feat:=20make=20cloudstream=20compilat?=
 =?UTF-8?q?ion=20and=20builds=20fast!=20using=20gradle=20conf=E2=80=A6"=20?=
 =?UTF-8?q?(#968)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 21b341e12fea168b828cd433b96bb5cf3a8fd46f.
---
 app/build.gradle.kts | 13 ++++---------
 gradle.properties    |  3 +--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e29ee12d..31e225de 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -62,13 +62,8 @@ android {
         versionCode = 63
         versionName = "4.3.1"
 
-        // retrieve latest commit hash
-        val gitVersion = providers.exec {
-            commandLine("git", "rev-parse", "--short", "HEAD")
-        }.standardOutput.asText.get()
-
         resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
-        resValue("string", "commit_hash", gitVersion)
+        resValue("string", "commit_hash", "git rev-parse --short HEAD".execute() ?: "")
         resValue("bool", "is_prerelease", "false")
 
         // Reads local.properties
@@ -168,10 +163,10 @@ 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.7")
+    implementation("androidx.navigation:navigation-ui-ktx:2.7.6")
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.7.0")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.7.7")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.7.6")
 
     // Design & UI
     implementation("jp.wasabeef:glide-transformations:4.3.0")
@@ -187,7 +182,7 @@ dependencies {
 
     // For KSP -> Official Annotation Processors are Not Yet Supported for KSP
     ksp("dev.zacsweers.autoservice:auto-service-ksp:1.1.0")
-    implementation("com.google.guava:guava:33.0.0-android")
+    implementation("com.google.guava:guava:32.1.3-android")
     implementation("dev.zacsweers.autoservice:auto-service-ksp:1.1.0")
 
     // Media 3 (ExoPlayer)
diff --git a/gradle.properties b/gradle.properties
index 8260a224..6a873a6a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,5 +20,4 @@ android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 android.nonTransitiveRClass=false
-android.nonFinalResIds=false
-org.gradle.configuration-cache=true
\ No newline at end of file
+android.nonFinalResIds=false
\ No newline at end of file