From 346c21c0b40d65b292424c0fa7c1532054bbd50a Mon Sep 17 00:00:00 2001
From: Niels van Velzen <git@ndat.nl>
Date: Fri, 16 Jan 2026 19:45:28 +0100
Subject: [PATCH] Migrate to AGP9

---
 app/build.gradle.kts                       |  8 ++++----
 build.gradle.kts                           | 22 ++--------------------
 design/build.gradle.kts                    |  3 +--
 gradle.properties                          |  5 +----
 gradle/libs.versions.toml                  |  4 +++-
 playback/core/build.gradle.kts             |  3 +--
 playback/jellyfin/build.gradle.kts         |  3 +--
 playback/media3/exoplayer/build.gradle.kts |  3 +--
 playback/media3/session/build.gradle.kts   |  3 +--
 preference/build.gradle.kts                |  3 +--
 10 files changed, 16 insertions(+), 41 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7e7b8e19d..d18508cbb 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,9 +1,8 @@
 plugins {
-	id("com.android.application")
-	kotlin("android")
-	alias(libs.plugins.kotlin.serialization)
-	alias(libs.plugins.kotlin.compose)
 	alias(libs.plugins.aboutlibraries)
+	alias(libs.plugins.android.application)
+	alias(libs.plugins.kotlin.compose)
+	alias(libs.plugins.kotlin.serialization)
 }
 
 android {
@@ -24,6 +23,7 @@ android {
 		buildConfig = true
 		viewBinding = true
 		compose = true
+		resValues = true
 	}
 
 	compileOptions {
diff --git a/build.gradle.kts b/build.gradle.kts
index ea56e6a28..ed554d17f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,11 +1,12 @@
 plugins {
+	alias(libs.plugins.android.application) apply false
+	alias(libs.plugins.android.library) apply false
 	alias(libs.plugins.detekt)
 	java
 }
 
 buildscript {
 	dependencies {
-		classpath(libs.android.gradle)
 		classpath(libs.kotlin.gradle)
 	}
 }
@@ -34,25 +35,6 @@ tasks.withType<io.gitlab.arturbosch.detekt.Detekt> {
 	}
 }
 
-subprojects {
-	// Configure default Kotlin compiler options
-	tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile> {
-		compilerOptions {
-			jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
-		}
-	}
-
-	// Configure default Android options
-	plugins.withType<com.android.build.gradle.BasePlugin> {
-		configure<com.android.build.gradle.BaseExtension> {
-			compileOptions {
-				sourceCompatibility = JavaVersion.VERSION_1_8
-				targetCompatibility = JavaVersion.VERSION_1_8
-			}
-		}
-	}
-}
-
 tasks.withType<Test> {
 	// Ensure Junit emits the full stack trace when a unit test fails through gradle
 	useJUnit()
diff --git a/design/build.gradle.kts b/design/build.gradle.kts
index 9f5f7bf78..3912e247c 100644
--- a/design/build.gradle.kts
+++ b/design/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-	id("com.android.library")
-	kotlin("android")
+	alias(libs.plugins.android.library)
 }
 
 android {
diff --git a/gradle.properties b/gradle.properties
index 1374f4d28..9e69c8a46 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,4 @@ org.gradle.jvmargs=-Xmx2048m
 sdk.version=default
 
 # Android
-android.useAndroidX=true
-
-# Enable LeakCanary
-leakcanary.enable=false
+android.newDsl=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ef279417e..5beb9d298 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -43,9 +43,11 @@ timber = "5.0.1"
 
 [plugins]
 aboutlibraries = { id = "com.mikepenz.aboutlibraries.plugin.android", version.ref = "aboutlibraries" }
+android-application = { id = "com.android.application", version.ref = "android-gradle" }
+android-library = { id = "com.android.library", version.ref = "android-gradle" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 
 [libraries]
 # Jellyfin
diff --git a/playback/core/build.gradle.kts b/playback/core/build.gradle.kts
index fc329b8d2..110ccdae1 100644
--- a/playback/core/build.gradle.kts
+++ b/playback/core/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-	id("com.android.library")
-	kotlin("android")
+	alias(libs.plugins.android.library)
 }
 
 android {
diff --git a/playback/jellyfin/build.gradle.kts b/playback/jellyfin/build.gradle.kts
index 1ff77f8f8..5e1b9bbbf 100644
--- a/playback/jellyfin/build.gradle.kts
+++ b/playback/jellyfin/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-	id("com.android.library")
-	kotlin("android")
+	alias(libs.plugins.android.library)
 }
 
 android {
diff --git a/playback/media3/exoplayer/build.gradle.kts b/playback/media3/exoplayer/build.gradle.kts
index 987c8c5a6..73af56e73 100644
--- a/playback/media3/exoplayer/build.gradle.kts
+++ b/playback/media3/exoplayer/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-	id("com.android.library")
-	kotlin("android")
+	alias(libs.plugins.android.library)
 }
 
 android {
diff --git a/playback/media3/session/build.gradle.kts b/playback/media3/session/build.gradle.kts
index f68b563f3..c32ee2de8 100644
--- a/playback/media3/session/build.gradle.kts
+++ b/playback/media3/session/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-	id("com.android.library")
-	kotlin("android")
+	alias(libs.plugins.android.library)
 }
 
 android {
diff --git a/preference/build.gradle.kts b/preference/build.gradle.kts
index 0be5a0e0f..e5082bf9d 100644
--- a/preference/build.gradle.kts
+++ b/preference/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-	id("com.android.library")
-	kotlin("android")
+	alias(libs.plugins.android.library)
 }
 
 android {