luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix ScalaInstance creation and include Scala version in Target

This commit is contained in:
Mark Harrah 2011-02-08 20:34:39 -05:00
parent 7efa007820
commit 66442a51df
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/Default.scala
View File

@ -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(