From f22272b76da6ac77db53b913b33583b5b95cb8ac Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 18:54:57 +0000
Subject: [PATCH] Update Kotlin, KSP and Compose to v2 (major) (#3540)

* Update Kotlin, KSP and Compose to v2

* Update dependency com.jeppeman.mockposable:mockposable-gradle to v0.9

* upgrade Mockposable

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel Frett <daniel.frett@cru.org>
---
 build-logic/src/main/kotlin/AndroidConfiguration.kt | 4 +---
 build.gradle                                        | 1 +
 gradle/libs.versions.toml                           | 9 ++++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/build-logic/src/main/kotlin/AndroidConfiguration.kt b/build-logic/src/main/kotlin/AndroidConfiguration.kt
index 1c16824012..e41b234ac3 100644
--- a/build-logic/src/main/kotlin/AndroidConfiguration.kt
+++ b/build-logic/src/main/kotlin/AndroidConfiguration.kt
@@ -111,8 +111,7 @@ fun BaseExtension.configureFlavorDimensions(project: Project) {
 // context(Project)
 fun CommonExtension<*, *, *, *, *, *>.configureCompose(project: Project, enableCircuit: Boolean = false) {
     buildFeatures.compose = true
-    composeOptions.kotlinCompilerExtensionVersion =
-        project.libs.findVersion("androidx-compose-compiler").get().requiredVersion
+    project.pluginManager.apply("org.jetbrains.kotlin.plugin.compose")
 
     // add our base compose dependencies
     project.dependencies.apply {
@@ -136,7 +135,6 @@ fun CommonExtension<*, *, *, *, *, *>.configureCompose(project: Project, enableC
     project.pluginManager.apply("com.jeppeman.mockposable")
     project.mockposable {
         plugins = listOf("mockk")
-        composeCompilerPluginVersion = project.libs.findVersion("androidx-compose-compiler").get().requiredVersion
     }
 }
 
diff --git a/build.gradle b/build.gradle
index 85ca5337fd..8499bac084 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,6 +16,7 @@ buildscript {
 }
 
 plugins {
+    alias libs.plugins.compose.compiler apply false
     alias libs.plugins.hilt apply false
     alias libs.plugins.ksp apply false
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7143e3b239..b9ccd713f0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
 [versions]
 accompanist = "0.34.0"
 android-gradle-plugin = "8.5.0"
-androidx-compose-compiler = "1.5.14"
 androidx-compose-material = "1.6.8"
 androidx-compose-ui = "1.6.8"
 androidx-core = "1.13.1"
@@ -22,10 +21,10 @@ firebase-perf = "21.0.1"
 godtoolsShared = "1.0.1"
 google-auto-value = "1.11.0"
 gtoSupport = "4.2.1"
-kotlin = "1.9.24"
+kotlin = "2.0.0"
 kotlinCoroutines = "1.8.1"
 kotlinKover = "0.7.6"
-ksp = "1.9.24-1.0.20"
+ksp = "2.0.0-1.0.22"
 ktlint = "1.3.0"
 ktlintGradle = "12.1.1"
 lottie = "6.4.1"
@@ -183,7 +182,7 @@ lottie = { module = "com.airbnb.android:lottie", version.ref = "lottie" }
 lottie-compose = { module = "com.airbnb.android:lottie-compose", version.ref = "lottie" }
 materialComponents = "com.google.android.material:material:1.12.0"
 mockk = "io.mockk:mockk:1.13.11"
-mockposable = 'com.jeppeman.mockposable:mockposable-gradle:0.8'
+mockposable = 'com.jeppeman.mockposable:mockposable-gradle:0.9'
 okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp3" }
 okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp3" }
 onesky-gradlePlugin = "co.brainly:plugin:1.6.0"
@@ -216,7 +215,6 @@ weakdelegate = "com.github.Karumi:WeakDelegate:1.0.1"
 youtubePlayer = "com.pierfrancescosoffritti.androidyoutubeplayer:core:12.1.0"
 
 # HACK: dependencies used to trigger renovate upgrades
-androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "androidx-compose-compiler" }
 ktlint = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint" }
 
 [bundles]
@@ -229,6 +227,7 @@ ktlint-rulesets = ["ktlint-rules-compose"]
 test-framework = ["junit", "kotlin-test", "androidx-test-junit", "mockk", "robolectric"]
 
 [plugins]
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 firebase-appdistribution = { id = "com.google.firebase.appdistribution", version = "5.0.0" }
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "3.0.2" }
 firebase-perf = { id = "com.google.firebase.firebase-perf", version = "1.4.2" }