diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-11 02:03:49 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-11 02:03:49 -0800 |
| commit | c820e54a2c5bab47627f9ddcc05252660f9ce8e7 (patch) | |
| tree | 25aee6150fe98fd555d7ee231e6f2f5530b2bff8 /scalaworker | |
| parent | 2063febc08963321c367a516b3498d16c21b34ee (diff) | |
| download | mill-c820e54a2c5bab47627f9ddcc05252660f9ce8e7.tar.gz mill-c820e54a2c5bab47627f9ddcc05252660f9ce8e7.tar.bz2 mill-c820e54a2c5bab47627f9ddcc05252660f9ce8e7.zip | |
more tidying up
Diffstat (limited to 'scalaworker')
| -rw-r--r-- | scalaworker/src/mill/scalaworker/ScalaWorker.scala | 5 |
1 files changed, 2 insertions, 3 deletions
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 |