Skip to content

Commit 18013a6

Browse files
committed
Remove hard-coded version, manage test version from Mill
1 parent ac2f3ae commit 18013a6

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

build.mill

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ object Deps {
235235
val errorProneCore = ivy"com.google.errorprone:error_prone_core:2.31.0"
236236
val freemarker = ivy"org.freemarker:freemarker:2.3.34"
237237
val jupiterInterface = ivy"com.github.sbt.junit:jupiter-interface:0.13.3"
238+
val kotestJvm = ivy"io.kotest:kotest-framework-multiplatform-plugin-embeddable-compiler-jvm:5.9.1"
238239
val kotlinxHtmlJvm = ivy"org.jetbrains.kotlinx:kotlinx-html-jvm:0.11.0"
239240
val koverCli = ivy"org.jetbrains.kotlinx:kover-cli:$koverVersion"
240241
val koverJvmAgent = ivy"org.jetbrains.kotlinx:kover-jvm-agent:$koverVersion"
@@ -253,6 +254,7 @@ object Deps {
253254
errorProneCore,
254255
freemarker,
255256
jupiterInterface,
257+
kotestJvm,
256258
kotlinxHtmlJvm,
257259
koverCli,
258260
koverJvmAgent,
@@ -574,7 +576,8 @@ trait MillBaseTestsModule extends TestModule {
574576
s"-DTEST_ZINC_VERSION=${Deps.zinc.version}",
575577
s"-DTEST_KOTLIN_VERSION=${Deps.kotlinCompiler.version}",
576578
s"-DTEST_SBT_VERSION=${Deps.sbt.version}",
577-
s"-DTEST_PROGUARD_VERSION=${Deps.RuntimeDeps.proguard.version}"
579+
s"-DTEST_PROGUARD_VERSION=${Deps.RuntimeDeps.proguard.version}",
580+
s"-DTEST_KOTEST_VERSION=${Deps.RuntimeDeps.kotestJvm.version}"
578581
)
579582
}
580583

kotlinlib/src/mill/kotlinlib/js/KotlinJsModule.scala

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -686,8 +686,11 @@ trait KotlinJsModule extends KotlinModule { outer =>
686686
*/
687687
trait KotestTests extends KotlinJsTests {
688688

689-
// FIXME: get this version from Mill build info
690-
def kotestVersion: T[String] = "5.9.1"
689+
/**
690+
* The version of Kotest to download from Maven.
691+
* https://mvnrepository.com/artifact/io.kotest/kotest-framework-multiplatform-plugin-embeddable-compiler-jvm
692+
*/
693+
def kotestVersion: T[String]
691694

692695
override def kotlincPluginIvyDeps: T[Seq[Dep]] =
693696
super.kotlincPluginIvyDeps() ++ Seq(

kotlinlib/test/src/mill/kotlinlib/js/KotlinJsKotestModuleTests.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ object KotlinJsKotestModuleTests extends TestSuite {
1111

1212
private val testResourcePath = os.Path(sys.env("MILL_TEST_RESOURCE_DIR")) / "kotlin-js"
1313
private val testKotlinVersion = "1.9.25"
14+
val testKotestVersion = sys.props.getOrElse("TEST_KOTEST_VERSION", ???)
1415

1516
object module extends TestBaseModule {
1617

@@ -24,6 +25,7 @@ object KotlinJsKotestModuleTests extends TestSuite {
2425
override def moduleDeps = Seq(module.bar)
2526

2627
object test extends KotlinJsModule with KotestTests {
28+
override def kotestVersion = Tast.Input(testKotestVersion)
2729
override def allSourceFiles = super.allSourceFiles()
2830
.filter(!_.path.toString().endsWith("HelloKotlinTestPackageTests.kt"))
2931
}

0 commit comments

Comments
 (0)