From 896d1ce267a8a1042ef5a9e218148c632bd8841e Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Mon, 27 Feb 2023 15:30:30 +0100 Subject: [PATCH] [Gradle] Rename K2CompileTask to K2MultiplatformCompilationTask ^KT-56210 Verification Pending --- .../KotlinCompilationK2MultiplatformConfigurator.kt | 4 ++-- .../kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt | 2 +- .../{K2CompileTask.kt => K2MultiplatformCompilationTask.kt} | 6 +++--- .../kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 4 ++-- .../kotlin/gradle/unitTests/K2MultiplatformStructureTest.kt | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) rename libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/{K2CompileTask.kt => K2MultiplatformCompilationTask.kt} (74%) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationK2MultiplatformConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationK2MultiplatformConfigurator.kt index 8b408bf1255..ec7e456a3a4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationK2MultiplatformConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationK2MultiplatformConfigurator.kt @@ -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 -> diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt index fce304fdc27..fea8bb49917 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt @@ -312,7 +312,7 @@ internal constructor( private val execOperations: ExecOperations ) : AbstractKotlinNativeCompile(objectFactory), KotlinCompile, - K2CompileTask, + K2MultiplatformCompilationTask, KotlinCompilationTask { @get:Input diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/K2CompileTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/K2MultiplatformCompilationTask.kt similarity index 74% rename from libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/K2CompileTask.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/K2MultiplatformCompilationTask.kt index 542911bb762..88b8f2001f1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/K2CompileTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/K2MultiplatformCompilationTask.kt @@ -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 `` */ -internal interface K2CompileTask : Task { +internal interface K2MultiplatformCompilationTask : Task { @get:Nested val compilerOptions: KotlinCommonCompilerOptions diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index fdbb6d7cf85..3685be8fdba 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -526,7 +526,7 @@ abstract class KotlinCompile @Inject constructor( workerExecutor: WorkerExecutor, objectFactory: ObjectFactory ) : AbstractKotlinCompile(objectFactory, workerExecutor), - K2CompileTask, + K2MultiplatformCompilationTask, @Suppress("TYPEALIAS_EXPANSION_DEPRECATION") KotlinJvmCompileDsl, KotlinCompilationTask, UsesKotlinJavaToolchain { @@ -923,7 +923,7 @@ abstract class Kotlin2JsCompile @Inject constructor( KotlinCompilationTask, UsesLibraryFilterCachingService, KotlinJsCompile, - K2CompileTask { + K2MultiplatformCompilationTask { init { incremental = true diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/K2MultiplatformStructureTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/K2MultiplatformStructureTest.kt index e34d7b2d9be..4eb0468aa9e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/K2MultiplatformStructureTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/K2MultiplatformStructureTest.kt @@ -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) {