From 40474bee3f592542afaa91383c4bdc9d16f39af2 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Wed, 13 Mar 2019 18:52:53 +0700
Subject: [PATCH] Update Kotlin/Native project templates

Use modern "binaries" DSL
---
 ...nGradleNativeMultiplatformModuleBuilder.kt | 29 +++++++++----------
 ...eMobileSharedMultiplatformModuleBuilder.kt |  4 ++-
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinGradleNativeMultiplatformModuleBuilder.kt b/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinGradleNativeMultiplatformModuleBuilder.kt
index 359c40d68a6..22abc9d9c24 100644
--- a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinGradleNativeMultiplatformModuleBuilder.kt
+++ b/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinGradleNativeMultiplatformModuleBuilder.kt
@@ -19,6 +19,9 @@ class KotlinGradleNativeMultiplatformModuleBuilder : KotlinGradleAbstractMultipl
     private val nativeSourceName get() = "$nativeTargetName$productionSuffix"
     val nativeTestName get() = "$nativeTargetName$testSuffix"
 
+    private val nativeReleaseExecutableRunTaskame get() = ":runReleaseExecutable${nativeTargetName.capitalize()}"
+    private val nativeDebugExecutableRunTaskame get() = ":runDebugExecutable${nativeTargetName.capitalize()}"
+
     override fun getNodeIcon(): Icon = KotlinIcons.NATIVE
 
     override fun getBuilderId() = "kotlin.gradle.multiplatform.native"
@@ -75,11 +78,13 @@ class KotlinGradleNativeMultiplatformModuleBuilder : KotlinGradleAbstractMultipl
                 // For MacOS, should be changed to e.g. macosX64
                 // For Windows, should be changed to e.g. mingwX64
                 $nativePresetName("$nativeTargetName") {
-                    compilations.main {
-                        // Comment to generate Kotlin/Native library (KLIB) instead of executable file:
-                        outputKinds("executable")
-                        // Change to specify fully qualified name of your application's entry point:
-                        entryPoint 'sample.main'
+                    binaries {
+                        executable {
+                            // Change to specify fully qualified name of your application's entry point:
+                           entryPoint = 'sample.main'
+                            // Specify command-line arguments, if necessary:
+                            runTask?.args('')
+                        }
                     }
                 }
                 sourceSets {
@@ -92,17 +97,9 @@ class KotlinGradleNativeMultiplatformModuleBuilder : KotlinGradleAbstractMultipl
                 }
             }
 
-            task runProgram {
-                def buildType = 'RELEASE' // Change to 'DEBUG' to run application with debug symbols.
-                dependsOn kotlin.targets.$nativeTargetName.compilations.main.linkTaskName('EXECUTABLE', buildType)
-                doLast {
-                    def programFile = kotlin.targets.$nativeTargetName.compilations.main.getBinary('EXECUTABLE', buildType)
-                    exec {
-                        executable programFile
-                        args ''
-                    }
-                }
-            }
+            // Use the following Gradle tasks to run your application:
+            // $nativeReleaseExecutableRunTaskame - without debug symbols
+            // $nativeDebugExecutableRunTaskame - with debug symbols
         """.trimIndent()
     }
 }
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileSharedMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileSharedMultiplatformModuleBuilder.kt
index 99a87614e6a..46a8cf5515b 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileSharedMultiplatformModuleBuilder.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileSharedMultiplatformModuleBuilder.kt
@@ -149,7 +149,9 @@ class KotlinGradleMobileSharedMultiplatformModuleBuilder : KotlinGradleAbstractM
                 // This is for iPhone emulator
                 // Switch here to iosArm64 (or iosArm32) to build library for iPhone device
                 iosX64("$nativeTargetName") {
-                    compilations.main.outputKinds("framework")
+                    binaries {
+                        framework()
+                    }
                 }
                 sourceSets {
                     $commonSourceName {