Browse Source

Gradle Plugin: Force kotlinx-coroutines version 1.8.0-RC2 for web targets in user projects (#4278)

Removed such the version substituion from the resources library. The
versions will be subtituted now by gradle plugin.
pull/4284/head
Oleksandr Karpovich 10 months ago committed by GitHub
parent
commit
c4bc761b0d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 13
      components/resources/library/build.gradle.kts
  2. 17
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt

13
components/resources/library/build.gradle.kts

@ -204,16 +204,3 @@ afterEvaluate {
if (name == "compileWebMainKotlinMetadata") enabled = false if (name == "compileWebMainKotlinMetadata") enabled = false
} }
} }
// TODO: remove this (https://youtrack.jetbrains.com/issue/COMPOSE-939)
configurations.all {
val isWeb = name.startsWith("wasmJs") || name.startsWith("js")
if (isWeb) {
resolutionStrategy.eachDependency {
if (requested.group.startsWith("org.jetbrains.kotlinx") &&
requested.name.startsWith("kotlinx-coroutines-")) {
useVersion("1.8.0-RC2")
}
}
}
}

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

@ -87,6 +87,23 @@ abstract class ComposePlugin : Plugin<Project> {
disableSignatureClashCheck(project) disableSignatureClashCheck(project)
} }
// TODO: remove this (https://youtrack.jetbrains.com/issue/COMPOSE-939)
// we substitute the coroutines version for web targets in user projects,
// so they don't need to do that manually
project.configurations.all {
val isWeb = it.name.startsWith("wasmJs") || it.name.startsWith("js")
if (isWeb) {
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) {
it.useVersion("1.8.0-RC2")
}
}
}
}
}
} }
private fun disableSignatureClashCheck(project: Project) { private fun disableSignatureClashCheck(project: Project) {

Loading…
Cancel
Save