diff options
Diffstat (limited to 'project/Settings.scala')
| -rw-r--r-- | project/Settings.scala | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/project/Settings.scala b/project/Settings.scala index dfc3e80d..ffcd89cc 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -30,15 +30,15 @@ object Settings { lazy val basicSettings = Seq( ivyScala := ivyScala.value map { _.copy(overrideScalaVersion = true) }, - crossScalaVersions := Seq("2.10.5", "2.11.6"), - resolvers ++= Dependencies.resolutionRepos, - fork in run := true, - parallelExecution in Test := false, - testGrouping in Test := singleTestPerJvm((definedTests in Test).value, (javaOptions in Test).value), - javacOptions := Seq( + crossScalaVersions := Seq("2.10.5", "2.11.6"), + resolvers ++= Dependencies.resolutionRepos, + fork in run := true, + parallelExecution in Global := false, + testGrouping in Test := singleTestPerJvm((definedTests in Test).value, (javaOptions in Test).value), + javacOptions := Seq( "-Xlint:-options", "-source", JavaVersion, "-target", JavaVersion), - scalacOptions := Seq( + scalacOptions := Seq( "-encoding", "utf8", "-g:vars", |