Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use coroutines 1.8.0 for all targets #879

Merged
merged 3 commits into from
Feb 26, 2024
Merged

Use coroutines 1.8.0 for all targets #879

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
052c367
Use coroutines 1.8.0 for all targets
eymar Feb 26, 2024
282d141
refactoring
eymar Feb 26, 2024
c84deec
refactoring
eymar Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions skiko/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ plugins {
apply<WasmImportsGeneratorCompilerPluginSupportPlugin>()
apply<WasmImportsGeneratorForTestCompilerPluginSupportPlugin>()

val coroutinesVersion = "1.7.3"
val coroutinesForWebVersion = "1.8.0-RC2" // TODO: remove this (https://youtrack.jetbrains.com/issue/COMPOSE-939)
val coroutinesVersion = "1.8.0"
val atomicfuVersion = "0.23.2"

val skiko = SkikoProperties(rootProject)
Expand Down Expand Up @@ -151,7 +150,7 @@ kotlin {
}
val commonTest by getting {
dependencies {
implementation(kotlin("test-common"))
implementation(kotlin("test"))
implementation(kotlin("test-annotations-common"))
}
}
Expand Down Expand Up @@ -211,17 +210,10 @@ kotlin {
if (supportJs || supportWasm) {
val jsWasmMain by creating {
dependsOn(nativeJsMain)
dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesForWebVersion")
}
}

val jsWasmTest by creating {
dependsOn(nativeJsTest)
dependencies {
implementation(kotlin("test"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesForWebVersion")
}
}

if (supportJs) {
Expand Down
Loading