Skip to content

Commit 96f1ceb

Browse files
Merge remote-tracking branch 'origin/release/1.6.2'
2 parents 881e16c + 0bcfa4f commit 96f1ceb

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ internal object ComposeCompilerCompatibility {
2727
"2.0.0-Beta1" to "1.5.4-dev1-kt2.0.0-Beta1",
2828
"2.0.0-Beta4" to "1.5.9-kt-2.0.0-Beta4",
2929
"2.0.0-Beta5" to "1.5.11-kt-2.0.0-Beta5",
30+
"2.0.0-RC1" to "1.5.11-kt-2.0.0-RC1",
3031
)
3132

3233
fun compilerVersionFor(kotlinVersion: String): String {

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/configureNativeCompilerCaching.kt

-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ private const val NONE_VALUE = "none"
2323
// https://github.com/JetBrains/compose-multiplatform-core/blob/jb-main/compose/runtime/runtime/build.gradle#L75
2424
private val SUPPORTED_NATIVE_TARGETS = setOf(
2525
// ios
26-
KonanTarget.IOS_ARM32,
2726
KonanTarget.IOS_X64,
2827
KonanTarget.IOS_ARM64,
2928
KonanTarget.IOS_SIMULATOR_ARM64,
@@ -38,7 +37,6 @@ private val SUPPORTED_NATIVE_TARGETS = setOf(
3837
KonanTarget.WATCHOS_ARM64,
3938
KonanTarget.WATCHOS_ARM32,
4039
KonanTarget.WATCHOS_X64,
41-
KonanTarget.WATCHOS_X86, // it's going to be deprecated, see comments in KonanTarget
4240
KonanTarget.WATCHOS_SIMULATOR_ARM64,
4341
// mingw
4442
KonanTarget.MINGW_X64,

0 commit comments

Comments
 (0)