From 005b2b356f1bd2489df6fcdbd78f3ca269067b41 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Tue, 4 Dec 2012 13:20:03 -0500 Subject: [PATCH] fix IO tests, which needed scala-compiler.jar on the classpath --- main/settings/src/test/scala/UsageTest.scala | 4 ++-- project/Sbt.scala | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/main/settings/src/test/scala/UsageTest.scala b/main/settings/src/test/scala/UsageTest.scala index ae3380ec4..7ae25d39c 100644 --- a/main/settings/src/test/scala/UsageTest.scala +++ b/main/settings/src/test/scala/UsageTest.scala @@ -71,9 +71,9 @@ object Assign "lit" } // 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 - } + }*/ /* // should not compile: cannot use a task to define the parser val it4 = Def.inputTask { dummyt.value.parsed diff --git a/project/Sbt.scala b/project/Sbt.scala index e7f72b65d..00c3bea84 100644 --- a/project/Sbt.scala +++ b/project/Sbt.scala @@ -57,7 +57,7 @@ object Sbt extends Build // The API for forking, combining, and doing I/O with system processes lazy val processSub = baseProject(utilPath / "process", "Process") dependsOn(ioSub % "test->test") // 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 lazy val classpathSub = baseProject(utilPath / "classpath", "Classpath") dependsOn(launchInterfaceSub, interfaceSub, ioSub) settings(scalaCompiler) // Command line-related utilities. @@ -255,4 +255,7 @@ object Sbt extends Build scalav } ) + def ioSettings: Seq[Setting[_]] = Seq( + libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _ % "test") + ) }