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 /stage2/PackageJars.scala | |
| 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 'stage2/PackageJars.scala')
| -rw-r--r-- | stage2/PackageJars.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stage2/PackageJars.scala b/stage2/PackageJars.scala index 3ecceb2..7079786 100644 --- a/stage2/PackageJars.scala +++ b/stage2/PackageJars.scala @@ -11,7 +11,7 @@ trait PackageJars extends BaseBuild with ArtifactInfo{ )( _() ).flatten def jar: Option[File] = taskCache[PackageJars]("jar").memoize{ - compile.flatMap( lib.jar( artifactId, scalaMajorVersion, version, _, jarTarget ) ) + compileFile.flatMap( lib.jar( artifactId, scalaMajorVersion, version, _, jarTarget ) ) } def srcJar: Option[File] = taskCache[PackageJars]("srcJar").memoize{ @@ -20,7 +20,7 @@ trait PackageJars extends BaseBuild with ArtifactInfo{ def docJar: Option[File] = taskCache[PackageJars]("docJar").memoize{ lib.docJar( - context.cbtHasChanged, + context.cbtLastModified, scalaVersion, sourceFiles, compileClasspath, docTarget, jarTarget, artifactId, scalaMajorVersion, version, scalacOptions, context.classLoaderCache, context.paths.mavenCache |