From bb765db6c259275229bcaec802970317eda5ebbe Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Tue, 7 Feb 2012 21:56:37 -0500 Subject: [PATCH] drop compatibility framework definitions (dead anyway) --- main/Defaults.scala | 2 +- testing/TestFramework.scala | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/main/Defaults.scala b/main/Defaults.scala index 5390d58f1..96598e2a5 100644 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -276,7 +276,7 @@ object Defaults extends BuildCommon testLoader <<= (fullClasspath, scalaInstance, taskTemporaryDirectory) map { (cp, si, temp) => TestFramework.createTestLoader(data(cp), si, IO.createUniqueDirectory(temp)) }, testFrameworks in GlobalScope :== { import sbt.TestFrameworks._ - Seq(ScalaCheck, Specs2, Specs, ScalaTest, ScalaCheckCompat, ScalaTestCompat, SpecsCompat, JUnit) + Seq(ScalaCheck, Specs2, Specs, ScalaTest, JUnit) }, loadedTestFrameworks <<= (testFrameworks, streams, testLoader) map { (frameworks, s, loader) => frameworks.flatMap(f => f.create(loader, s.log).map( x => (f,x)).toIterable).toMap diff --git a/testing/TestFramework.scala b/testing/TestFramework.scala index 15281ecfa..8c3dd6d1a 100644 --- a/testing/TestFramework.scala +++ b/testing/TestFramework.scala @@ -21,10 +21,6 @@ object TestFrameworks val Specs = new TestFramework("org.specs.runner.SpecsFramework") val Specs2 = new TestFramework("org.specs2.runner.SpecsFramework") val JUnit = new TestFramework("com.novocode.junit.JUnitFramework") - // These are compatibility frameworks included in the 'test-compat' library - val ScalaCheckCompat = new TestFramework("sbt.impl.ScalaCheckFramework") - val ScalaTestCompat = new TestFramework("sbt.impl.ScalaTestFramework") - val SpecsCompat = new TestFramework("sbt.impl.SpecsFramework") } class TestFramework(val implClassName: String)