From 4971af293c89e791a10e3683f46a9ee30eaa07b7 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Fri, 9 Feb 2024 17:59:44 +0100 Subject: [PATCH] [Gradle] Remove ownModuleName input ^KT-64504 Verification Pending --- .../kotlin/gradle/tasks/KotlinJvmApiTest.kt | 3 --- .../compilerRunner/GradleKotlinCompilerRunner.kt | 14 ++++++++++---- .../kotlin/gradle/plugin/KotlinBaseApiPlugin.kt | 2 -- .../kotlin/gradle/tasks/AbstractKotlinCompile.kt | 4 ---- .../configuration/AbstractKotlinCompileConfig.kt | 2 -- .../tasks/configuration/KotlinCompileConfig.kt | 6 ------ 6 files changed, 10 insertions(+), 21 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJvmApiTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJvmApiTest.kt index a2ffedfedb1..3e939cff381 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJvmApiTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJvmApiTest.kt @@ -43,7 +43,6 @@ class KotlinJvmApiTest : KGPBaseTest() { it.source("src/main") it.multiPlatformEnabled.set(false) it.moduleName.set("main") - it.ownModuleName.set("main") it.sourceSetName.set("main") it.useModuleDetection.set(false) it.destinationDirectory.fileValue(new File(project.buildDir, "fooOutput")) @@ -90,7 +89,6 @@ class KotlinJvmApiTest : KGPBaseTest() { ) build(customTaskName) { - assertOutputDoesNotContain("No value has been specified for property 'ownModuleName'") assertFileInProjectExists("build/$outputDirName/org/example/application/MainKt.class") assertFileInProjectExists("build/$outputDirName/org/example/Lib.class") assertFileInProjectExists("build/$outputDirName/META-INF/$customModuleName.kotlin_module") @@ -136,7 +134,6 @@ class KotlinJvmApiTest : KGPBaseTest() { it.source("src/main") it.multiPlatformEnabled.set(false) it.moduleName.set("main") - it.ownModuleName.set("main") it.sourceSetName.set("main") it.useModuleDetection.set(false) it.destinationDirectory.fileValue(new File(project.buildDir, "fooOutput")) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt index 1a771d32552..ed1e6228ac3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt @@ -300,8 +300,7 @@ internal open class GradleCompilerRunner( if (task is AbstractKotlinCompile<*>) { val module = IncrementalModuleEntry( project.path, - @Suppress("DEPRECATION") // remove with KT-64504 - task.ownModuleName.get(), + task.taskModuleName, project.layout.buildDirectory.get().asFile, task.buildHistoryFile.get().asFile, task.abiSnapshotFile.get().asFile @@ -336,8 +335,7 @@ internal open class GradleCompilerRunner( val kotlinTask = mainCompilation.compileTaskProvider.get() as? AbstractKotlinCompile<*> ?: continue val module = IncrementalModuleEntry( project.path, - @Suppress("DEPRECATION") // remove with KT-64504 - kotlinTask.ownModuleName.get(), + kotlinTask.taskModuleName, project.layout.buildDirectory.get().asFile, kotlinTask.buildHistoryFile.get().asFile, kotlinTask.abiSnapshotFile.get().asFile @@ -370,6 +368,14 @@ internal open class GradleCompilerRunner( } } + private val AbstractKotlinCompile<*>.taskModuleName + get() = when (this) { + is KotlinCompile -> compilerOptions.moduleName.get() + is Kotlin2JsCompile -> compilerOptions.moduleName.get() + is KotlinCompileCommon -> moduleName.get() + else -> throw IllegalStateException("Unknown AbstractKotlinCompile task instance: ${this::class.qualifiedName}") + } + private fun jarForJavaSourceSet( project: Project, sourceSetName: String, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinBaseApiPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinBaseApiPlugin.kt index 01580bf46ff..f53525e49f1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinBaseApiPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinBaseApiPlugin.kt @@ -86,8 +86,6 @@ abstract class KotlinBaseApiPlugin : DefaultKotlinBasePlugin(), KotlinJvmFactory KotlinCompileConfig(myProject, kotlinExtension) ) registeredKotlinJvmCompileTask.configure { - @Suppress("DEPRECATION") - it.ownModuleName.set(compilerOptions.moduleName) @Suppress("DEPRECATION") it.moduleName.set(compilerOptions.moduleName) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/AbstractKotlinCompile.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/AbstractKotlinCompile.kt index 5dccc26f06e..39887757846 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/AbstractKotlinCompile.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/AbstractKotlinCompile.kt @@ -112,10 +112,6 @@ abstract class AbstractKotlinCompile @Inject constr .map { it.normalize().relativeTo(buildDirFile).invariantSeparatorsPath }.toSet() } - @Deprecated("Scheduled for removal with Kotlin 2.0", ReplaceWith("moduleName")) - @get:Input - abstract val ownModuleName: Property - @get:Internal val startParameters = BuildReportsService.getStartParameters(project) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt index 16f94f26cc8..f11aea08459 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt @@ -118,8 +118,6 @@ internal abstract class AbstractKotlinCompileConfig : AbstractKotl task.associatedJavaCompileTaskName.value(javaTask.map { it.name }) } - @Suppress("DEPRECATION") - task.ownModuleName.value( - providers.provider { - task.parentKotlinOptions.orNull?.moduleName ?: compilationInfo.moduleName - }) - task.nagTaskModuleNameUsage.value(true).disallowChanges() } }