From ce53f347a0c631c3074e1d280a34b84d5c228a71 Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <hotkeytlt@gmail.com>
Date: Wed, 9 Feb 2022 06:41:10 +0400
Subject: [PATCH] KT-MR-5666 Remove reverse mapping in K/N, as the platforms
 work in KPM

---
 .../targets/native/KotlinNativeTarget.kt      |  4 ----
 .../native/KotlinNativeTargetPreset.kt        | 24 +++++++------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt
index 0a9ce697df1..d7a8fee10dd 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt
@@ -140,10 +140,6 @@ open class KotlinNativeTarget @Inject constructor(
             String::class.java
         )
     }
-
-    internal val isKpm: Boolean
-        get() = project.hasKpmModel &&
-                kpmNativeVariantClass(konanTarget) != null
 }
 
 private val hostManager by lazy { HostManager() }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt
index 238c9cb95ee..0b7c0a98891 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt
@@ -71,11 +71,6 @@ abstract class AbstractKotlinNativeTargetPreset<T : KotlinNativeTarget>(
 
     protected abstract fun instantiateTarget(name: String): T
 
-    private val kpmVariantClass = kpmNativeVariantClass(konanTarget)
-
-    protected val isKpm: Boolean
-        get() = project.hasKpmModel && kpmVariantClass != null
-
     override fun createTarget(name: String): T {
         setupNativeCompiler()
 
@@ -85,9 +80,12 @@ abstract class AbstractKotlinNativeTargetPreset<T : KotlinNativeTarget>(
             preset = this@AbstractKotlinNativeTargetPreset
 
             val compilationFactory =
-                if (isKpm)
-                    KotlinMappedNativeCompilationFactory(this, checkNotNull(kpmVariantClass))
-                else KotlinNativeCompilationFactory(this)
+                if (project.hasKpmModel) {
+                    val kpmVariantClass = kpmNativeVariantClass(konanTarget) ?: error("Can't find the KPM variant class for $konanTarget")
+                    KotlinMappedNativeCompilationFactory(this, kpmVariantClass)
+                } else {
+                    KotlinNativeCompilationFactory(this)
+                }
             compilations = project.container(compilationFactory.itemClass, compilationFactory)
         }
 
@@ -111,10 +109,6 @@ abstract class AbstractKotlinNativeTargetPreset<T : KotlinNativeTarget>(
             }
         }
 
-        if (project.hasKpmModel && !result.isKpm) {
-            mapTargetCompilationsToKpmVariants(result, PublicationRegistrationMode.AFTER_EVALUATE)
-        }
-
         return result
     }
 
@@ -129,7 +123,7 @@ open class KotlinNativeTargetPreset(name: String, project: Project, konanTarget:
 
     override fun createTargetConfigurator(): AbstractKotlinTargetConfigurator<KotlinNativeTarget> {
         val configurator = KotlinNativeTargetConfigurator<KotlinNativeTarget>()
-        return if (isKpm)
+        return if (project.hasKpmModel)
             KpmNativeTargetConfigurator(configurator)
         else configurator
     }
@@ -144,7 +138,7 @@ open class KotlinNativeTargetWithHostTestsPreset(name: String, project: Project,
 
     override fun createTargetConfigurator(): AbstractKotlinTargetConfigurator<KotlinNativeTargetWithHostTests> {
         val configurator = KotlinNativeTargetWithHostTestsConfigurator()
-        return if (isKpm)
+        return if (project.hasKpmModel)
             KpmNativeTargetConfigurator(configurator)
         else configurator
     }
@@ -158,7 +152,7 @@ open class KotlinNativeTargetWithSimulatorTestsPreset(name: String, project: Pro
 
     override fun createTargetConfigurator(): AbstractKotlinTargetConfigurator<KotlinNativeTargetWithSimulatorTests> {
         val configurator = KotlinNativeTargetWithSimulatorTestsConfigurator()
-        return if (isKpm)
+        return if (project.hasKpmModel)
             KpmNativeTargetConfigurator(configurator)
         else configurator
     }