azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't embed bitcode for iOS simulator

Browse Source
This commit is contained in:
Ilya Matveev
2019-02-14 16:40:36 +03:00
committed by Ilya Matveev
parent a576ee4b7d
commit 47b8354d8b
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/AbstractKotlinNativeBinary.kt
+1 -1
View File
@@ -78,7 +78,7 @@ abstract class AbstractKotlinNativeBinary(
override fun getName(): String = name override fun getName(): String = name
override val konanTarget: KonanTarget final override val konanTarget: KonanTarget
get() = variant.konanTarget get() = variant.konanTarget
val identity: NativeVariantIdentity = variant.identity val identity: NativeVariantIdentity = variant.identity
tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/KotlinNativeFrameworkImpl.kt
+7 -7
View File
@@ -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.experimental.KotlinNativeFramework
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
import org.jetbrains.kotlin.konan.target.CompilerOutputKind 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 import javax.inject.Inject
open class KotlinNativeFrameworkImpl @Inject constructor( open class KotlinNativeFrameworkImpl @Inject constructor(
@@ -69,10 +69,10 @@ open class KotlinNativeFrameworkImpl @Inject constructor(
getImplementationDependencies().extendsFrom(this) getImplementationDependencies().extendsFrom(this)
} }
// TODO: Fix embedding override var embedBitcode: BitcodeEmbeddingMode =
override var embedBitcode: BitcodeEmbeddingMode = if (konanTarget.family == Family.IOS) { if (konanTarget == KonanTarget.IOS_ARM64 || konanTarget == KonanTarget.IOS_ARM32) {
buildType.iosEmbedBitcode buildType.iosEmbedBitcode
} else { } else {
BitcodeEmbeddingMode.DISABLE BitcodeEmbeddingMode.DISABLE
} }
} }
tools/kotlin-native-gradle-plugin/src/test/kotlin/ExperimentalPluginTests.kt
+3 -3
View File
@@ -1147,7 +1147,7 @@ class ExperimentalPluginTests {
val transitiveProject = KonanProject.createEmpty(transitiveDir).apply { val transitiveProject = KonanProject.createEmpty(transitiveDir).apply {
buildFile.writeText(""" buildFile.writeText("""
plugins { id 'kotlin-native' } plugins { id 'kotlin-native' }
components.main.targets = [ 'ios_x64' ] components.main.targets = [ 'ios_arm64' ]
""") """)
generateSrcFile("transitive.kt", "fun transitive() = 42") generateSrcFile("transitive.kt", "fun transitive() = 42")
} }
@@ -1156,7 +1156,7 @@ class ExperimentalPluginTests {
val libraryProject = KonanProject.createEmpty(libraryDir).apply { val libraryProject = KonanProject.createEmpty(libraryDir).apply {
buildFile.writeText(""" buildFile.writeText("""
plugins { id 'kotlin-native' } plugins { id 'kotlin-native' }
components.main.targets = [ 'ios_x64' ] components.main.targets = [ 'ios_arm64' ]
dependencies { dependencies {
implementation project(':transitive') implementation project(':transitive')
@@ -1179,7 +1179,7 @@ class ExperimentalPluginTests {
} }
sourceSets.main.component { sourceSets.main.component {
targets = [ 'ios_x64' ] targets = [ 'ios_arm64' ]
outputKinds = [ FRAMEWORK ] outputKinds = [ FRAMEWORK ]
} }
""".trimIndent()) """.trimIndent())