diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-11-13 18:59:12 -0500 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-13 10:13:05 -0500 |
| commit | d1cbc1efffd5c2a6511f1ccca43ccfb37a7f1af8 (patch) | |
| tree | 3cf36e22305cc1da608667cfef85afcf682cc21a /stage1 | |
| parent | 9f89d16aa3ca5f96d73a8394d5159dc78dd5d7cf (diff) | |
| download | cbt-d1cbc1efffd5c2a6511f1ccca43ccfb37a7f1af8.tar.gz cbt-d1cbc1efffd5c2a6511f1ccca43ccfb37a7f1af8.tar.bz2 cbt-d1cbc1efffd5c2a6511f1ccca43ccfb37a7f1af8.zip | |
remove some unnecessary Context fields while we are modifying context
Diffstat (limited to 'stage1')
| -rw-r--r-- | stage1/Stage1Lib.scala | 2 | ||||
| -rw-r--r-- | stage1/cbt.scala | 5 | ||||
| -rw-r--r-- | stage1/resolver.scala | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/stage1/Stage1Lib.scala b/stage1/Stage1Lib.scala index 4f3f592..5a2f05d 100644 --- a/stage1/Stage1Lib.scala +++ b/stage1/Stage1Lib.scala @@ -413,7 +413,7 @@ ${sourceFiles.sorted.mkString(" \\\n")} case d => d } - def classLoaderRecursion( dependency: Dependency, latest: Map[(String,String),Dependency], cache: ClassLoaderCache ): ClassLoader = { + def classLoaderRecursion( dependency: Dependency, latest: Map[(String,String),Dependency], cache: ClassLoaderCache)(implicit transientCache: java.util.Map[AnyRef,AnyRef] ): ClassLoader = { // FIXME: shouldn't we be using KeyLockedLazyCache instead of hashmap directly here? val dependencies = dependency.dependencies val dependencyClassLoader: ClassLoader = { diff --git a/stage1/cbt.scala b/stage1/cbt.scala index dd06d81..a1776b1 100644 --- a/stage1/cbt.scala +++ b/stage1/cbt.scala @@ -52,9 +52,10 @@ object `package`{ } implicit class DependencyExtensions(subject: Dependency){ import subject._ - def dependencyClasspath: ClassPath = ClassPath(dependencyClasspathArray.to) + def dependencyClasspath(implicit logger: Logger, transientCache: java.util.Map[AnyRef,AnyRef]): ClassPath + = Dependencies(dependenciesArray.to).classpath def exportedClasspath: ClassPath = ClassPath(exportedClasspathArray.to) - def classpath = exportedClasspath ++ dependencyClasspath + def classpath(implicit logger: Logger, transientCache: java.util.Map[AnyRef,AnyRef]) = exportedClasspath ++ dependencyClasspath def dependencies: Seq[Dependency] = dependenciesArray.to } implicit class ContextExtensions(subject: Context){ diff --git a/stage1/resolver.scala b/stage1/resolver.scala index e6e4588..97cd36a 100644 --- a/stage1/resolver.scala +++ b/stage1/resolver.scala @@ -19,13 +19,15 @@ trait DependencyImplementation extends Dependency{ protected lazy val taskCache = new PerClassCache(transientCache, moduleKey) private[cbt] def targetClasspath: ClassPath - def dependencyClasspathArray: Array[File] = dependencyClasspath.files.toArray def exportedClasspathArray: Array[File] = exportedClasspath.files.toArray def exportedClasspath: ClassPath def dependenciesArray: Array[Dependency] = dependencies.to - @deprecated("this method is replaced by lastModifiedCompat","") + @deprecated("this method was replaced by lastModifiedCompat","") def needsUpdateCompat = true + @deprecated("this method was replaced by dependenciesArray","") + def dependencyClasspathArray = dependencyClasspath.files.toArray + /* //private type BuildCache = KeyLockedLazyCache[Dependency, Future[ClassPath]] |