diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala index d15ce0a1c..02e9598d8 100644 --- a/project/BuildSettings.scala +++ b/project/BuildSettings.scala @@ -132,18 +132,16 @@ object BuildSettings { }.taskValue ) - lazy val oneJvmPerTestSetting = testGrouping in Test := (definedTests in Test).value map { test => - Tests.Group(name = test.name, tests = Seq(test), runPolicy = Tests.SubProcess( - ForkOptions( - javaHome.value, - outputStrategy.value, - Nil, - Some(baseDirectory.value), - javaOptions.value, - connectInput.value, - envVars.value - ))) + val forkOptions = ForkOptions() + .withJavaHome(javaHome.value) + .withOutputStrategy(outputStrategy.value) + .withBootJars(Vector.empty) + .withWorkingDirectory(Option(baseDirectory.value)) + .withConnectInput(connectInput.value) + + val runPolicy = Tests.SubProcess(forkOptions) + Tests.Group(name = test.name, tests = Seq(test), runPolicy = runPolicy) } } diff --git a/project/build.properties b/project/build.properties index c091b86ca..40577b0e0 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.16 +sbt.version=1.1.2 \ No newline at end of file