[Gradle] Remove KotlinCompilation.moduleName

^KT-58220 Verification Pending

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;

libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt

@@ -104,9 +104,6 @@ interface KotlinCompilation<out T : KotlinCommonOptionsDeprecated> : Named,
     override val relatedConfigurationNames: List<String>
         get() = super.relatedConfigurationNames + compileDependencyConfigurationName
 
-    @Deprecated("Scheduled for removal with Kotlin 1.9. Use compilerOptions instead")
-    val moduleName: String
-
     val disambiguatedName
         get() = target.disambiguationClassifier + name
 }

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

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

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<String> = archivesName.orElse(project.name)
 
 internal fun KotlinCompilation<*>.moduleNameForCompilation(
-    baseName: Provider<String>
+    baseName: Provider<String> = project.baseModuleName()
 ): Provider<String> = baseName.map {
     val suffix = if (compilationName == KotlinCompilation.MAIN_COMPILATION_NAME) {
         ""

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 {
+                it.moduleNameForCompilation()
-                    @Suppress("DEPRECATION")
-                    it.moduleName
-                }
             )
         }
     }

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")
+                it.moduleNameForCompilation()
-                project.providers.provider { it.moduleName }
             )
         }