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

fix IO tests, which needed scala-compiler.jar on the classpath

This commit is contained in:
Mark Harrah 2012-12-04 13:20:03 -05:00
parent f338018bd1
commit 005b2b356f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/settings/src/test/scala/UsageTest.scala
View File

@ -71,9 +71,9 @@ object Assign
"lit" "lit"
} }
// should not compile because getting the value from a parser involves getting the value from a task // should not compile because getting the value from a parser involves getting the value from a task
val it3: Initialize[InputTask[String]] = Def.inputTask[String] { /* val it3: Initialize[InputTask[String]] = Def.inputTask[String] {
tsk.parsed.value tsk.parsed.value
} }*/
/* // should not compile: cannot use a task to define the parser /* // should not compile: cannot use a task to define the parser
val it4 = Def.inputTask { val it4 = Def.inputTask {
dummyt.value.parsed dummyt.value.parsed

5
project/Sbt.scala
View File

@ -57,7 +57,7 @@ object Sbt extends Build
// The API for forking, combining, and doing I/O with system processes // The API for forking, combining, and doing I/O with system processes
lazy val processSub = baseProject(utilPath / "process", "Process") dependsOn(ioSub % "test->test") lazy val processSub = baseProject(utilPath / "process", "Process") dependsOn(ioSub % "test->test")
// Path, IO (formerly FileUtilities), NameFilter and other I/O utility classes // Path, IO (formerly FileUtilities), NameFilter and other I/O utility classes
lazy val ioSub = testedBaseProject(utilPath / "io", "IO") dependsOn(controlSub) lazy val ioSub = testedBaseProject(utilPath / "io", "IO") dependsOn(controlSub) settings(ioSettings : _ *)
// Utilities related to reflection, managing Scala versions, and custom class loaders // Utilities related to reflection, managing Scala versions, and custom class loaders
lazy val classpathSub = baseProject(utilPath / "classpath", "Classpath") dependsOn(launchInterfaceSub, interfaceSub, ioSub) settings(scalaCompiler) lazy val classpathSub = baseProject(utilPath / "classpath", "Classpath") dependsOn(launchInterfaceSub, interfaceSub, ioSub) settings(scalaCompiler)
// Command line-related utilities. // Command line-related utilities.
@ -255,4 +255,7 @@ object Sbt extends Build
scalav scalav
} }
) )
def ioSettings: Seq[Setting[_]] = Seq(
libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _ % "test")
)
} }