diff --git a/sbt/scripted/project/build.properties b/sbt/scripted/project/build.properties index d37fb4bb2..806b56628 100644 --- a/sbt/scripted/project/build.properties +++ b/sbt/scripted/project/build.properties @@ -1,7 +1,7 @@ project.name=scripted project.organization=org.scala-tools.sbt -project.version=0.7.2-SNAPSHOT -sbt.version=0.7.1 +project.version=0.7.4 +sbt.version=0.7.4 def.scala.version=2.7.7 build.scala.versions=2.7.7 project.initialize=false diff --git a/sbt/scripted/src/main/scala/Scripted.scala b/sbt/scripted/src/main/scala/Scripted.scala index 450b79e33..e08299b9f 100644 --- a/sbt/scripted/src/main/scala/Scripted.scala +++ b/sbt/scripted/src/main/scala/Scripted.scala @@ -49,7 +49,7 @@ trait Scripted extends Project with MultiTaskProject def scriptedTest(test: ScriptedTest) = task { runner.scriptedTest(test.group, test.name, log) } named test.toString dependsOn(startTask) val testTasks = tests.map(scriptedTest) - Empty named("scripted-test-complete") dependsOn(testTasks : _*) + task {None} named("scripted-test-complete") dependsOn(testTasks : _*) } private def unwrapOption[T](s: T): Option[T] = if(s == null) None else Some(s) diff --git a/sbt/scripted/src/main/scala/ScriptedTests.scala b/sbt/scripted/src/main/scala/ScriptedTests.scala index a990eb6ea..f42ea49a0 100644 --- a/sbt/scripted/src/main/scala/ScriptedTests.scala +++ b/sbt/scripted/src/main/scala/ScriptedTests.scala @@ -13,7 +13,7 @@ import xsbt.test.{CommentHandler, FileCommands, ScriptRunner, TestScriptParser} final class ScriptedTests(resourceBaseDirectory: File, bufferLog: Boolean, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String) extends NotNull { @deprecated def this(resourceBaseDirectory: File, bufferLog: Boolean, sbtVersion: String, defScalaVersion: String, level: CompatibilityLevel.Value) = - this(resourceBaseDirectory, bufferLog, sbtVersion, defScalaVersion, CompatibilityLevel.defaultVersions(level)) = + this(resourceBaseDirectory, bufferLog, sbtVersion, defScalaVersion, CompatibilityLevel.defaultVersions(level)) private val testResources = new Resources(resourceBaseDirectory) @@ -87,7 +87,7 @@ object CompatibilityLevel extends Enumeration object FillProperties { def apply(projectDirectory: File, sbtVersion: String, defScalaVersion: String, level: CompatibilityLevel.Value): Unit = - apply(projectDirectory, sbtVersion, defScalaVersion, defaultVersions(level)) + apply(projectDirectory, sbtVersion, defScalaVersion, CompatibilityLevel.defaultVersions(level)) def apply(projectDirectory: File, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String): Unit = { import xsbt.Paths._