From ecfbe207228c11d7f1ef6f0d210c0d502484ec3d Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Tue, 5 May 2026 11:12:18 +0800
Subject: [PATCH] Upgrade to AGP 9.2.0

Building is still broken on encrypted linux file systems but that's seems to be not a priority
for Google to fix

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

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f26de4c03..2ad31db9f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -5,15 +5,11 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-@file:OptIn(KspExperimental::class)
-
 import com.android.build.api.dsl.ApplicationExtension
-import com.google.devtools.ksp.KspExperimental
 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 810cdf068..1c9d267b7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,9 +5,15 @@
  * 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 8bad2bce4..35c8bf872 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,6 +25,11 @@ android.useAndroidX=true
 kotlin.code.style=official
 
 # https://r8.googlesource.com/r8/+/refs/heads/master/compatibility-faq.md#r8-full-mode
+# Drop after migration to compose
 android.enableR8.fullMode=false
+android.r8.strictFullModeForKeepRules=false
 # https://docs.gradle.org/current/userguide/configuration_cache.html
 org.gradle.configuration-cache=true
+
+# AGP 9.x disallows using SDK in manifest. We are using it for Shizuku support
+android.usesSdkInManifest.disallowed=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 21a6dcb7c..a764e25f2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,8 +7,8 @@
 [versions]
 activity = "1.13.0"
 agCoreservice = "13.3.1.300"
-androidGradlePlugin = "8.13.2"
-adaptive = "1.3.0-alpha09"
+androidGradlePlugin = "9.2.0"
+adaptive = "1.3.0-alpha10"
 androidx-hilt = "1.3.0"
 androidx-junit = "1.3.0"
 browser = "1.10.0"
@@ -20,9 +20,9 @@ epoxy = "5.2.1"
 espresso = "3.7.0"
 gplayapi = "3.5.9"
 hiddenapibypass = "6.1"
-hilt = "2.58"
+hilt = "2.59.2"
 junit = "4.13.2"
-kotlin = "2.3.20"
+kotlin = "2.3.21"
 ksp = "2.3.6"
 ktlint = "14.2.0"
 leakcanary = "2.14"
@@ -116,7 +116,6 @@ 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" }