diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-09 21:20:11 -0500 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-09 22:43:00 -0500 |
| commit | e8673866b79f7473391dcee26243eee80d5d3cb6 (patch) | |
| tree | 16146affeebdb58cd302a1f8527220c906818c96 /plugins | |
| parent | bee13ba7a4458482ce00a5c6bae4cd64328c4e5e (diff) | |
| download | cbt-e8673866b79f7473391dcee26243eee80d5d3cb6.tar.gz cbt-e8673866b79f7473391dcee26243eee80d5d3cb6.tar.bz2 cbt-e8673866b79f7473391dcee26243eee80d5d3cb6.zip | |
idempotent change propagation
using lastModified instead of a non-idempotent needsUpdate flag
this fixes a bug where dependees would not be rebuilt if cbt exited
or was killed after dependencies were already rebuilt.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/scalajs/ScalaJsBuild.scala | 2 | ||||
| -rw-r--r-- | plugins/scalajs/ScalaJsLib.scala | 4 | ||||
| -rw-r--r-- | plugins/scalatest/ScalaTest.scala | 2 | ||||
| -rw-r--r-- | plugins/wartremover/WartRemover.scala | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/plugins/scalajs/ScalaJsBuild.scala b/plugins/scalajs/ScalaJsBuild.scala index 9374f66..99f8616 100644 --- a/plugins/scalajs/ScalaJsBuild.scala +++ b/plugins/scalajs/ScalaJsBuild.scala @@ -6,7 +6,7 @@ trait ScalaJsBuild extends BaseBuild { final protected val scalaJsLib = ScalaJsLib( scalaJsVersion, scalaVersion, - context.cbtHasChanged, + context.cbtLastModified, context.classLoaderCache, context.paths.mavenCache ) diff --git a/plugins/scalajs/ScalaJsLib.scala b/plugins/scalajs/ScalaJsLib.scala index 12c1c85..f500039 100644 --- a/plugins/scalajs/ScalaJsLib.scala +++ b/plugins/scalajs/ScalaJsLib.scala @@ -3,7 +3,7 @@ import java.io.File case class ScalaJsLib( scalaJsVersion: String, scalaVersion: String, - cbtHasChanged: Boolean, classLoaderCache: ClassLoaderCache, mavenCache: File + cbtLastModified: Long, classLoaderCache: ClassLoaderCache, mavenCache: File )(implicit logger: Logger, transientCache: java.util.Map[AnyRef,AnyRef]){ sealed trait ScalaJsOutputMode { def option: String @@ -19,7 +19,7 @@ case class ScalaJsLib( } val lib = new Lib(logger) - def dep(artifactId: String) = MavenResolver( cbtHasChanged, mavenCache, mavenCentral ).bindOne( + def dep(artifactId: String) = MavenResolver( cbtLastModified, mavenCache, mavenCentral ).bindOne( MavenDependency("org.scala-js", artifactId, scalaJsVersion) ) diff --git a/plugins/scalatest/ScalaTest.scala b/plugins/scalatest/ScalaTest.scala index ee96431..5ccabc6 100644 --- a/plugins/scalatest/ScalaTest.scala +++ b/plugins/scalatest/ScalaTest.scala @@ -6,7 +6,7 @@ trait ScalaTest extends BaseBuild{ override def run: ExitCode = { import ScalaTestLib._ val _classLoader = classLoader(context.classLoaderCache) - val suiteNames = compile.map( d => discoverSuites(d, _classLoader) ).toVector.flatten + val suiteNames = compileFile.map( d => discoverSuites(d, _classLoader) ).toVector.flatten runSuites( suiteNames.map( loadSuite( _, _classLoader ) ) ) ExitCode.Success } diff --git a/plugins/wartremover/WartRemover.scala b/plugins/wartremover/WartRemover.scala index d5bbcd0..9cf8851 100644 --- a/plugins/wartremover/WartRemover.scala +++ b/plugins/wartremover/WartRemover.scala @@ -10,7 +10,7 @@ trait WartRemover extends BaseBuild { private[this] def wartremoverCompilerDependency: String = MavenResolver( - context.cbtHasChanged, + context.cbtLastModified, context.paths.mavenCache, mavenCentral).bindOne( ScalaDependency("org.wartremover", "wartremover", "1.1.1") |