Skip to content

Commit

Permalink
Fix test fork settings I think (#2581)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ceedubs authored and Luka Jacobowitz committed Oct 24, 2018
1 parent 8620303 commit 1f5c45a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down

0 comments on commit 1f5c45a

Please sign in to comment.