diff options
Diffstat (limited to 'main/core/src')
| -rw-r--r-- | main/core/src/mill/eval/Evaluator.scala | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/main/core/src/mill/eval/Evaluator.scala b/main/core/src/mill/eval/Evaluator.scala index 34e1cf6f..ded4afdd 100644 --- a/main/core/src/mill/eval/Evaluator.scala +++ b/main/core/src/mill/eval/Evaluator.scala @@ -28,14 +28,15 @@ case class Labelled[T](task: NamedTask[T], case _ => None } } -case class Evaluator[T](home: Path, - outPath: Path, - externalOutPath: Path, - rootModule: mill.define.BaseModule, - log: Logger, - classLoaderSig: Seq[(Either[String, Path], Long)] = Evaluator.classLoaderSig, - workerCache: mutable.Map[Segments, (Int, Any)] = mutable.Map.empty, - env : Map[String, String] = Evaluator.defaultEnv){ + +case class Evaluator(home: Path, + outPath: Path, + externalOutPath: Path, + rootModule: mill.define.BaseModule, + log: Logger, + classLoaderSig: Seq[(Either[String, Path], Long)] = Evaluator.classLoaderSig, + workerCache: mutable.Map[Segments, (Int, Any)] = mutable.Map.empty, + env : Map[String, String] = Evaluator.defaultEnv){ val classLoaderSignHash = classLoaderSig.hashCode() def evaluate(goals: Agg[Task[_]]): Evaluator.Results = { mkdir(outPath) @@ -361,7 +362,7 @@ object Evaluator{ // the TargetScopt#read call, which does not accept additional parameters. // Until we migrate our CLI parsing off of Scopt (so we can pass the BaseModule // in directly) we are forced to pass it in via a ThreadLocal - val currentEvaluator = new ThreadLocal[mill.eval.Evaluator[_]] + val currentEvaluator = new ThreadLocal[mill.eval.Evaluator] val defaultEnv: Map[String, String] = System.getenv().asScala.toMap |