From 689f63112a49aa8dbf8f04d9498d658b1a06798a Mon Sep 17 00:00:00 2001 From: Oleksandr Karpovich Date: Mon, 12 Feb 2024 16:29:40 +0100 Subject: [PATCH] Gradle Plugin: Simplify coroutines version check (#4283) --- .../main/kotlin/org/jetbrains/compose/ComposePlugin.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt index a7c4b4acd3..e689e31c99 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt @@ -19,8 +19,8 @@ import org.jetbrains.compose.desktop.DesktopExtension import org.jetbrains.compose.desktop.application.internal.configureDesktop import org.jetbrains.compose.desktop.preview.internal.initializePreview import org.jetbrains.compose.experimental.dsl.ExperimentalExtension -import org.jetbrains.compose.experimental.internal.configureExperimentalTargetsFlagsCheck import org.jetbrains.compose.experimental.internal.configureExperimental +import org.jetbrains.compose.experimental.internal.configureExperimentalTargetsFlagsCheck import org.jetbrains.compose.experimental.internal.configureNativeCompilerCaching import org.jetbrains.compose.internal.KOTLIN_MPP_PLUGIN_ID import org.jetbrains.compose.internal.mppExt @@ -31,11 +31,11 @@ import org.jetbrains.compose.internal.utils.currentTarget import org.jetbrains.compose.resources.configureComposeResources import org.jetbrains.compose.resources.ios.configureSyncTask import org.jetbrains.compose.web.WebExtension -import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler -import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion import org.jetbrains.kotlin.gradle.dsl.KotlinCompile import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile +import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType +import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion internal val composeVersion get() = ComposeBuildConfig.composeVersion @@ -97,7 +97,7 @@ abstract class ComposePlugin : Plugin { it.resolutionStrategy.eachDependency { if (it.requested.group.startsWith("org.jetbrains.kotlinx") && it.requested.name.startsWith("kotlinx-coroutines-")) { - if (it.requested.version?.startsWith("1.8") != true) { + if (it.requested.version?.startsWith("1.7") == true) { it.useVersion("1.8.0-RC2") } }