aboutsummaryrefslogtreecommitdiff
path: root/stage2/Lib.scala
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2017-02-14 00:07:57 -0500
committerChristopher Vogt <oss.nsp@cvogt.org>2017-02-14 00:34:48 -0500
commit92b26f394460aa609f9d073ea044776e7d8c46fb (patch)
treecb6deceebc0313e2186e686680b51187ddfd0095 /stage2/Lib.scala
parentdfde369b30bcde1c60add172e0e91caeb51e541b (diff)
downloadcbt-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 'stage2/Lib.scala')
-rw-r--r--stage2/Lib.scala5
1 files changed, 2 insertions, 3 deletions
diff --git a/stage2/Lib.scala b/stage2/Lib.scala
index d5119a7..2642ec9 100644
--- a/stage2/Lib.scala
+++ b/stage2/Lib.scala
@@ -84,9 +84,8 @@ final class Lib(val logger: Logger) extends Stage1Lib(logger) with Scaffold{
scalaMajorVersion: String,
version: String,
compileArgs: Seq[String],
- classLoaderCache: ClassLoaderCache,
mavenCache: File
- )(implicit transientCache: java.util.Map[AnyRef,AnyRef]): Option[File] = {
+ )(implicit transientCache: java.util.Map[AnyRef,AnyRef], classLoaderCache: ClassLoaderCache): Option[File] = {
if(sourceFiles.isEmpty){
None
} else {
@@ -101,7 +100,7 @@ final class Lib(val logger: Logger) extends Stage1Lib(logger) with Scaffold{
runMain(
"scala.tools.nsc.ScalaDoc",
args,
- new ScalaDependencies(cbtLastModified,mavenCache,scalaVersion).classLoader(classLoaderCache)
+ new ScalaDependencies(cbtLastModified,mavenCache,scalaVersion).classLoader
)
}
lib.jarFile(