jlengrand/compose-multiplatform
1
0
Fork 0
mirror of https://github.com/jlengrand/compose-multiplatform.git synced 2026-03-10 08:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

uikit open simulator, simplify availability condition (#2414)

Browse Source
This commit is contained in:
dima.avdeev
2022-10-17 21:46:42 +03:00
committed by GitHub
parent 11fad5eca7
commit 0554616489
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/SimctlListData.kt
View File

@@ -55,7 +55,11 @@ internal class DeviceData(
val dataPathSize: Long? = null,
val logPath: String? = null,
val udid: String,
val isAvailable: Boolean? = null,
/**
* Simulator may be unavailable after update Xcode version.
* By default, we think what simulator is available.
*/
val isAvailable: Boolean = true,
val deviceTypeIdentifier: String? = null,
val state: String,
)

4
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/registerSimulatorTasks.kt
View File

@@ -36,9 +36,7 @@ fun Project.registerSimulatorTasks(
doLast {
val device = getSimctlListData().devices.map { it.value }.flatten()
.firstOrNull { device: DeviceData ->
val xcode13Condition = device.state.contains("unavailable")
val xcode14Condition = device.isAvailable == false
device.name == deviceName && (xcode13Condition || xcode14Condition)
device.name == deviceName && !device.isAvailable
}
if (device != null) {
runExternalTool(