diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2019-01-09 21:09:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-09 21:09:42 -0800 |
| commit | fc005caf191dd26dedbef931ecad3e84fd1a251a (patch) | |
| tree | a346095f06f0c7bb201039152da082d90c1eee7f /scalalib | |
| parent | 4506537050d0a49cda820fc41ae0bc576dbe8d2d (diff) | |
| download | mill-fc005caf191dd26dedbef931ecad3e84fd1a251a.tar.gz mill-fc005caf191dd26dedbef931ecad3e84fd1a251a.tar.bz2 mill-fc005caf191dd26dedbef931ecad3e84fd1a251a.zip | |
Update ZincWorkerImpl.scala
Diffstat (limited to 'scalalib')
| -rw-r--r-- | scalalib/worker/src/ZincWorkerImpl.scala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scalalib/worker/src/ZincWorkerImpl.scala b/scalalib/worker/src/ZincWorkerImpl.scala index 2ea099f5..ac681045 100644 --- a/scalalib/worker/src/ZincWorkerImpl.scala +++ b/scalalib/worker/src/ZincWorkerImpl.scala @@ -123,13 +123,13 @@ class ZincWorkerImpl(compilerBridge: Either[ (implicit ctx: ZincWorkerApi.Ctx): mill.api.Result[CompilationResult] = { for(res <- compileJava0( - upstreamCompileOutput, + upstreamCompileOutput.map(c => (c.analysisFile, c.classes.path)), sources, compileClasspath, javacOptions )) yield CompilationResult(res._1, PathRef(res._2)) } - def compileJava0(upstreamCompileOutput: Seq[CompilationResult], + def compileJava0(upstreamCompileOutput: Seq[(os.Path, os.Path)], sources: Agg[os.Path], compileClasspath: Agg[os.Path], javacOptions: Seq[String]) @@ -156,7 +156,7 @@ class ZincWorkerImpl(compilerBridge: Either[ (implicit ctx: ZincWorkerApi.Ctx): mill.api.Result[CompilationResult] = { for (res <- compileMixed0( - upstreamCompileOutput, + upstreamCompileOutput.map(c => (c.analysisFile, c.classes.path)), sources, compileClasspath, javacOptions, @@ -168,7 +168,7 @@ class ZincWorkerImpl(compilerBridge: Either[ )) yield CompilationResult(res._1, PathRef(res._2)) } - def compileMixed0(upstreamCompileOutput: Seq[CompilationResult], + def compileMixed0(upstreamCompileOutput: Seq[(os.Path, os.Path)], sources: Agg[os.Path], compileClasspath: Agg[os.Path], javacOptions: Seq[String], @@ -239,7 +239,7 @@ class ZincWorkerImpl(compilerBridge: Either[ }(f) } - private def compileInternal(upstreamCompileOutput: Seq[CompilationResult], + private def compileInternal(upstreamCompileOutput: Seq[(os.Path, os.Path)], sources: Agg[os.Path], compileClasspath: Agg[os.Path], javacOptions: Seq[String], @@ -263,7 +263,7 @@ class ZincWorkerImpl(compilerBridge: Either[ Optional.empty[CompileAnalysis] } else { upstreamCompileOutput.collectFirst { - case CompilationResult(zincPath, classFiles) if classFiles.path.toNIO == f.toPath => + case (zincPath, classFiles) if classFiles.toNIO == f.toPath => FileAnalysisStore.binary(zincPath.toIO).get().map[CompileAnalysis](_.getAnalysis) }.getOrElse(Optional.empty[CompileAnalysis]) } |