diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-09 22:50:33 -0500 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-09 23:03:19 -0500 |
| commit | a06fdb7e62c5e1c9bd2737ffa7df50e9c31f6b97 (patch) | |
| tree | e75ef53a2e7e1d37b02bf7fe98095a7678685ddc /stage2/ToolsTasks.scala | |
| parent | 616c824f3d49853323a7d776f914281b7544ad41 (diff) | |
| download | cbt-a06fdb7e62c5e1c9bd2737ffa7df50e9c31f6b97.tar.gz cbt-a06fdb7e62c5e1c9bd2737ffa7df50e9c31f6b97.tar.bz2 cbt-a06fdb7e62c5e1c9bd2737ffa7df50e9c31f6b97.zip | |
more concise runMain in more places
Diffstat (limited to 'stage2/ToolsTasks.scala')
| -rw-r--r-- | stage2/ToolsTasks.scala | 12 |
1 files changed, 6 insertions, 6 deletions
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 = { |