From fa29b38b3811f8c5ff46b65bc4a662056dfab1db Mon Sep 17 00:00:00 2001 From: dmharrah Date: Thu, 30 Jul 2009 00:11:42 +0000 Subject: [PATCH] Fixed problem with overriding testDefinitionClasses too specifically (Nil) git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@918 d89573ee-9141-11dd-94d4-bdf5e562f29c --- src/main/scala/sbt/DefaultProject.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala index 310b51bf7..4f72edbad 100644 --- a/src/main/scala/sbt/DefaultProject.scala +++ b/src/main/scala/sbt/DefaultProject.scala @@ -174,8 +174,8 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec def mainLabel = "main" def testLabel = "test" - def mainCompileConfiguration = new MainCompileConfig - def testCompileConfiguration = new TestCompileConfig + def mainCompileConfiguration: CompileConfiguration = new MainCompileConfig + def testCompileConfiguration: CompileConfiguration = new TestCompileConfig abstract class BaseCompileConfig extends CompileConfiguration { def log = BasicScalaProject.this.log @@ -195,7 +195,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec def outputDirectory = mainCompilePath def classpath = compileClasspath def analysisPath = mainAnalysisPath - def testDefinitionClassNames = Nil + def testDefinitionClassNames: Iterable[String] = Nil def javaOptions = javaOptionsAsString(javaCompileOptions) } class TestCompileConfig extends BaseCompileConfig @@ -207,7 +207,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec def outputDirectory = testCompilePath def classpath = testClasspath def analysisPath = testAnalysisPath - def testDefinitionClassNames = testFrameworks.map(_.testSuperClassName) + def testDefinitionClassNames: Iterable[String] = testFrameworks.map(_.testSuperClassName) def javaOptions = javaOptionsAsString(testJavaCompileOptions) }