diff options
| author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-14 00:50:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-14 00:50:02 -0500 |
| commit | 2a1bf81eccf6b91e0dcdd2d7a05664da2049f3a1 (patch) | |
| tree | 1e31b9e979453000f53dae752b4a9787d70a151d /stage2/ToolsTasks.scala | |
| parent | e0fb6ec75286c695b7e4c5ed9189714d40f9b672 (diff) | |
| parent | 69b3380ad301b50e540ef784c5ada1f3560dffab (diff) | |
| download | cbt-2a1bf81eccf6b91e0dcdd2d7a05664da2049f3a1.tar.gz cbt-2a1bf81eccf6b91e0dcdd2d7a05664da2049f3a1.tar.bz2 cbt-2a1bf81eccf6b91e0dcdd2d7a05664da2049f3a1.zip | |
Merge pull request #345 from cvogt/chris4
Chris4
Diffstat (limited to 'stage2/ToolsTasks.scala')
| -rw-r--r-- | stage2/ToolsTasks.scala | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/stage2/ToolsTasks.scala b/stage2/ToolsTasks.scala index 6acf72c..25156fb 100644 --- a/stage2/ToolsTasks.scala +++ b/stage2/ToolsTasks.scala @@ -6,16 +6,15 @@ class ToolsTasks( lib: Lib, args: Seq[String], cwd: File, - classLoaderCache: ClassLoaderCache, cache: File, cbtHome: File, cbtLastModified: Long -){ +)(implicit classLoaderCache: ClassLoaderCache){ private val paths = CbtPaths(cbtHome, cache) import paths._ - private def Resolver( urls: URL* ) = MavenResolver(cbtLastModified,mavenCache,urls: _*) implicit val logger: Logger = lib.logger implicit val transientCache: java.util.Map[AnyRef,AnyRef] = new java.util.HashMap + private def Resolver( urls: URL* ) = MavenResolver(cbtLastModified,mavenCache,urls: _*) def createMain: Unit = lib.createMain( cwd ) def createBuild: Unit = lib.createBuild( cwd ) def gui = NailgunLauncher.main(Array( @@ -48,7 +47,7 @@ class ToolsTasks( MavenDependency( "com.lihaoyi","ammonite-repl_2.11.8",args.lift(1).getOrElse("0.5.8") ) - ).classLoader(classLoaderCache) + ).classLoader // FIXME: this does not work quite yet, throws NoSuchFileException: /ammonite/repl/frontend/ReplBridge$.class lib.runMain( "ammonite.repl.Main", args.drop(2), classLoader @@ -59,7 +58,7 @@ class ToolsTasks( val scalac = new ScalaCompilerDependency( cbtLastModified, mavenCache, version ) val _args = Seq("-cp", scalac.classpath.string) ++ args.drop(2) lib.runMain( - "scala.tools.nsc.MainGenericRunner", _args, scalac.classLoader(classLoaderCache) + "scala.tools.nsc.MainGenericRunner", _args, scalac.classLoader ) } def cbtEarlyDependencies = { |