From 8908d18f585af19bd9d30347721f39a489616ab0 Mon Sep 17 00:00:00 2001
From: Niels van Velzen <git@ndat.nl>
Date: Sat, 6 Jul 2024 11:27:20 +0200
Subject: [PATCH] Migrate Compose compiler

---
 app/build.gradle.kts      | 4 +---
 gradle/libs.versions.toml | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 369baea5f..57715853f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.ksp)
     alias(libs.plugins.kotlin.parcelize)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.detekt)
     alias(libs.plugins.android.junit5)
 }
@@ -85,9 +86,6 @@ android {
         @Suppress("SuspiciousCollectionReassignment")
         freeCompilerArgs += listOf("-Xopt-in=kotlin.RequiresOptIn")
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0c26dcc92..10ee45725 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -32,7 +32,6 @@ modernandroidpreferences = "2.4.0-beta2"
 compose = "1.6.8"
 compose-foundation = "1.6.8"
 compose-material = "1.6.8"
-compose-compiler = "1.5.14"
 
 # Network
 jellyfin-sdk = "1.4.7"
@@ -66,6 +65,7 @@ android-app = { id = "com.android.application", version.ref = "android-plugin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "kotlin-ksp" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 android-junit5 = { id = "de.mannodermaus.android-junit5", version.ref = "android-junit5" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 
@@ -99,7 +99,6 @@ androidx-webkit = { group = "androidx.webkit", name = "webkit", version.ref = "a
 modernandroidpreferences = { group = "de.maxr1998", name = "modernandroidpreferences", version.ref = "modernandroidpreferences" }
 
 # Compose
-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" }
 compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "compose" }
 compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose" }
 compose-animation = { group = "androidx.compose.animation", name = "animation", version.ref = "compose" }