fixup! [Gradle] Remove KPM<->TCS Model Mapping
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinCommonCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinCommonCompilation.kt
index 1b938f3..1c2d253 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinCommonCompilation.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinCommonCompilation.kt
@@ -10,7 +10,6 @@
import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonOptions
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
-import org.jetbrains.kotlin.gradle.plugin.mpp.compilationDetailsImpl.MetadataMappedCompilationDetails
import org.jetbrains.kotlin.gradle.targets.metadata.isKotlinGranularMetadataEnabled
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommon
@@ -23,9 +22,6 @@
) : AbstractKotlinCompilation<KotlinMultiplatformCommonOptions>(compilationDetails),
KotlinMetadataCompilation<KotlinMultiplatformCommonOptions> {
- override fun getName() =
- if (compilationDetails is MetadataMappedCompilationDetails) defaultSourceSetName else super.compilationPurpose
-
@Suppress("DEPRECATION")
@Deprecated("Accessing task instance directly is deprecated", replaceWith = ReplaceWith("compileTaskProvider"))
override val compileKotlinTask: KotlinCompileCommon
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationDetailsImpl/MetadataMappedCompilationDetails.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationDetailsImpl/MetadataMappedCompilationDetails.kt
deleted file mode 100644
index dd49a18..0000000
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationDetailsImpl/MetadataMappedCompilationDetails.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.gradle.plugin.mpp.compilationDetailsImpl
-
-import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
-import org.jetbrains.kotlin.gradle.plugin.HasKotlinDependencies
-import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
-import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
-import org.jetbrains.kotlin.gradle.plugin.mpp.CompilationDetails
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataTarget
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.AbstractKotlinFragmentMetadataCompilationData
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.GradleKpmDependencyFilesHolder
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.ofMetadataCompilationDependencies
-
-internal open class MetadataMappedCompilationDetails<T : KotlinCommonOptions>(
- override val target: KotlinMetadataTarget,
- defaultSourceSet: KotlinSourceSet,
- final override val compilationData: AbstractKotlinFragmentMetadataCompilationData<T>
-) : AbstractCompilationDetails<T>(defaultSourceSet) {
-
- @Suppress("UNCHECKED_CAST")
- override val compilation: KotlinCompilation<T>
- get() = target.compilations.getByName(defaultSourceSet.name) as KotlinCompilation<T>
-
- override val compileDependencyFilesHolder: GradleKpmDependencyFilesHolder =
- GradleKpmDependencyFilesHolder.ofMetadataCompilationDependencies(compilationData)
-
- override val kotlinDependenciesHolder: HasKotlinDependencies
- get() = compilationData.fragment
-
- override fun associateWith(other: CompilationDetails<*>) {
- throw UnsupportedOperationException("not supported in the mapped model")
- }
-
- override val associateCompilations: Set<CompilationDetails<*>>
- get() = emptySet()
-
- override fun whenSourceSetAdded(sourceSet: KotlinSourceSet) {
- if (sourceSet != defaultSourceSet)
- throw UnsupportedOperationException("metadata compilations have predefined sources")
- }
-}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt
index b6fee33..73f746b 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt
@@ -13,7 +13,6 @@
import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationWithResources
import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider
-import org.jetbrains.kotlin.gradle.plugin.mpp.compilationDetailsImpl.MetadataMappedCompilationDetails
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinNativeCompilationData
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinNativeFragmentMetadataCompilationData
import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
@@ -105,9 +104,6 @@
),
KotlinMetadataCompilation<KotlinCommonOptions> {
- override fun getName() =
- if (compilationDetails is MetadataMappedCompilationDetails) defaultSourceSetName else super.compilationPurpose
-
override val target: KotlinMetadataTarget get() = super.target as KotlinMetadataTarget
override val isActive: Boolean
