Skip to content

Commit baaf7bd

Browse files
authored
align versions KGP with Kotlin test (#284)
1 parent 2a8d261 commit baaf7bd

4 files changed

Lines changed: 37 additions & 2 deletions

File tree

project-generator/src/main/kotlin/io/github/cdsap/projectgenerator/generator/plugins/jvm/CompositeBuildJvmLib.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class CompositeBuildJvmLib {
2323
| dependencies {
2424
| add("implementation","org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
2525
| add("testImplementation","junit:junit:4.13.2")
26-
| add("testImplementation","org.jetbrains.kotlin:kotlin-test:2.1.20")
26+
| add("testImplementation","org.jetbrains.kotlin:kotlin-test:${versions.kotlin.kotlinTest}")
2727
| add("testImplementation", "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
2828
| add("testImplementation","org.junit.vintage:junit-vintage-engine:5.10.1")
2929
| }

project-generator/src/main/kotlin/io/github/cdsap/projectgenerator/model/Versions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ data class Kotlin(
5959
val kgp: String = "2.3.20",
6060
val ksp: String = "2.3.4",
6161
val coroutines: String = "1.10.2",
62-
val kotlinTest: String = "2.3.20",
62+
val kotlinTest: String = kgp,
6363
val kotlinProcessor: KotlinProcessor = KotlinProcessor(),
6464
)
6565

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package io.github.cdsap.projectgenerator.generator.plugins.jvm
2+
3+
import io.github.cdsap.projectgenerator.model.Kotlin
4+
import io.github.cdsap.projectgenerator.model.Versions
5+
import org.junit.jupiter.api.Assertions.assertTrue
6+
import org.junit.jupiter.api.Test
7+
8+
class CompositeBuildJvmLibTest {
9+
10+
@Test
11+
fun `uses configured kotlin test version in jvm convention plugin`() {
12+
val versions = Versions(kotlin = Kotlin(kgp = "2.1.21"))
13+
14+
val content = CompositeBuildJvmLib().get(versions)
15+
16+
assertTrue(content.contains("org.jetbrains.kotlin:kotlin-test:2.1.21"))
17+
}
18+
}

project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/generator/toml/AndroidTomlTest.kt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.github.cdsap.projectgenerator.generator.toml
22

3+
import io.github.cdsap.projectgenerator.model.Kotlin
34
import io.github.cdsap.projectgenerator.model.Versions
45
import org.junit.jupiter.api.Assertions
56
import org.junit.jupiter.api.Test
@@ -38,4 +39,20 @@ class AndroidTomlTest {
3839
"Generated TOML should not contain leading indentation"
3940
)
4041
}
42+
43+
@Test
44+
fun `links kotlin test version to kgp when kotlin test is not overridden`() {
45+
val versions = Versions(kotlin = Kotlin(kgp = "2.1.21"))
46+
47+
val toml = AndroidToml().toml(versions)
48+
49+
Assertions.assertTrue(
50+
toml.contains("kotlin = \"2.1.21\""),
51+
"Should contain configured Kotlin plugin version"
52+
)
53+
Assertions.assertTrue(
54+
toml.contains("kotlin-test = \"2.1.21\""),
55+
"Should link kotlin-test version to kgp by default"
56+
)
57+
}
4158
}

0 commit comments

Comments
 (0)