memoize task results across classes within a single run

1 files changed, 3 insertions, 6 deletions

diff --git a/stage2/PackageJars.scala b/stage2/PackageJars.scala
index ff89284..3ecceb2 100644
--- a/stage2/PackageJars.scala
+++ b/stage2/PackageJars.scala
@@ -10,18 +10,15 @@ trait PackageJars extends BaseBuild with ArtifactInfo{
     Seq(() => jar, () => docJar, () => srcJar)
   )( _() ).flatten
 
-  private object cacheJarBasicBuild extends Cache[Option[File]]
-  def jar: Option[File] = cacheJarBasicBuild{
+  def jar: Option[File] = taskCache[PackageJars]("jar").memoize{
     compile.flatMap( lib.jar( artifactId, scalaMajorVersion, version, _, jarTarget ) )
   }
 
-  private object cacheSrcJarBasicBuild extends Cache[Option[File]]
-  def srcJar: Option[File] = cacheSrcJarBasicBuild{
+  def srcJar: Option[File] = taskCache[PackageJars]("srcJar").memoize{
     lib.srcJar( sourceFiles, artifactId, scalaMajorVersion, version, scalaTarget )
   }
 
-  private object cacheDocBasicBuild extends Cache[Option[File]]
-  def docJar: Option[File] = cacheDocBasicBuild{
+  def docJar: Option[File] = taskCache[PackageJars]("docJar").memoize{
     lib.docJar(
       context.cbtHasChanged,
       scalaVersion, sourceFiles, compileClasspath, docTarget,