From 9e96cd4507ca062ee087a43ac2ee97c0fbfd8cbd Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Wed, 15 Jan 2020 12:33:52 +0300
Subject: [PATCH] Wizard: do not print binaries specification for all native
 targets

#KT-35719 fixed
---
 .../nativeForCurrentSystem/build.gradle.kts          |  8 +-------
 .../simpleNativeTarget/build.gradle.kts              |  8 +-------
 .../ir/buildsystem/gradle/multiplatform/ir.kt        | 12 +++++++-----
 .../moduleConfigurators/NativeTargetConfigurator.kt  |  6 +-----
 4 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle.kts
index 6f6b433f381..125412cb181 100644
--- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle.kts
+++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle.kts
@@ -17,13 +17,7 @@ kotlin {
         else -> throw GradleException("Host OS is not supported in Kotlin/Native.")
     }
 
-    nativeTarget.apply {
-        binaries {
-            executable {
-                entryPoint = "MAIN CLASS"
-            }
-        }
-    }
+
     sourceSets {
         val myNativeMain by getting
         val myNativeTest by getting
diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle.kts
index b3d8bd664e4..42c805fec92 100644
--- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle.kts
+++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle.kts
@@ -8,13 +8,7 @@ repositories {
     mavenCentral()
 }
 kotlin {
-    linuxX64 {
-        binaries {
-            executable {
-                entryPoint = "MAIN CLASS"
-            }
-        }
-    }
+    linuxX64()
     sourceSets {
         val linuxX64Main by getting
         val linuxX64Test by getting
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/gradle/multiplatform/ir.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/gradle/multiplatform/ir.kt
index c423d63db63..f6374053eb8 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/gradle/multiplatform/ir.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/gradle/multiplatform/ir.kt
@@ -64,12 +64,14 @@ data class NonDefaultTargetConfigurationIR(
         copy(irs = irs)
 
     override fun GradlePrinter.renderGradle() {
-        +name
-        when (dsl) {
-            GradlePrinter.GradleDsl.KOTLIN -> +".apply"
-            GradlePrinter.GradleDsl.GROOVY -> +".with"
+        if (irs.isNotEmpty()) {
+            +name
+            when (dsl) {
+                GradlePrinter.GradleDsl.KOTLIN -> +".apply"
+                GradlePrinter.GradleDsl.GROOVY -> +".with"
+            }
+            +" "; inBrackets { irs.listNl() }
         }
-        +" "; inBrackets { irs.listNl() }
     }
 }
 
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/NativeTargetConfigurator.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/NativeTargetConfigurator.kt
index 5e77476178f..d5576670d0b 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/NativeTargetConfigurator.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/NativeTargetConfigurator.kt
@@ -14,11 +14,7 @@ import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ModuleType
 import org.jetbrains.kotlin.tools.projectWizard.plugins.printer.GradlePrinter
 import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Module
 
-interface NativeTargetConfigurator : TargetConfigurator {
-    override fun createInnerTargetIrs(module: Module): List<BuildSystemIR> = buildList {
-        +NativeTargetInternalIR("MAIN CLASS")
-    }
-}
+interface NativeTargetConfigurator : TargetConfigurator
 
 class RealNativeTargetConfigurator private constructor(
     override val moduleSubType: ModuleSubType