diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-09-28 10:36:51 -0400 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-09-28 10:37:45 -0400 |
commit | bdf5ef17cd0f03ee95ad905dea0d52b1541f5fbb (patch) | |
tree | 5e3bd75bf85b7595d6c38298818afa8f10ea867a /stage2/plugins | |
parent | d0e71734701ff55db1fae4bdc3cf0f40b22ceb58 (diff) | |
download | cbt-bdf5ef17cd0f03ee95ad905dea0d52b1541f5fbb.tar.gz cbt-bdf5ef17cd0f03ee95ad905dea0d52b1541f5fbb.tar.bz2 cbt-bdf5ef17cd0f03ee95ad905dea0d52b1541f5fbb.zip |
change compile target to something dotty version unique and fix cp for compiling
the unique target should avoid potential problems with binary incompatibilities
between scala and dotty as well as different dotty versions
Diffstat (limited to 'stage2/plugins')
-rw-r--r-- | stage2/plugins/Dotty.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/stage2/plugins/Dotty.scala b/stage2/plugins/Dotty.scala index 2fdb895..8869860 100644 --- a/stage2/plugins/Dotty.scala +++ b/stage2/plugins/Dotty.scala @@ -7,7 +7,8 @@ import java.nio.file.attribute.FileTime trait Dotty extends BaseBuild{ def dottyVersion: String = "0.1-20160926-ec28ea1-NIGHTLY" def dottyOptions: Seq[String] = Seq() - + override def scalaTarget: File = target ++ s"/dotty-$dottyVersion" + private lazy val dottyLib = new DottyLib( logger, context.cbtHasChanged, context.paths.mavenCache, context.classLoaderCache, dottyVersion = dottyVersion @@ -17,7 +18,7 @@ trait Dotty extends BaseBuild{ override def compile: Option[File] = compileCache{ dottyLib.compile( needsUpdate || context.parentBuild.map(_.needsUpdate).getOrElse(false), - sourceFiles, compileTarget, compileStatusFile, dependencyClasspath ++ compileClasspath, + sourceFiles, compileTarget, compileStatusFile, compileClasspath, dottyOptions ) } |