Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
lefou committed Oct 14, 2024
1 parent 45a0d48 commit fac870a
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions kotlinlib/src/mill/kotlinlib/KotlinModule.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package mill
package kotlinlib

import mill.api.{Loose, PathRef, Result, internal}
import mill.api.{PathRef, Result, internal}
import mill.define.{Command, ModuleRef, Task}
import mill.kotlinlib.worker.api.{KotlinWorker, KotlinWorkerTarget}
import mill.scalalib.api.{CompilationResult, ZincWorkerApi}
Expand Down Expand Up @@ -179,19 +179,20 @@ trait KotlinModule extends JavaModule { outer =>
/**
* Classpath for running Dokka.
*/
private def dokkaCliClasspath: T[Loose.Agg[PathRef]] = Task {
private def dokkaCliClasspath: T[Agg[PathRef]] = Task {
defaultResolver().resolveDeps(
Agg(
ivy"org.jetbrains.dokka:dokka-cli:${dokkaVersion()}"
)
)
}

private def dokkaPluginsClasspath: T[Loose.Agg[PathRef]] = Task {
private def dokkaPluginsClasspath: T[Agg[PathRef]] = Task {
defaultResolver().resolveDeps(
Agg(
ivy"org.jetbrains.dokka:dokka-base:${dokkaVersion()}",
ivy"org.jetbrains.dokka:analysis-kotlin-descriptors:${dokkaVersion()}",
// TODO: use versions defined in Mill build instead
ivy"org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.0",
ivy"org.freemarker:freemarker:2.3.31"
)
Expand Down Expand Up @@ -251,7 +252,7 @@ trait KotlinModule extends JavaModule { outer =>
kotlincOptions(),
extraKotlinArgs,
// parameters
(kotlinSourceFiles ++ javaSourceFiles).map(_.toIO.getAbsolutePath())
(kotlinSourceFiles ++ javaSourceFiles).map(_.toString())
).flatten

val workerResult = kotlinWorkerTask().compile(KotlinWorkerTarget.Jvm, compilerArgs)
Expand Down

0 comments on commit fac870a

Please sign in to comment.