diff options
Diffstat (limited to 'stage2')
| -rw-r--r-- | stage2/BasicBuild.scala | 2 | ||||
| -rw-r--r-- | stage2/Stage2.scala | 3 | ||||
| -rw-r--r-- | stage2/ToolsTasks.scala | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index 7ff1f4b..889e32d 100644 --- a/stage2/BasicBuild.scala +++ b/stage2/BasicBuild.scala @@ -272,7 +272,7 @@ trait BaseBuild extends BuildInterface with DependencyImplementation with Trigge the context is fresh on every complete run of cbt */ def cached[T <: AnyRef](name: String)(task: => T): T = { - val cache = context.taskCache + val cache = context.transientCache val key = (projectDirectory,name) if( cache.containsKey(key) ){ cache.get(key).asInstanceOf[T] diff --git a/stage2/Stage2.scala b/stage2/Stage2.scala index dfbead3..260a46d 100644 --- a/stage2/Stage2.scala +++ b/stage2/Stage2.scala @@ -31,8 +31,7 @@ object Stage2 extends Stage2Base{ logger.start, args.cbtHasChanged, null, - args.permanentKeys, - args.permanentClassLoaders, + args.persistentCache, new java.util.concurrent.ConcurrentHashMap, args.cache, args.cbtHome, diff --git a/stage2/ToolsTasks.scala b/stage2/ToolsTasks.scala index b96c8f2..b92cb7a 100644 --- a/stage2/ToolsTasks.scala +++ b/stage2/ToolsTasks.scala @@ -129,7 +129,7 @@ class EarlyDependencies{ ${files.map(d => s""" String ${valName(d)}File;""").mkString("\n")} public EarlyDependencies( - String mavenCache, String mavenUrl, ClassLoaderCache2<ClassLoader> classLoaderCache, ClassLoader rootClassLoader + String mavenCache, String mavenUrl, JavaCache<ClassLoader> classLoaderCache, ClassLoader rootClassLoader ) throws Throwable { ${files.map(d => s""" ${valName(d)}File = mavenCache + "${d.basePath(true)}.jar";""").mkString("\n")} |