Skip to content

Commit 6116851

Browse files
committed
Upgrade Kotlin to 2.2.10 and KSP to 2.2.10-2.0.2; add Kotest JUnit 5 runner dependency; adjust package names and dependency resolution settings; update .gitignore entries.
1 parent 040bfdf commit 6116851

File tree

7 files changed

+27
-13
lines changed

7 files changed

+27
-13
lines changed

kotest-android/app/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ android {
3232
}
3333
}
3434

35+
tasks.withType<AbstractTestTask>().configureEach {
36+
failOnNoDiscoveredTests = false
37+
}
38+
3539
dependencies {
3640
implementation(project(":shared"))
3741

@@ -45,6 +49,7 @@ dependencies {
4549
testImplementation(libs.kotlin.reflect)
4650
testImplementation(libs.kotest.framework)
4751
testImplementation(libs.kotest.assertions)
52+
testImplementation(libs.kotest.runner.junit5)
4853
testImplementation(libs.mockk.android)
4954
testImplementation(libs.mockk.agent)
5055

kotest-android/gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ espressoCore = "3.6.1"
1010
appcompat = "1.7.1"
1111
material = "1.12.0"
1212
mockk = "1.13.17"
13-
1413
kotest = "6.0.0"
1514

1615
[libraries]
@@ -29,6 +28,7 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
2928

3029
kotest-framework = { module = "io.kotest:kotest-framework-engine", version.ref = "kotest" }
3130
kotest-assertions = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
31+
kotest-runner-junit5 = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }
3232

3333
mockk-agent = { module = "io.mockk:mockk-agent", version.ref = "mockk" }
3434
mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockk" }

kotest-javascript/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
.kotlin
2+
yarn.lock
3+
java_pid*.hprof

kotest-javascript/build.gradle.kts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
66
plugins {
77
alias(libs.plugins.kotlin.multiplatform)
88
alias(libs.plugins.kotest)
9-
id("com.google.devtools.ksp") version "2.2.0-2.0.2"
10-
}
11-
12-
repositories {
13-
mavenLocal()
14-
mavenCentral()
9+
alias(libs.plugins.ksp)
1510
}
1611

1712
kotlin {
@@ -27,6 +22,7 @@ kotlin {
2722
}
2823

2924
wasmJs {
25+
browser()
3026
nodejs()
3127
d8()
3228
}
@@ -47,17 +43,20 @@ kotlin {
4743
dependencies {
4844
api(kotlin("stdlib-js"))
4945
implementation(libs.ktor.client.js)
50-
// just to test npm deps
46+
47+
// to test npm deps
5148
implementation(npm("slugify", "1.6.6"))
52-
// needed as a workaround for https://youtrack.jetbrains.com/issue/KT-57235
53-
implementation("org.jetbrains.kotlin:kotlinx-atomicfu-runtime:2.1.10")
49+
50+
// needed as a workaround for https://youtrack.jetbrains.com/issue/KT-57235
51+
implementation("org.jetbrains.kotlin:kotlinx-atomicfu-runtime:2.2.10")
5452
}
5553
}
5654
wasmJsMain {
5755
dependencies {
5856
api(kotlin("stdlib-wasm-js"))
5957
implementation(libs.ktor.client.js)
60-
// just to test npm deps
58+
59+
// to test npm deps
6160
implementation(npm("slugify", "1.6.6"))
6261
}
6362
}

kotest-javascript/gradle/libs.versions.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[versions]
2-
kotlin = "2.2.0"
2+
kotlin = "2.2.10"
33
kotest = "6.0.0"
44
ktor = "3.0.1"
5+
ksp = "2.2.10-2.0.2"
56

67
[libraries]
78
kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
@@ -12,3 +13,4 @@ ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" }
1213
[plugins]
1314
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
1415
kotest = { id = "io.kotest", version.ref = "kotest" }
16+
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

kotest-javascript/settings.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,9 @@ pluginManagement {
55
}
66
}
77

8+
dependencyResolutionManagement {
9+
repositories {
10+
mavenLocal()
11+
mavenCentral()
12+
}
13+
}

kotest-javascript/src/wasmJsTest/kotlin/io/kotest/examples/js/ProjectConfig.kt renamed to kotest-javascript/src/wasmJsTest/kotlin/io/kotest/examples/wasmjs/ProjectConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.kotest.examples.js
1+
package io.kotest.examples.wasmjs
22

33
import io.kotest.core.config.AbstractProjectConfig
44

0 commit comments

Comments
 (0)