diff options
author | Guillaume Martres <smarter@ubuntu.com> | 2018-07-27 01:37:31 +0200 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-07-27 07:37:31 +0800 |
commit | 2c8b55967f946435a4b553c745c8d99620a85ea1 (patch) | |
tree | f6d564f14ad12ce746723e11a15b5a29c5245159 /build.sc | |
parent | 436e5e21f526a8e9758bd11c8b9b221253d50663 (diff) | |
download | mill-2c8b55967f946435a4b553c745c8d99620a85ea1.tar.gz mill-2c8b55967f946435a4b553c745c8d99620a85ea1.tar.bz2 mill-2c8b55967f946435a4b553c745c8d99620a85ea1.zip |
Upgrade Zinc and fix over-compilation (#390)
* Remove dead code
* Upgrade zinc to 1.1.7, avoid hardcoding the version
* Fix over-compilation with Zinc
`upstreamCompileOutput` needs to contain the CompileOutput of all
recursive dependencies, otherwise Zinc gets confused when a classfile
from one of these recursive dependency is used, resulting in
over-compilation.
No tests because I don't know how to write one, but this can be observed
manually:
1. mill scalajslib.compile
2. Add an empty line to ScalaModule.scala
3. mill scalajslib.compile
Before this commit, the last compilation ended up compiling one file in
scalalib (as expected), then every file in scalajslib. After this
commit, nothing in scalajslib is recompiled, as expected.
Diffstat (limited to 'build.sc')
-rwxr-xr-x | build.sc | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -181,7 +181,8 @@ object scalalib extends MillModule { def moduleDeps = Seq(main, scalalib) def ivyDeps = Agg( - ivy"org.scala-sbt::zinc:1.1.5" + // Keep synchronized with zinc in Versions.scala + ivy"org.scala-sbt::zinc:1.1.7" ) def testArgs = Seq( "-DMILL_SCALA_WORKER=" + runClasspath().map(_.path).mkString(",") |