summaryrefslogtreecommitdiff
path: root/scalaworker
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-17 11:33:45 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-17 11:35:40 -0800
commite9c95bfc06ed371566a9df0890f92702a4f14c7f (patch)
tree2056847bec8453dc7b79d0782d7e076248d08b39 /scalaworker
parenta225e7650892ecc1e672bcaf95dff0d598682583 (diff)
downloadmill-e9c95bfc06ed371566a9df0890f92702a4f14c7f.tar.gz
mill-e9c95bfc06ed371566a9df0890f92702a4f14c7f.tar.bz2
mill-e9c95bfc06ed371566a9df0890f92702a4f14c7f.zip
Resolve individual Scala files before passing them to `ScalaModule#compile`, to ensure other rubbish in the source folders (e.g. vim `.swp` files) do not trigger spurious recompiles
Diffstat (limited to 'scalaworker')
-rw-r--r--scalaworker/src/mill/scalaworker/ScalaWorker.scala7
1 files changed, 1 insertions, 6 deletions
diff --git a/scalaworker/src/mill/scalaworker/ScalaWorker.scala b/scalaworker/src/mill/scalaworker/ScalaWorker.scala
index 3990d9dc..5b5808cb 100644
--- a/scalaworker/src/mill/scalaworker/ScalaWorker.scala
+++ b/scalaworker/src/mill/scalaworker/ScalaWorker.scala
@@ -182,12 +182,7 @@ class ScalaWorker(ctx0: mill.util.Ctx,
val newResult = ic.compile(
ic.inputs(
classpath = classesIODir +: compileClasspathFiles,
- sources = for {
- root <- sources.toArray
- if exists(root)
- path <- ls.rec(root)
- if path.isFile && (path.ext == "scala" || path.ext == "java")
- } yield path.toIO,
+ sources = sources.toArray.map(_.toIO),
classesDirectory = classesIODir,
scalacOptions = (scalacPluginClasspath.map(jar => s"-Xplugin:${jar}") ++ scalacOptions).toArray,
javacOptions = javacOptions.toArray,