From 3ce00d6780c415a08a147c3f4a16cabd879d5180 Mon Sep 17 00:00:00 2001
From: Adam McNeilly <amcneilly331@gmail.com>
Date: Wed, 1 May 2024 20:50:07 -0400
Subject: [PATCH] Updating to Kotlin 2.0

---
 app/build.gradle.kts      | 11 ++---------
 build.gradle              |  5 ++---
 gradle/libs.versions.toml |  4 +++-
 lint-checks/build.gradle  |  2 +-
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 58bace21..12ef6508 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -9,8 +9,9 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("dagger.hilt.android.plugin")
-    alias(libs.plugins.ksp)
     id("com.google.protobuf").version("0.9.4")
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.ksp)
 }
 
 kotlin {
@@ -73,14 +74,6 @@ android {
         )
     }
 
-    buildFeatures {
-        compose = true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
-
     packagingOptions {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
diff --git a/build.gradle b/build.gradle
index be35e75e..bd1b4877 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,8 +10,6 @@ buildscript {
         // https://developer.android.com/jetpack/androidx/releases/hilt
         hiltVersion = libs.versions.hilt.get()
 
-        kotlinVersion = "1.9.21"
-
         // https://github.com/ben-manes/gradle-versions-plugin
         versionsPluginVersion = "0.51.0"
 
@@ -31,7 +29,7 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:8.3.2"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hiltVersion"
         classpath "com.github.ben-manes:gradle-versions-plugin:$versionsPluginVersion"
@@ -46,6 +44,7 @@ buildscript {
 plugins {
     id "com.mxalbert.gradle.jacoco-android" version "0.2.1" apply false
     id "org.jmailen.kotlinter" version "4.3.0" apply false
+    alias(libs.plugins.compose.compiler).apply(false)
     alias(libs.plugins.ksp).apply(false)
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 05750706..cdfaa724 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,8 @@ espresso = "3.5.1"
 hilt = "2.51.1"
 hiltNavigationCompose = "1.2.0"
 junit = "4.13.2"
-ksp = "1.9.23-1.0.20"
+kotlin = "2.0.0-RC2"
+ksp = "2.0.0-RC2-1.0.20"
 lifecycle = "2.7.0"
 lint = "27.1.2"
 material = "1.11.0"
@@ -73,4 +74,5 @@ accompanist = [
 ]
 
 [plugins]
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
diff --git a/lint-checks/build.gradle b/lint-checks/build.gradle
index e3de59c3..f04aa0e6 100644
--- a/lint-checks/build.gradle
+++ b/lint-checks/build.gradle
@@ -8,7 +8,7 @@ java {
 }
 
 dependencies {
-    compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${libs.versions.kotlin.get()}"
     compileOnly "com.android.tools.lint:lint-api:$rootProject.ext.versions.lint"
     compileOnly "com.android.tools.lint:lint-checks:$rootProject.ext.versions.lint"