From 47b8354d8bca65d41698ba54fd966a0f70f02d8f Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Thu, 14 Feb 2019 16:40:36 +0300
Subject: [PATCH] Don't embed bitcode for iOS simulator

---
 .../internal/AbstractKotlinNativeBinary.kt         |  2 +-
 .../internal/KotlinNativeFrameworkImpl.kt          | 14 +++++++-------
 .../src/test/kotlin/ExperimentalPluginTests.kt     |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/AbstractKotlinNativeBinary.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/AbstractKotlinNativeBinary.kt
index 9764d78c0ca..c9662bce4a1 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/AbstractKotlinNativeBinary.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/AbstractKotlinNativeBinary.kt
@@ -78,7 +78,7 @@ abstract class AbstractKotlinNativeBinary(
 
     override fun getName(): String = name
 
-    override val konanTarget: KonanTarget
+    final override val konanTarget: KonanTarget
         get() = variant.konanTarget
 
     val identity: NativeVariantIdentity = variant.identity
diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/KotlinNativeFrameworkImpl.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/KotlinNativeFrameworkImpl.kt
index 022a48abb76..bc488d09f10 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/KotlinNativeFrameworkImpl.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/KotlinNativeFrameworkImpl.kt
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.gradle.plugin.experimental.KotlinNativeBinary
 import org.jetbrains.kotlin.gradle.plugin.experimental.KotlinNativeFramework
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
 import org.jetbrains.kotlin.konan.target.CompilerOutputKind
-import org.jetbrains.kotlin.konan.target.Family
+import org.jetbrains.kotlin.konan.target.KonanTarget
 import javax.inject.Inject
 
 open class KotlinNativeFrameworkImpl @Inject constructor(
@@ -69,10 +69,10 @@ open class KotlinNativeFrameworkImpl @Inject constructor(
         getImplementationDependencies().extendsFrom(this)
     }
 
-    // TODO: Fix embedding
-    override var embedBitcode: BitcodeEmbeddingMode = if (konanTarget.family == Family.IOS) {
-        buildType.iosEmbedBitcode
-    } else {
-        BitcodeEmbeddingMode.DISABLE
-    }
+    override var embedBitcode: BitcodeEmbeddingMode =
+        if (konanTarget == KonanTarget.IOS_ARM64 || konanTarget == KonanTarget.IOS_ARM32) {
+            buildType.iosEmbedBitcode
+        } else {
+            BitcodeEmbeddingMode.DISABLE
+        }
 }
\ No newline at end of file
diff --git a/tools/kotlin-native-gradle-plugin/src/test/kotlin/ExperimentalPluginTests.kt b/tools/kotlin-native-gradle-plugin/src/test/kotlin/ExperimentalPluginTests.kt
index 01dbcbfeac0..e476b31baa1 100644
--- a/tools/kotlin-native-gradle-plugin/src/test/kotlin/ExperimentalPluginTests.kt
+++ b/tools/kotlin-native-gradle-plugin/src/test/kotlin/ExperimentalPluginTests.kt
@@ -1147,7 +1147,7 @@ class ExperimentalPluginTests {
         val transitiveProject = KonanProject.createEmpty(transitiveDir).apply {
             buildFile.writeText("""
                 plugins { id 'kotlin-native' }
-                components.main.targets = [ 'ios_x64' ]
+                components.main.targets = [ 'ios_arm64' ]
             """)
             generateSrcFile("transitive.kt", "fun transitive() = 42")
         }
@@ -1156,7 +1156,7 @@ class ExperimentalPluginTests {
         val libraryProject = KonanProject.createEmpty(libraryDir).apply {
             buildFile.writeText("""
                 plugins { id 'kotlin-native' }
-                components.main.targets = [ 'ios_x64' ]
+                components.main.targets = [ 'ios_arm64' ]
 
                 dependencies {
                     implementation project(':transitive')
@@ -1179,7 +1179,7 @@ class ExperimentalPluginTests {
                 }
 
                 sourceSets.main.component {
-                    targets = [ 'ios_x64' ]
+                    targets = [ 'ios_arm64' ]
                     outputKinds = [ FRAMEWORK ]
                 }
             """.trimIndent())