[Gradle] Rename K2CompileTask to K2MultiplatformCompilationTask

^KT-56210 Verification Pending
This commit is contained in:
Sebastian Sellmair
2023-02-27 15:30:30 +01:00
committed by Space Team
parent a30abcb00c
commit 896d1ce267
5 changed files with 11 additions and 11 deletions
@@ -6,14 +6,14 @@
package org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinCompilationImplFactory
import org.jetbrains.kotlin.gradle.tasks.K2CompileTask
import org.jetbrains.kotlin.gradle.tasks.K2MultiplatformCompilationTask
import org.jetbrains.kotlin.gradle.tasks.K2MultiplatformStructure
internal object KotlinCompilationK2MultiplatformConfigurator : KotlinCompilationImplFactory.PreConfigure {
override fun configure(compilation: KotlinCompilationImpl) {
compilation.project.tasks.configureEach { compileTask ->
if (compileTask.name != compilation.compileKotlinTaskName) return@configureEach
if (compileTask !is K2CompileTask) return@configureEach
if (compileTask !is K2MultiplatformCompilationTask) return@configureEach
compileTask.multiplatformStructure.refinesEdges.set(compilation.project.provider {
compilation.allKotlinSourceSets.flatMap { sourceSet ->
@@ -312,7 +312,7 @@ internal constructor(
private val execOperations: ExecOperations
) : AbstractKotlinNativeCompile<KotlinCommonOptions, StubK2NativeCompilerArguments>(objectFactory),
KotlinCompile<KotlinCommonOptions>,
K2CompileTask,
K2MultiplatformCompilationTask,
KotlinCompilationTask<KotlinNativeCompilerOptions> {
@get:Input
@@ -11,11 +11,11 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
/**
* Analogous to [KotlinCompile] for K2
* This does not extend [KotlinCompile], since [KotlinCompile] carries an unwanted/conflicting
* Analogous to [KotlinCompilationTask] for K2
* This does not extend [KotlinCompilationTask], since [KotlinCompilationTask] carries an unwanted/conflicting
* type parameter `<out T : KotlinCommonOptions>`
*/
internal interface K2CompileTask : Task {
internal interface K2MultiplatformCompilationTask : Task {
@get:Nested
val compilerOptions: KotlinCommonCompilerOptions
@@ -526,7 +526,7 @@ abstract class KotlinCompile @Inject constructor(
workerExecutor: WorkerExecutor,
objectFactory: ObjectFactory
) : AbstractKotlinCompile<K2JVMCompilerArguments>(objectFactory, workerExecutor),
K2CompileTask,
K2MultiplatformCompilationTask,
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION") KotlinJvmCompileDsl,
KotlinCompilationTask<KotlinJvmCompilerOptions>,
UsesKotlinJavaToolchain {
@@ -923,7 +923,7 @@ abstract class Kotlin2JsCompile @Inject constructor(
KotlinCompilationTask<KotlinJsCompilerOptions>,
UsesLibraryFilterCachingService,
KotlinJsCompile,
K2CompileTask {
K2MultiplatformCompilationTask {
init {
incremental = true
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension
import org.jetbrains.kotlin.gradle.internal.CompilerArgumentAware
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType.IR
import org.jetbrains.kotlin.gradle.tasks.K2CompileTask
import org.jetbrains.kotlin.gradle.tasks.K2MultiplatformCompilationTask
import org.jetbrains.kotlin.gradle.tasks.K2MultiplatformStructure
import org.jetbrains.kotlin.gradle.tasks.K2MultiplatformStructure.RefinesEdge
import org.jetbrains.kotlin.gradle.tasks.K2MultiplatformStructure.Fragment
@@ -111,7 +111,7 @@ class K2MultiplatformStructureTest {
compilation.compilerOptions.options.languageVersion.set(KotlinVersion.KOTLIN_2_0)
}
val compileTask = compilation.compileTaskProvider.get() as K2CompileTask
val compileTask = compilation.compileTaskProvider.get() as K2MultiplatformCompilationTask
/* check dependsOnEdges */
assertEquals(
@@ -155,7 +155,7 @@ class K2MultiplatformStructureTest {
}
}
private fun K2CompileTask.buildCompilerArguments(): CommonCompilerArguments {
private fun K2MultiplatformCompilationTask.buildCompilerArguments(): CommonCompilerArguments {
/* KotlinNative implements CompilerArgumentAware, but does not adhere to its contract */
if (this is KotlinNativeCompile) {