From f98765f2545cd517332d570b85167657d4b5fa59 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Tue, 25 Apr 2023 09:55:35 +0200 Subject: [PATCH] [Gradle] Remove KotlinCompilation.moduleName ^KT-58220 Verification Pending --- .../api/kotlin-gradle-plugin-api.api | 1 - .../kotlin/gradle/plugin/KotlinCompilation.kt | 3 --- .../kotlin/gradle/plugin/KotlinCompilationInfo.kt | 5 ++--- .../mpp/compilationImpl/KotlinCompilationImpl.kt | 10 ---------- .../kotlin/gradle/plugin/mpp/kotlinCompilations.kt | 2 +- .../gradle/targets/jvm/KotlinJvmTargetConfigurator.kt | 6 ++---- .../targets/jvm/KotlinJvmWithJavaTargetPreset.kt | 3 +-- 7 files changed, 6 insertions(+), 24 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api b/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api index ea5979d96e1..762bee9211c 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api +++ b/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api @@ -739,7 +739,6 @@ public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinCompila public abstract fun getDisambiguatedName ()Ljava/lang/String; public abstract fun getKotlinOptions ()Lorg/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions; public abstract fun getKotlinSourceSets ()Ljava/util/Set; - public abstract fun getModuleName ()Ljava/lang/String; public abstract fun getName ()Ljava/lang/String; public abstract fun getOutput ()Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationOutput; public abstract fun getPlatformType ()Lorg/jetbrains/kotlin/gradle/plugin/KotlinPlatformType; diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt index dfb094d5ece..542eeaafd68 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt @@ -104,9 +104,6 @@ interface KotlinCompilation : Named, override val relatedConfigurationNames: List get() = super.relatedConfigurationNames + compileDependencyConfigurationName - @Deprecated("Scheduled for removal with Kotlin 1.9. Use compilerOptions instead") - val moduleName: String - val disambiguatedName get() = target.disambiguationClassifier + name } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilationInfo.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilationInfo.kt index aac06e63ed3..4273bd482c1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilationInfo.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilationInfo.kt @@ -11,7 +11,7 @@ import org.gradle.api.Project import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.file.FileCollection import org.gradle.api.file.SourceDirectorySet -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataTarget +import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.plugin.mpp.internal import org.jetbrains.kotlin.gradle.plugin.mpp.isMain import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmAbstractFragmentMetadataCompilationData @@ -57,9 +57,8 @@ internal sealed class KotlinCompilationInfo { override val compilationName: String get() = origin.compilationName - @Suppress("DEPRECATION") override val moduleName: String - get() = origin.moduleName + get() = origin.moduleNameForCompilation().get() override val compilerOptions: HasCompilerOptions<*> get() = origin.compilerOptions diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationImpl.kt index 65950cfe71a..616935d55ce 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationImpl.kt @@ -145,16 +145,6 @@ internal class KotlinCompilationImpl constructor( //endregion - - //region Compiler Module Management - - @Suppress("OVERRIDE_DEPRECATION") - override val moduleName: String - get() = moduleNameForCompilation(target.project.baseModuleName()).get() - - //endregion - - //region Compile Tasks override val compileKotlinTaskName: String diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt index 55be88cfad5..c073c9efa74 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt @@ -87,7 +87,7 @@ private val invalidModuleNameCharactersRegex = """[\\/\r\n\t]""".toRegex() internal fun Project.baseModuleName(): Provider = archivesName.orElse(project.name) internal fun KotlinCompilation<*>.moduleNameForCompilation( - baseName: Provider + baseName: Provider = project.baseModuleName() ): Provider = baseName.map { val suffix = if (compilationName == KotlinCompilation.MAIN_COMPILATION_NAME) { "" diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTargetConfigurator.kt index ea234f8caa3..b3d8bb4733d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTargetConfigurator.kt @@ -9,6 +9,7 @@ import org.gradle.api.Task import org.gradle.api.plugins.JavaBasePlugin import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmCompilation +import org.jetbrains.kotlin.gradle.plugin.mpp.moduleNameForCompilation import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest import org.jetbrains.kotlin.gradle.tasks.KotlinTasksProvider import org.jetbrains.kotlin.gradle.tasks.dependsOn @@ -46,10 +47,7 @@ open class KotlinJvmTargetConfigurator : target.compilations.configureEach { it.compilerOptions.options.moduleName.convention( - target.project.providers.provider { - @Suppress("DEPRECATION") - it.moduleName - } + it.moduleNameForCompilation() ) } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmWithJavaTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmWithJavaTargetPreset.kt index dcf716ea3aa..a34fc215291 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmWithJavaTargetPreset.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmWithJavaTargetPreset.kt @@ -58,8 +58,7 @@ class KotlinJvmWithJavaTargetPreset( target.compilations.configureEach { it.compilerOptions.options.moduleName.convention( - @Suppress("DEPRECATION") - project.providers.provider { it.moduleName } + it.moduleNameForCompilation() ) }