From cef287b6e834dce196e24a2532722798e7759313 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Tue, 11 Apr 2017 13:28:48 +0100 Subject: [PATCH] Drop deprecated SubProcess apply overload --- main-actions/src/main/scala/sbt/Tests.scala | 4 ---- sbt/src/sbt-test/tests/empty/build.sbt | 3 ++- sbt/src/sbt-test/tests/fork/build.sbt | 6 +++++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/main-actions/src/main/scala/sbt/Tests.scala b/main-actions/src/main/scala/sbt/Tests.scala index 5911726f0..844c1aae6 100644 --- a/main-actions/src/main/scala/sbt/Tests.scala +++ b/main-actions/src/main/scala/sbt/Tests.scala @@ -110,10 +110,6 @@ object Tests { /** Configures a group of tests to be forked in a new JVM with forking options specified by `config`. */ final case class SubProcess(config: ForkOptions) extends TestRunPolicy - object SubProcess { - @deprecated("Construct SubProcess with a ForkOptions argument.", "0.13.0") - def apply(javaOptions: Seq[String]): SubProcess = SubProcess(ForkOptions(runJVMOptions = javaOptions)) - } /** A named group of tests configured to run in the same JVM or be forked. */ final case class Group(name: String, tests: Seq[TestDefinition], runPolicy: TestRunPolicy) diff --git a/sbt/src/sbt-test/tests/empty/build.sbt b/sbt/src/sbt-test/tests/empty/build.sbt index 6c6170abf..d003ce2f9 100644 --- a/sbt/src/sbt-test/tests/empty/build.sbt +++ b/sbt/src/sbt-test/tests/empty/build.sbt @@ -4,6 +4,7 @@ testGrouping := { new Tests.Group( name = test.name, tests = Seq(test), - runPolicy = Tests.SubProcess(javaOptions = Seq.empty[String])) + runPolicy = Tests.SubProcess(ForkOptions(runJVMOptions = Seq.empty[String])) + ) } } diff --git a/sbt/src/sbt-test/tests/fork/build.sbt b/sbt/src/sbt-test/tests/fork/build.sbt index 88832f844..2629c28b9 100644 --- a/sbt/src/sbt-test/tests/fork/build.sbt +++ b/sbt/src/sbt-test/tests/fork/build.sbt @@ -16,7 +16,11 @@ lazy val root = (project in file(".")). val tests = (definedTests in Test).value assert(tests.size == 3) for (idx <- 0 until groups) yield - new Group(groupId(idx), tests, SubProcess(Seq("-Dgroup.prefix=" + groupPrefix(idx)))) + new Group( + groupId(idx), + tests, + SubProcess(ForkOptions(runJVMOptions = Seq("-Dgroup.prefix=" + groupPrefix(idx)))) + ) }, check := { val files =