From e98e1a26e1ef219c6c512e1988fc161a9b667deb Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Fri, 13 Feb 2026 17:15:47 +0800
Subject: [PATCH] Downgrade to AGP 8.13.2

Building is broken on ecnrypted linux

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
 app/build.gradle.kts      | 1 +
 build.gradle.kts          | 8 +-------
 gradle.properties         | 3 ---
 gradle/libs.versions.toml | 5 +++--
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d85ea83a4..a5f3b7715 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -13,6 +13,7 @@ import java.util.Properties
 
 plugins {
     alias(libs.plugins.android.application)
+    alias(libs.plugins.jetbrains.kotlin.android)
     alias(libs.plugins.jetbrains.kotlin.compose)
     alias(libs.plugins.jetbrains.kotlin.parcelize)
     alias(libs.plugins.jetbrains.kotlin.serialization)
diff --git a/build.gradle.kts b/build.gradle.kts
index 1c9d267b7..810cdf068 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,15 +5,9 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-buildscript {
-    dependencies {
-        // https://developer.android.com/build/releases/agp-9-0-0-release-notes#runtime-dependency-on-kotlin-gradle-plugin-upgrade
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}")
-    }
-}
-
 plugins {
     alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.jetbrains.kotlin.android) apply false
     alias(libs.plugins.jetbrains.kotlin.compose) apply false
     alias(libs.plugins.jetbrains.kotlin.parcelize) apply false
     alias(libs.plugins.jetbrains.kotlin.serialization) apply false
diff --git a/gradle.properties b/gradle.properties
index 9c4aa1b63..8bad2bce4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,6 +28,3 @@ kotlin.code.style=official
 android.enableR8.fullMode=false
 # https://docs.gradle.org/current/userguide/configuration_cache.html
 org.gradle.configuration-cache=true
-
-android.usesSdkInManifest.disallowed=false
-android.r8.strictFullModeForKeepRules=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 369a33dae..859db42d8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@
 [versions]
 activity = "1.12.4"
 agCoreservice = "13.3.1.300"
-androidGradlePlugin = "9.0.0"
+androidGradlePlugin = "8.13.2"
 adaptive = "1.3.0-alpha08"
 androidx-hilt = "1.3.0"
 androidx-junit = "1.3.0"
@@ -20,7 +20,7 @@ epoxy = "5.2.1"
 espresso = "3.7.0"
 gplayapi = "3.5.7"
 hiddenapibypass = "6.1"
-hilt = "2.59.1"
+hilt = "2.58"
 junit = "4.13.2"
 kotlin = "2.3.10"
 ksp = "2.3.5"
@@ -116,6 +116,7 @@ google-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 hilt-android-plugin = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
 jetbrains-kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 jetbrains-kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 jetbrains-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 rikka-tools-refine-plugin = { id = "dev.rikka.tools.refine", version.ref = "rikkaTools" }