From 1f5c45a45b21fe7236fad2dfe202cb64c16400db Mon Sep 17 00:00:00 2001
From: Cody Allen <ceedubs@gmail.com>
Date: Wed, 24 Oct 2018 09:58:53 -0700
Subject: [PATCH] Fix test fork settings I think (#2581)

To be honest I have no idea what I'm doing, but we were getting an
`[warn] javaOptions will be ignored, fork is set to false` warning, and
the [SBT docs](https://www.scala-sbt.org/1.0/docs/Forking.html) suggest
that this is the right approach.
---
 build.sbt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.sbt b/build.sbt
index c169f79c84..84da2cb443 100644
--- a/build.sbt
+++ b/build.sbt
@@ -33,8 +33,6 @@ lazy val commonSettings = Seq(
       false
   },
   resolvers ++= Seq(Resolver.sonatypeRepo("releases"), Resolver.sonatypeRepo("snapshots")),
-  fork in test := true,
-  test / javaOptions := Seq("-Xmx6G"),
   parallelExecution in Test := false,
   scalacOptions in (Compile, doc) := (scalacOptions in (Compile, doc)).value.filter(_ != "-Xfatal-warnings"),
   //todo: reenable doctests on 2.13 once it's officially released. it's disabled for now due to changes to the `toString` impl of collections
@@ -113,7 +111,9 @@ lazy val commonJvmSettings = Seq(
   testOptions in Test += {
     val flag = if ((isTravisBuild in Global).value) "-oCI" else "-oDF"
     Tests.Argument(TestFrameworks.ScalaTest, flag)
-  }
+  },
+  Test / fork := true,
+  Test / javaOptions := Seq("-Xmx6G")
 )
 
 lazy val commonNativeSettings = Seq(