From e9c95bfc06ed371566a9df0890f92702a4f14c7f Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sat, 17 Feb 2018 11:33:45 -0800 Subject: 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 --- scalaworker/src/mill/scalaworker/ScalaWorker.scala | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'scalaworker') 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, -- cgit v1.2.3