diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-14 00:07:57 -0500 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-14 00:34:48 -0500 |
commit | 92b26f394460aa609f9d073ea044776e7d8c46fb (patch) | |
tree | cb6deceebc0313e2186e686680b51187ddfd0095 /stage1/cbt.scala | |
parent | dfde369b30bcde1c60add172e0e91caeb51e541b (diff) | |
download | cbt-92b26f394460aa609f9d073ea044776e7d8c46fb.tar.gz cbt-92b26f394460aa609f9d073ea044776e7d8c46fb.tar.bz2 cbt-92b26f394460aa609f9d073ea044776e7d8c46fb.zip |
implicitly pass classloader, might make code easier
and prepares for allowing `run` and `runFlat` at
Dependency instead of Build level
Diffstat (limited to 'stage1/cbt.scala')
-rw-r--r-- | stage1/cbt.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stage1/cbt.scala b/stage1/cbt.scala index 54f3159..f88ef16 100644 --- a/stage1/cbt.scala +++ b/stage1/cbt.scala @@ -52,10 +52,10 @@ object `package`{ } implicit class DependencyExtensions(subject: Dependency){ import subject._ - def dependencyClasspath(implicit logger: Logger, transientCache: java.util.Map[AnyRef,AnyRef]): ClassPath + def dependencyClasspath(implicit logger: Logger, transientCache: java.util.Map[AnyRef,AnyRef], classLoaderCache: ClassLoaderCache): ClassPath = Dependencies(dependenciesArray.to).classpath def exportedClasspath: ClassPath = ClassPath(exportedClasspathArray.to) - def classpath(implicit logger: Logger, transientCache: java.util.Map[AnyRef,AnyRef]) = exportedClasspath ++ dependencyClasspath + def classpath(implicit logger: Logger, transientCache: java.util.Map[AnyRef,AnyRef], classLoaderCache: ClassLoaderCache) = exportedClasspath ++ dependencyClasspath def dependencies: Seq[Dependency] = dependenciesArray.to } implicit class ContextExtensions(subject: Context){ @@ -66,7 +66,7 @@ object `package`{ def classLoaderCache: ClassLoaderCache = new ClassLoaderCache( persistentCache ) def cbtDependencies = { import paths._ - new CbtDependencies(mavenCache, nailgunTarget, stage1Target, stage2Target, compatibilityTarget)(logger, transientCache) + new CbtDependencies(mavenCache, nailgunTarget, stage1Target, stage2Target, compatibilityTarget)(logger, transientCache, classLoaderCache) } val cbtDependency = cbtDependencies.stage2Dependency |