kotlin/mosaic
1
0
Fork 0
mirror of https://github.com/JakeWharton/mosaic.git synced 2025-10-31 02:39:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update kotlin monorepo to v2.2.0 (#915)

Browse Source 
* 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>
This commit is contained in:
renovate[bot]
2025-07-07 04:23:04 +00:00
committed by GitHub
parent a1f98748f1
commit 1c65cf79c4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build-support/src/main/kotlin/com/jakewharton/mosaic/buildsupport/MosaicBuildExtensionImpl.kt
View File

@ -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.KotlinCompilation.Companion.TEST_COMPILATION_NAME
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
internal class MosaicBuildExtensionImpl( internal class MosaicBuildExtensionImpl(
private val project: Project, private val project: Project,
@ -134,9 +135,10 @@ internal class MosaicBuildExtensionImpl(
kotlin.targets.withType(KotlinJvmTarget::class.java).configureEach { target -> kotlin.targets.withType(KotlinJvmTarget::class.java).configureEach { target ->
target.compilations.named(MAIN_COMPILATION_NAME).configure { main -> target.compilations.named(MAIN_COMPILATION_NAME).configure { main ->
main.compileJavaTaskProvider!!.configure { javaCompile: JavaCompile -> main.compileJavaTaskProvider!!.configure { javaCompile: JavaCompile ->
val kotlinCompile = project.tasks.getByName(main.compileKotlinTaskName) as KotlinCompile
javaCompile.options.compilerArgumentProviders.add(object : CommandLineArgumentProvider { javaCompile.options.compilerArgumentProviders.add(object : CommandLineArgumentProvider {
@CompileClasspath @CompileClasspath
val classes = main.compileKotlinTask.destinationDirectory val classes = kotlinCompile.destinationDirectory
override fun asArguments(): Iterable<String> { override fun asArguments(): Iterable<String> {
return listOf( return listOf(

2
gradle/libs.versions.toml
View File

@ -1,6 +1,6 @@
[versions] [versions]
jetbrains-compose = "1.8.2" jetbrains-compose = "1.8.2"
kotlin = "2.1.21" kotlin = "2.2.0"
kotlinx-coroutines = "1.10.2" kotlinx-coroutines = "1.10.2"
[libraries] [libraries]