From 8c93618a44bca9faf6219a0034a1103ec1f2b1d0 Mon Sep 17 00:00:00 2001
From: Anselmo Alexandre <anselmo.alexandre97@gmail.com>
Date: Wed, 3 Jul 2024 05:21:57 +0200
Subject: [PATCH] Updated kotlin version and migrated compose compiler (#974)

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

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 51d6e0480..e4b1aaad4 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -19,6 +19,7 @@ plugins {
   alias(libs.plugins.kotlin.android)
   alias(libs.plugins.ksp)
   alias(libs.plugins.hilt)
+  alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -76,9 +77,6 @@ android {
     dataBinding = true
     buildConfig = true
   }
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-  }
   packagingOptions {
     // Multiple dependency bring these files in. Exclude them to enable
     // our test APK to build (has no effect on our AARs)
diff --git a/build.gradle.kts b/build.gradle.kts
index 1112b5044..dab44ce22 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -30,6 +30,7 @@ plugins {
     alias(libs.plugins.android.test) apply false
     alias(libs.plugins.gradle.versions)
     alias(libs.plugins.version.catalog.update)
+    alias(libs.plugins.compose.compiler)
 }
 
 apply("${project.rootDir}/buildscripts/toml-updater-config.gradle")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 151b6f294..e99d05de7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -36,8 +36,8 @@ guava = "33.1.0-jre"
 hilt = "2.51.1"
 hiltNavigationCompose = "1.2.0"
 junit = "4.13.2"
-kotlin = "1.9.23"
-ksp = "1.9.23-1.0.20"
+kotlin = "2.0.0"
+ksp = "2.0.0-1.0.21"
 # @keep
 ktlint = "0.40.0"
 ktx = "1.13.1"
@@ -123,3 +123,4 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
 version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "version-catalog-update" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }