diff --git a/MIGRATION.md b/MIGRATION.md index 55c6f2d7c..b573d491b 100644 --- a/MIGRATION.md +++ b/MIGRATION.md @@ -14,4 +14,5 @@ Migration notes - Log options `-error`, `-warn`, `-info`, `-debug` are added as shorthand for `"early(error)"` etc. - `sbt.Process` and `sbt.ProcessExtra` are gone. Use `scala.sys.process` instead. - `incOptions.value.withNameHashing(...)` option is removed. +- `TestResult.Value` is now `TestResult`. - the scripted plugin is cross-versioned now, so you must use %% when depending on it diff --git a/sbt/src/main/scala/Import.scala b/sbt/src/main/scala/Import.scala index ef3a6f84f..cb2880053 100644 --- a/sbt/src/main/scala/Import.scala +++ b/sbt/src/main/scala/Import.scala @@ -8,6 +8,10 @@ trait Import { type URI = java.net.URI type URL = java.net.URL + // sbt.testing + type TestResult = sbt.protocol.testing.TestResult + val TestResult = sbt.protocol.testing.TestResult + // sbt.io val AllPassFilter = sbt.io.AllPassFilter val DirectoryFilter = sbt.io.DirectoryFilter diff --git a/sbt/src/sbt-test/tests/t543/build.sbt b/sbt/src/sbt-test/tests/t543/build.sbt index 9d48c0433..fa93b01ee 100644 --- a/sbt/src/sbt-test/tests/t543/build.sbt +++ b/sbt/src/sbt-test/tests/t543/build.sbt @@ -26,7 +26,7 @@ lazy val root = (project in file(".")). } def startGroup(name: String): Unit = () def endGroup(name: String, t: Throwable): Unit = () - def endGroup(name: String, result: TestResult.Value): Unit = () + def endGroup(name: String, result: TestResult): Unit = () }, check := { val exists = marker.exists