simplify coroutines version check

JetBrains · Feb 12, 2024 · fdbbde4 · fdbbde4
1 parent ee28141
commit fdbbde4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 28 deletions.
diff --git a/gradle-plugins/compose/build.gradle.kts b/gradle-plugins/compose/build.gradle.kts
@@ -65,16 +65,14 @@ dependencies {
 
     testImplementation(gradleTestKit())
     testImplementation(kotlin("gradle-plugin-api"))
-    testImplementation(libs.semver4j)
 
     embedded(libs.download.task)
     embedded(libs.kotlin.poet)
-    embedded(libs.semver4j)
     embedded(project(":preview-rpc"))
     embedded(project(":jdk-version-probe"))
 }
 
-val packagesToRelocate = listOf("de.undercouch", "com.squareup.kotlinpoet", "com.vdurmont.semver4j")
+val packagesToRelocate = listOf("de.undercouch", "com.squareup.kotlinpoet")
 
 val shadow = tasks.named<ShadowJar>("shadowJar") {
     for (packageToRelocate in packagesToRelocate) {

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
@@ -7,7 +7,6 @@
 
 package org.jetbrains.compose
 
-import com.vdurmont.semver4j.Semver
 import groovy.lang.Closure
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -20,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
@@ -32,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
 
@@ -98,7 +97,7 @@ abstract class ComposePlugin : Plugin<Project> {
                 it.resolutionStrategy.eachDependency {
                     if (it.requested.group.startsWith("org.jetbrains.kotlinx") &&
                         it.requested.name.startsWith("kotlinx-coroutines-")) {
-                        if (it.requested.version != null && Semver(it.requested.version).isLowerThan("1.8.0-RC2")) {
+                        if (it.requested.version?.startsWith("1.7") == true) {
                             it.useVersion("1.8.0-RC2")
                         }
                     }

diff --git a/...gins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/Semver4jTest.kt b/...gins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/Semver4jTest.kt
diff --git a/gradle-plugins/gradle/libs.versions.toml b/gradle-plugins/gradle/libs.versions.toml
@@ -5,14 +5,12 @@ kotlin-poet = "1.16.0"
 plugin-android = "7.3.0"
 shadow-jar = "8.1.1"
 publish-plugin = "1.2.1"
-semver4j = "3.1.0"
 
 [libraries]
 download-task = { module = "de.undercouch:gradle-download-task", version.ref = "gradle-download-plugin" }
 kotlin-poet = { module = "com.squareup:kotlinpoet", version.ref = "kotlin-poet" }
 plugin-android = { module = "com.android.tools.build:gradle", version.ref = "plugin-android" }
 plugin-android-api = { module = "com.android.tools.build:gradle-api", version.ref = "plugin-android" }
-semver4j = { module = "com.vdurmont:semver4j", version.ref = "semver4j" }
 
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }