From 1c65cf79c41a1afcb15c66f0799cf47062837f20 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 7 Jul 2025 04:23:04 +0000
Subject: [PATCH] Update kotlin monorepo to v2.2.0 (#915)

* Update kotlin monorepo to v2.2.0

* Resolve Kotlin compile task for ourselves

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jake Wharton <jw@squareup.com>
---
 .../mosaic/buildsupport/MosaicBuildExtensionImpl.kt           | 4 +++-
 gradle/libs.versions.toml                                     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build-support/src/main/kotlin/com/jakewharton/mosaic/buildsupport/MosaicBuildExtensionImpl.kt b/build-support/src/main/kotlin/com/jakewharton/mosaic/buildsupport/MosaicBuildExtensionImpl.kt
index 4b40a43f..9547a388 100644
--- a/build-support/src/main/kotlin/com/jakewharton/mosaic/buildsupport/MosaicBuildExtensionImpl.kt
+++ b/build-support/src/main/kotlin/com/jakewharton/mosaic/buildsupport/MosaicBuildExtensionImpl.kt
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPI
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.TEST_COMPILATION_NAME
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 internal class MosaicBuildExtensionImpl(
 	private val project: Project,
@@ -134,9 +135,10 @@ internal class MosaicBuildExtensionImpl(
 			kotlin.targets.withType(KotlinJvmTarget::class.java).configureEach { target ->
 				target.compilations.named(MAIN_COMPILATION_NAME).configure { main ->
 					main.compileJavaTaskProvider!!.configure { javaCompile: JavaCompile ->
+						val kotlinCompile = project.tasks.getByName(main.compileKotlinTaskName) as KotlinCompile
 						javaCompile.options.compilerArgumentProviders.add(object : CommandLineArgumentProvider {
 							@CompileClasspath
-							val classes = main.compileKotlinTask.destinationDirectory
+							val classes = kotlinCompile.destinationDirectory
 
 							override fun asArguments(): Iterable<String> {
 								return listOf(
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4c02cafa..e20a6aa1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 jetbrains-compose = "1.8.2"
-kotlin = "2.1.21"
+kotlin = "2.2.0"
 kotlinx-coroutines = "1.10.2"
 
 [libraries]