[Gradle] Let InternalKotlinTarget implement HasMutableExtras

KT-55926

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinTarget.kt

@@ -25,6 +25,8 @@ import org.jetbrains.kotlin.gradle.plugin.*
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsageContext.MavenScope.*
 import org.jetbrains.kotlin.gradle.utils.dashSeparatedName
 import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
+import org.jetbrains.kotlin.tooling.core.MutableExtras
+import org.jetbrains.kotlin.tooling.core.mutableExtrasOf
 import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly
 
 internal const val PRIMARY_SINGLE_COMPONENT_NAME = "kotlin"
@@ -32,6 +34,9 @@ internal const val PRIMARY_SINGLE_COMPONENT_NAME = "kotlin"
 abstract class AbstractKotlinTarget(
     final override val project: Project
 ) : InternalKotlinTarget {
+
+    final override val extras: MutableExtras = mutableExtrasOf()
+
     private val attributeContainer = HierarchyAttributeContainer(parent = null)
 
     override fun getAttributes(): AttributeContainer = attributeContainer
@@ -208,7 +213,7 @@ internal fun Project.buildAdhocComponentsFromKotlinVariants(kotlinVariants: Set<
                 adhocVariant.addVariantsFromConfiguration(configuration) { configurationVariantDetails ->
                     val mavenScope = kotlinUsageContext.mavenScope
                     if (mavenScope != null) {
-                        val mavenScopeString = when(mavenScope) {
+                        val mavenScopeString = when (mavenScope) {
                             COMPILE -> "compile"
                             RUNTIME -> "runtime"
                         }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/InternalKotlinTarget.kt

@@ -8,8 +8,9 @@ package org.jetbrains.kotlin.gradle.plugin.mpp
 import org.gradle.api.publish.maven.MavenPublication
 import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
 import org.jetbrains.kotlin.gradle.plugin.KotlinTargetComponent
+import org.jetbrains.kotlin.tooling.core.HasMutableExtras
 
-internal interface InternalKotlinTarget : KotlinTarget {
+internal interface InternalKotlinTarget : KotlinTarget, HasMutableExtras {
     val kotlinComponents: Set<KotlinTargetComponent>
     fun onPublicationCreated(publication: MavenPublication)
 }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetImpl.kt

@@ -19,6 +19,8 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.KotlinTargetComponent
 import org.jetbrains.kotlin.gradle.plugin.mpp.HierarchyAttributeContainer
 import org.jetbrains.kotlin.gradle.plugin.mpp.InternalKotlinTarget
+import org.jetbrains.kotlin.tooling.core.MutableExtras
+import org.jetbrains.kotlin.tooling.core.mutableExtrasOf
 
 internal class ExternalKotlinTargetImpl internal constructor(
     override val project: Project,
@@ -42,6 +44,8 @@ internal class ExternalKotlinTargetImpl internal constructor(
 
     val kotlin = project.multiplatformExtension
 
+    override val extras: MutableExtras = mutableExtrasOf()
+
     override val preset: Nothing? = null
 
     internal val logger: Logger = Logging.getLogger("${ExternalKotlinTargetImpl::class.qualifiedName}: $name")

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalTargetApiExtensions.kt

@@ -7,8 +7,13 @@ package org.jetbrains.kotlin.gradle.plugin.mpp.external
 
 import org.jetbrains.kotlin.gradle.ExternalKotlinTargetApi
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
+import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
+import org.jetbrains.kotlin.gradle.plugin.mpp.internal
 import org.jetbrains.kotlin.gradle.plugin.sources.internal
 import org.jetbrains.kotlin.tooling.core.MutableExtras
 
 @ExternalKotlinTargetApi
 val KotlinSourceSet.extras: MutableExtras get() = this.internal.extras
+
+@ExternalKotlinTargetApi
+val KotlinTarget.extras: MutableExtras get() = this.internal.extras