From c820e54a2c5bab47627f9ddcc05252660f9ce8e7 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sun, 11 Feb 2018 02:03:49 -0800 Subject: more tidying up --- scalaworker/src/mill/scalaworker/ScalaWorker.scala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'scalaworker/src') diff --git a/scalaworker/src/mill/scalaworker/ScalaWorker.scala b/scalaworker/src/mill/scalaworker/ScalaWorker.scala index 4430f710..3990d9dc 100644 --- a/scalaworker/src/mill/scalaworker/ScalaWorker.scala +++ b/scalaworker/src/mill/scalaworker/ScalaWorker.scala @@ -104,7 +104,6 @@ class ScalaWorker(ctx0: mill.util.Ctx, compileBridgeSources: Agg[Path], compileClasspath: Agg[Path], compilerClasspath: Agg[Path], - pluginClasspath: Agg[Path], scalacOptions: Seq[String], scalacPluginClasspath: Agg[Path], javacOptions: Seq[String], @@ -115,11 +114,11 @@ class ScalaWorker(ctx0: mill.util.Ctx, val compilerBridge = compileZincBridge(scalaVersion, compileBridgeSources, compilerJars) - val pluginJars = pluginClasspath.toArray.map(_.toIO) + val pluginJars = scalacPluginClasspath.toArray.map(_.toIO) val compilerClassloaderSig = compilerClasspath.map(p => p.toString().hashCode + p.mtime.toMillis).sum val scalaInstanceSig = - compilerClassloaderSig + pluginClasspath.map(p => p.toString().hashCode + p.mtime.toMillis).sum + compilerClassloaderSig + scalacPluginClasspath.map(p => p.toString().hashCode + p.mtime.toMillis).sum val compilerClassLoader = scalaClassloaderCache match{ case Some((k, v)) if k == compilerClassloaderSig => v -- cgit v1.2.3