From 1846ec83e176126bfd7a18bc0d90e5e598d22490 Mon Sep 17 00:00:00 2001
From: Kirill Shmakov <kirill.shmakov@jetbrains.com>
Date: Thu, 21 Feb 2019 11:14:29 +0300
Subject: [PATCH] Return app name of the main folder

Better fix for KT-29804 aligned with KT-30003

KT-29804
KT-30003
---
 ...inGradleAbstractMultiplatformModuleBuilder.kt |  2 +-
 ...tlinGradleMobileMultiplatformModuleBuilder.kt | 16 +++++++++++-----
 .../xcode/XcodeProjectConfigurator.kt            |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt
index 8940ff6ef1f..7ee0d22977b 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt
@@ -32,7 +32,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder(
     val mppInApplication: Boolean = false
 ) : GradleModuleBuilder() {
     var explicitPluginVersion: String? = null
-    val mppDirName = "main"
+    val mppDirName = "app"
 
     override fun getNodeIcon(): Icon = KotlinIcons.MPP
 
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileMultiplatformModuleBuilder.kt
index 1f71fc1c45b..936c51ebe36 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileMultiplatformModuleBuilder.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileMultiplatformModuleBuilder.kt
@@ -100,6 +100,7 @@ class KotlinGradleMobileMultiplatformModuleBuilder :
 
                 import android.support.v7.app.AppCompatActivity
                 import android.os.Bundle
+                import android.widget.TextView
 
                 actual class Sample {
                     actual fun checkMe() = 44
@@ -113,9 +114,9 @@ class KotlinGradleMobileMultiplatformModuleBuilder :
 
                     override fun onCreate(savedInstanceState: Bundle?) {
                         super.onCreate(savedInstanceState)
-                        hello()
                         Sample().checkMe()
                         setContentView(R.layout.activity_main)
+                        findViewById<TextView>(R.id.main_text).text = hello()
                     }
                 }
             """.trimIndent()
@@ -254,9 +255,12 @@ sdk.dir=PleaseSpecifyAndroidSdkPathHere
     tools:context=".MainActivity">
 
     <TextView
+        android:id="@+id/main_text"
+        android:textSize="42sp"
+        android:layout_margin="5sp"
+        android:textAlignment="center"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -310,7 +314,9 @@ sdk.dir=PleaseSpecifyAndroidSdkPathHere
                 // 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 {
@@ -350,10 +356,10 @@ sdk.dir=PleaseSpecifyAndroidSdkPathHere
             task copyFramework {
                 def buildType = project.findProperty('kotlin.build.type') ?: 'DEBUG'
                 def target = project.findProperty('kotlin.target') ?: 'ios'
-                dependsOn kotlin.targets."${"$"}target".compilations.main.linkTaskName('FRAMEWORK', buildType)
+                dependsOn kotlin.targets."${"$"}target".binaries.getFramework(buildType).linkTask
 
                 doLast {
-                    def srcFile = kotlin.targets."${"$"}target".compilations.main.getBinary('FRAMEWORK', buildType)
+                    def srcFile = kotlin.targets."${"$"}target".binaries.getFramework(buildType).outputFile
                     def targetDir = getProperty('configuration.build.dir')
                     copy {
                         from srcFile.parent
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/xcode/XcodeProjectConfigurator.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/xcode/XcodeProjectConfigurator.kt
index 62240621b61..c62a7e63139 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/xcode/XcodeProjectConfigurator.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/xcode/XcodeProjectConfigurator.kt
@@ -12,7 +12,7 @@ class XcodeProjectConfigurator {
 
     private fun VirtualFile.bufferedWriter() = getOutputStream(this).bufferedWriter()
 
-    private val mppDirName = "main"
+    private val mppDirName = "app"
 
     fun createSkeleton(rootDir: VirtualFile) {
         val iosDir = rootDir.createChildDirectory(this, "iosApp")