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

Fat frameworks: Don't add simulators into CFBundleSupportedPlatforms

Browse Source 
Issue #KT-32223 fixed
This commit is contained in:
Ilya Matveev
2019-09-27 09:04:15 +07:00
parent d978f9671e
commit 57b111cbe8
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/FatFrameworkTask.kt
+5 -7
View File
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.Framework
import org.jetbrains.kotlin.konan.target.Architecture import org.jetbrains.kotlin.konan.target.Architecture
import org.jetbrains.kotlin.konan.target.Family import org.jetbrains.kotlin.konan.target.Family
import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.konan.target.KonanTarget.*
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
import java.io.File import java.io.File
@@ -166,13 +167,10 @@ open class FatFrameworkTask: DefaultTask() {
private val Framework.plistPlatform: String private val Framework.plistPlatform: String
get() = when(konanTarget) { get() = when(konanTarget) {
KonanTarget.IOS_ARM32, KonanTarget.IOS_ARM64 -> "iPhoneOS" IOS_ARM32, IOS_ARM64, IOS_X64 -> "iPhoneOS"
KonanTarget.IOS_X64 -> "iPhoneSimulator" TVOS_ARM64, TVOS_X64 -> "AppleTVOS"
KonanTarget.TVOS_ARM64 -> "appletvos" WATCHOS_ARM32, WATCHOS_ARM64, WATCHOS_X86, WATCHOS_X64 -> "WatchOS"
KonanTarget.TVOS_X64 -> "appletvsimulator" else -> error("Fat frameworks are not supported for platform `${konanTarget.visibleName}`")
KonanTarget.WATCHOS_ARM32, KonanTarget.WATCHOS_ARM64 -> "watchos"
KonanTarget.WATCHOS_X86, KonanTarget.WATCHOS_X64 -> "watchsimulator"
else -> error("Fat frameworks are not supported for target `${konanTarget.visibleName}`")
} }
// Runs the PlistBuddy utility with the given commands to configure the given plist file. // Runs the PlistBuddy utility with the given commands to configure the given plist file.