From 0bcfa4f9d64663933a4c79b3e320ea44f0fa32a4 Mon Sep 17 00:00:00 2001 From: Pavel Shishkin Date: Tue, 9 Apr 2024 18:26:15 +0200 Subject: [PATCH] Support Kotlin 2.0.0-RC1 (#4596) --- .../org/jetbrains/compose/ComposeCompilerCompatibility.kt | 1 + .../experimental/internal/configureNativeCompilerCaching.kt | 2 -- .../uikit/internal/utils/kotlinNativeTargetUtils.kt | 2 +- .../compose/resources/ios/determineIosKonanTargetsFromEnv.kt | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt index 03d4a2434f..8cc55d0620 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt @@ -27,6 +27,7 @@ internal object ComposeCompilerCompatibility { "2.0.0-Beta1" to "1.5.4-dev1-kt2.0.0-Beta1", "2.0.0-Beta4" to "1.5.9-kt-2.0.0-Beta4", "2.0.0-Beta5" to "1.5.11-kt-2.0.0-Beta5", + "2.0.0-RC1" to "1.5.11-kt-2.0.0-RC1", ) fun compilerVersionFor(kotlinVersion: String): String { diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/configureNativeCompilerCaching.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/configureNativeCompilerCaching.kt index 49a0b2317c..1ecde81ccd 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/configureNativeCompilerCaching.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/configureNativeCompilerCaching.kt @@ -23,7 +23,6 @@ private const val NONE_VALUE = "none" // https://github.com/JetBrains/compose-multiplatform-core/blob/jb-main/compose/runtime/runtime/build.gradle#L75 private val SUPPORTED_NATIVE_TARGETS = setOf( // ios - KonanTarget.IOS_ARM32, KonanTarget.IOS_X64, KonanTarget.IOS_ARM64, KonanTarget.IOS_SIMULATOR_ARM64, @@ -38,7 +37,6 @@ private val SUPPORTED_NATIVE_TARGETS = setOf( KonanTarget.WATCHOS_ARM64, KonanTarget.WATCHOS_ARM32, KonanTarget.WATCHOS_X64, - KonanTarget.WATCHOS_X86, // it's going to be deprecated, see comments in KonanTarget KonanTarget.WATCHOS_SIMULATOR_ARM64, // mingw KonanTarget.MINGW_X64, diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/utils/kotlinNativeTargetUtils.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/utils/kotlinNativeTargetUtils.kt index a6811a749c..6c3f76988b 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/utils/kotlinNativeTargetUtils.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/utils/kotlinNativeTargetUtils.kt @@ -13,7 +13,7 @@ internal fun KotlinNativeTarget.isIosSimulatorTarget(): Boolean = konanTarget === KonanTarget.IOS_X64 || konanTarget === KonanTarget.IOS_SIMULATOR_ARM64 internal fun KotlinNativeTarget.isIosDeviceTarget(): Boolean = - konanTarget === KonanTarget.IOS_ARM64 || konanTarget === KonanTarget.IOS_ARM32 + konanTarget === KonanTarget.IOS_ARM64 internal fun KotlinNativeTarget.isIosTarget(): Boolean = isIosSimulatorTarget() || isIosDeviceTarget() diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ios/determineIosKonanTargetsFromEnv.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ios/determineIosKonanTargetsFromEnv.kt index 64fd097239..58d75a822e 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ios/determineIosKonanTargetsFromEnv.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ios/determineIosKonanTargetsFromEnv.kt @@ -17,7 +17,6 @@ internal fun determineIosKonanTargetsFromEnv(platform: String, archs: List when (arch) { "arm64", "arm64e" -> KonanTarget.IOS_ARM64 - "armv7", "armv7s" -> KonanTarget.IOS_ARM32 else -> error("Unknown iOS device arch: '$arch'") } })