From b72f7c3021d23e724aeca1504713d28faae943a2 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Mon, 8 Jun 2020 13:34:04 +0300
Subject: [PATCH] [Gradle, JS] Remove Native Only isMainCompilation only

---
 .../gradle/targets/native/KotlinNativeTargetConfigurator.kt | 2 +-
 .../gradle/targets/native/KotlinNativeTargetPreset.kt       | 3 ---
 .../kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt | 6 +++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt
index 93bcd6623db..f7c300a00a6 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt
@@ -199,7 +199,7 @@ open class KotlinNativeTargetConfigurator<T : KotlinNativeTarget>(
                 with(compilation) {
                     // Register the interop library as a dependency of the compilation to make IDE happy.
                     project.dependencies.add(compileDependencyConfigurationName, interopOutput)
-                    if (isMainCompilation) {
+                    if (isMain()) {
                         // Register the interop library as an outgoing klib to allow depending on projects with cinterops.
                         project.dependencies.add(target.apiElementsConfigurationName, interopOutput)
                         // Add the interop library in publication.
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 04515eba4c5..212b87960c0 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
@@ -149,9 +149,6 @@ internal val KonanTarget.isCurrentHost: Boolean
 internal val KonanTarget.enabledOnCurrentHost
     get() = HostManager().isEnabled(this)
 
-internal val AbstractKotlinNativeCompilation.isMainCompilation: Boolean
-    get() = isMain()
-
 // KonanVersion doesn't provide an API to compare versions,
 // so we have to transform it to KotlinVersion first.
 // Note: this check doesn't take into account the meta version (release, eap, dev).
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
index 8d5675df2c6..1a0ae26875c 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 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.
  */
 
@@ -325,7 +325,7 @@ open class KotlinNativeCompile : AbstractKotlinNativeCompile<KotlinCommonOptions
 
     @get:Internal
     override val baseName: String
-        get() = if (compilation.isMainCompilation) project.name else "${project.name}_${compilation.name}"
+        get() = if (compilation.isMain()) project.name else "${project.name}_${compilation.name}"
 
     @get:Input
     val moduleName: String by project.provider {
@@ -940,7 +940,7 @@ open class CInteropProcess : DefaultTask() {
     val baseKlibName: String
         @Internal get() {
             val compilationPrefix = settings.compilation.let {
-                if (it.isMainCompilation) project.name else it.name
+                if (it.isMain()) project.name else it.name
             }
             return "$compilationPrefix-cinterop-$interopName"
         }