From a06fdb7e62c5e1c9bd2737ffa7df50e9c31f6b97 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Thu, 9 Mar 2017 22:50:33 -0500 Subject: more concise runMain in more places --- stage2/ToolsTasks.scala | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'stage2/ToolsTasks.scala') diff --git a/stage2/ToolsTasks.scala b/stage2/ToolsTasks.scala index eb41dd0..15052ae 100644 --- a/stage2/ToolsTasks.scala +++ b/stage2/ToolsTasks.scala @@ -49,22 +49,22 @@ class ToolsTasks( def amm = ammonite def ammonite = { val version = args.lift(1).getOrElse(constants.scalaVersion) - val classLoader = Resolver(mavenCentral).bindOne( + val ammonite = Resolver(mavenCentral).bindOne( MavenDependency( "com.lihaoyi","ammonite-repl_2.11.8",args.lift(1).getOrElse("0.5.8") ) - ).classLoader + ) // FIXME: this does not work quite yet, throws NoSuchFileException: /ammonite/repl/frontend/ReplBridge$.class - lib.runMain( - "ammonite.repl.Main", args.drop(2), classLoader + ammonite.runMain( + "ammonite.repl.Main", args.drop(2) ) } def scala = { val version = args.lift(1).getOrElse(constants.scalaVersion) 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 + scalac.runMain( + "scala.tools.nsc.MainGenericRunner", _args ) } def cbtEarlyDependencies = { -- cgit v1.2.3