Cleanup Kotlin classes

lefou · Oct 14, 2024 · b7f1c66 · b7f1c66
1 parent 43dc23e
commit b7f1c66
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/kotlinlib/src/mill/kotlinlib/KotlinModule.scala b/kotlinlib/src/mill/kotlinlib/KotlinModule.scala
@@ -241,7 +241,7 @@ trait KotlinModule extends JavaModule { outer =>
         )
         val compilerArgs: Seq[String] = Seq(
           // destdir
-          Seq("-d", classes.toIO.getAbsolutePath()),
+          Seq("-d", classes.toString()),
           // classpath
           when(compileCp.iterator.nonEmpty)(
             "-classpath",
@@ -253,7 +253,7 @@ trait KotlinModule extends JavaModule { outer =>
           (kotlinSourceFiles ++ javaSourceFiles).map(_.toIO.getAbsolutePath())
         ).flatten
 
-        val workerResult = kotlinWorkerTask().compile(KotlinWorkerTarget.Jvm, compilerArgs: _*)
+        val workerResult = kotlinWorkerTask().compile(KotlinWorkerTarget.Jvm, compilerArgs)
 
         val analysisFile = dest / "kotlin.analysis.dummy"
         os.write(target = analysisFile, data = "", createFolders = true)
@@ -325,11 +325,10 @@ trait KotlinModule extends JavaModule { outer =>
   /**
    * A test sub-module linked to its parent module best suited for unit-tests.
    */
-  trait KotlinTests extends JavaModuleTests with KotlinModule {
+  trait KotlinTests extends JavaTests with KotlinModule {
     override def kotlinVersion: T[String] = Task { outer.kotlinVersion() }
     override def kotlinCompilerVersion: T[String] = Task { outer.kotlinCompilerVersion() }
     override def kotlincOptions: T[Seq[String]] = Task { outer.kotlincOptions() }
-    override def defaultCommandName(): String = super.defaultCommandName()
   }
 
 }
diff --git a/kotlinlib/src/mill/kotlinlib/PlatformKotlinModule.scala b/kotlinlib/src/mill/kotlinlib/PlatformKotlinModule.scala
@@ -28,7 +28,7 @@ trait PlatformKotlinModule extends KotlinModule {
   override def sources: T[Seq[PathRef]] = Task.Sources {
     super.sources().flatMap { source =>
       val platformPath =
-        PathRef(source.path / _root_.os.up / s"${source.path.last}-$platformKotlinSuffix")
+        PathRef(source.path / os.up / s"${source.path.last}-$platformKotlinSuffix")
       Seq(source, platformPath)
     }
   }

diff --git a/kotlinlib/src/mill/kotlinlib/js/KotlinJSModule.scala b/kotlinlib/src/mill/kotlinlib/js/KotlinJSModule.scala
@@ -348,7 +348,7 @@ trait KotlinJSModule extends KotlinModule { outer =>
     } else {
       T.log.info(s"Linking IR to $compileDestination")
     }
-    val workerResult = worker.compile(KotlinWorkerTarget.Js, compilerArgs: _*)
+    val workerResult = worker.compile(KotlinWorkerTarget.Js, compilerArgs)
 
     val analysisFile = T.dest / "kotlin.analysis.dummy"
     if (!os.exists(analysisFile)) {

diff --git a/kotlinlib/worker/impl/src/mill/kotlinlib/worker/impl/KotlinWorkerImpl.scala b/kotlinlib/worker/impl/src/mill/kotlinlib/worker/impl/KotlinWorkerImpl.scala
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
 
 class KotlinWorkerImpl extends KotlinWorker {
 
-  def compile(target: KotlinWorkerTarget, args: String*)(implicit ctx: Ctx): Result[Unit] = {
+  def compile(target: KotlinWorkerTarget, args: Seq[String])(implicit ctx: Ctx): Result[Unit] = {
     ctx.log.debug("Using kotlin compiler arguments: " + args.map(v => s"'${v}'").mkString(" "))
 
     val compiler = target match {

diff --git a/kotlinlib/worker/src/mill/kotlinlib/worker/api/KotlinWorker.scala b/kotlinlib/worker/src/mill/kotlinlib/worker/api/KotlinWorker.scala
@@ -8,7 +8,7 @@ import mill.api.{Ctx, Result}
 
 trait KotlinWorker {
 
-  def compile(target: KotlinWorkerTarget, args: String*)(implicit ctx: Ctx): Result[Unit]
+  def compile(target: KotlinWorkerTarget, args: Seq[String])(implicit ctx: Ctx): Result[Unit]
 
 }