From 66442a51df199275d9cd516c1abd804e74871a43 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Tue, 8 Feb 2011 20:34:39 -0500 Subject: [PATCH] fix ScalaInstance creation and include Scala version in Target --- main/Default.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main/Default.scala b/main/Default.scala index 20ae6870f..27cf1aaee 100755 --- a/main/Default.scala +++ b/main/Default.scala @@ -228,8 +228,9 @@ object Default Compilers <<= (ScalaInstance, AppConfig, streams) map { (si, app, s) => Compile.compilers(si)(app, s.log) }, JavacOptions :== Nil, ScalacOptions :== Nil, - ScalaInstance <<= (AppConfig, ScalaVersion){ (app, version) => sbt.ScalaInstance(version, app.provider.scalaProvider) }, - ScalaVersion <<= AppConfig( _.provider.scalaProvider.version) + ScalaInstance <<= (AppConfig, ScalaVersion){ (app, version) => sbt.ScalaInstance(version, app.provider.scalaProvider.launcher) }, + ScalaVersion <<= AppConfig( _.provider.scalaProvider.version), + Target <<= (Target, ScalaInstance)( (t,si) => t / ("scala-" + si.actualVersion) ) ) def baseTasks = Seq(