diff --git a/sbt/src/sbt-test/tests/fork-parallel/build.sbt b/sbt/src/sbt-test/tests/fork-parallel/build.sbt index bfa90d309..d46339550 100644 --- a/sbt/src/sbt-test/tests/fork-parallel/build.sbt +++ b/sbt/src/sbt-test/tests/fork-parallel/build.sbt @@ -5,8 +5,8 @@ val check = taskKey[Unit]("Check that tests are executed in parallel") lazy val root = (project in file(".")). settings( - scalaVersion := "2.9.2", - libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test", + scalaVersion := "2.11.8", + libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test, fork in Test := true, check := { val nbProc = java.lang.Runtime.getRuntime().availableProcessors() diff --git a/sbt/src/sbt-test/tests/fork-uncaught/build.sbt b/sbt/src/sbt-test/tests/fork-uncaught/build.sbt index 111c25103..dd42de86e 100644 --- a/sbt/src/sbt-test/tests/fork-uncaught/build.sbt +++ b/sbt/src/sbt-test/tests/fork-uncaught/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.9.2" +scalaVersion := "2.11.8" organization := "org.example" @@ -6,5 +6,7 @@ name := "fork-uncaught" fork := true -libraryDependencies += "org.scalatest" % "scalatest_2.9.2" % "2.0.M3" % "test" intransitive() - +libraryDependencies ++= List( + "org.scala-lang.modules" %% "scala-xml" % "1.0.1", + "org.scalatest" %% "scalatest" % "2.2.6" % Test intransitive() +) diff --git a/sbt/src/sbt-test/tests/fork/build.sbt b/sbt/src/sbt-test/tests/fork/build.sbt index 1b13dcba2..575b2b261 100755 --- a/sbt/src/sbt-test/tests/fork/build.sbt +++ b/sbt/src/sbt-test/tests/fork/build.sbt @@ -11,7 +11,7 @@ def groupPrefix(idx: Int) = groupId(idx) + "_file_" lazy val root = (project in file(".")). settings( - scalaVersion := "2.9.2", + scalaVersion := "2.11.8", testGrouping in Test <<= definedTests in Test map { tests => assert(tests.size == 3) for (idx <- 0 until groups) yield @@ -27,5 +27,8 @@ lazy val root = (project in file(".")). sys.error("Files were not created:\n\t" + absent.mkString("\n\t")) }, concurrentRestrictions := Tags.limit(Tags.ForkedTestGroup, 2) :: Nil, - libraryDependencies += "org.scalatest" %% "scalatest" % "1.8" % Test + libraryDependencies ++= List( + "org.scala-lang.modules" %% "scala-xml" % "1.0.1", + "org.scalatest" %% "scalatest" % "2.2.6" % Test + ) ) diff --git a/sbt/src/sbt-test/tests/junit-xml-report/build.sbt b/sbt/src/sbt-test/tests/junit-xml-report/build.sbt index 9ae00779f..18e504dd6 100644 --- a/sbt/src/sbt-test/tests/junit-xml-report/build.sbt +++ b/sbt/src/sbt-test/tests/junit-xml-report/build.sbt @@ -10,8 +10,8 @@ val failingReportFile = "target/test-reports/another.pkg.FailingTest.xml" lazy val root = (project in file(".")). settings( - scalaVersion := "2.9.2", - libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test", + scalaVersion := "2.11.8", + libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test, // TODO use matchers instead of sys.error checkReport := { diff --git a/sbt/src/sbt-test/tests/nested-subproc/build.sbt b/sbt/src/sbt-test/tests/nested-subproc/build.sbt index d972521bc..3302653bd 100644 --- a/sbt/src/sbt-test/tests/nested-subproc/build.sbt +++ b/sbt/src/sbt-test/tests/nested-subproc/build.sbt @@ -1,7 +1,10 @@ -scalaVersion := "2.10.1" - -libraryDependencies += "org.scalatest" %% "scalatest" % "2.0.M6-SNAP28" - -testOptions in Test += Tests.Argument("-r", "custom.CustomReporter") - -fork := true \ No newline at end of file +lazy val root = (project in file(".")). + settings( + scalaVersion := "2.11.8", + libraryDependencies ++= List( + "org.scala-lang.modules" %% "scala-xml" % "1.0.1", + "org.scalatest" %% "scalatest" % "2.2.6" + ), + testOptions in Test += Tests.Argument("-r", "custom.CustomReporter"), + fork := true + ) diff --git a/sbt/src/sbt-test/tests/specs-run/build.sbt b/sbt/src/sbt-test/tests/specs-run/build.sbt index c6b41db8d..c9f3e0f04 100644 --- a/sbt/src/sbt-test/tests/specs-run/build.sbt +++ b/sbt/src/sbt-test/tests/specs-run/build.sbt @@ -1,3 +1,4 @@ -scalaVersion := "2.9.1" +lazy val specs2 = "org.specs2" %% "specs2" % "2.3.11" +scalaVersion := "2.11.8" -libraryDependencies += "org.specs2" %% "specs2" % "1.7.1" % "test" +libraryDependencies += specs2 % Test diff --git a/sbt/src/sbt-test/tests/t543/build.sbt b/sbt/src/sbt-test/tests/t543/build.sbt index b136fe30c..9d48c0433 100755 --- a/sbt/src/sbt-test/tests/t543/build.sbt +++ b/sbt/src/sbt-test/tests/t543/build.sbt @@ -7,8 +7,11 @@ val check = TaskKey[Unit]("check", "Check correct error has been returned.") lazy val root = (project in file(".")). settings( - libraryDependencies += "org.scalatest" %% "scalatest" % "1.8" % Test, - scalaVersion := "2.9.2", + libraryDependencies ++= List( + "org.scala-lang.modules" %% "scala-xml" % "1.0.1", + "org.scalatest" %% "scalatest" % "2.2.6" + ), + scalaVersion := "2.11.8", fork := true, testListeners += new TestReportListener { def testEvent(event: TestEvent): Unit = {