aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorvlad <vlad@drivergrp.com>2016-07-19 15:01:30 -0400
committervlad <vlad@drivergrp.com>2016-07-19 15:01:30 -0400
commit979ff9e765e3c08501cbd00354a87013853fe796 (patch)
treec5d41ed99759c3bf97ba4ef9162aeb68ed4c29f8 /project
parent8d45c2ec5e8abc63046c610109471cc3fa7bfaa2 (diff)
downloaddriver-core-979ff9e765e3c08501cbd00354a87013853fe796.tar.gz
driver-core-979ff9e765e3c08501cbd00354a87013853fe796.tar.bz2
driver-core-979ff9e765e3c08501cbd00354a87013853fe796.zip
Unit tests for core code and bug fixes
Diffstat (limited to 'project')
-rw-r--r--project/Build.scala8
1 files changed, 2 insertions, 6 deletions
diff --git a/project/Build.scala b/project/Build.scala
index 9af8d04..c0f3e5e 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -14,11 +14,6 @@ object BuildSettings {
Wart.Overloading, Wart.DefaultArguments, Wart.ToString, Wart.Any, Wart.Throw)
)
- val acyclicSettings = Seq(
- autoCompilerPlugins := true,
- addCompilerPlugin("com.lihaoyi" %% "acyclic" % "0.1.4")
- )
-
val compileScalastyle = taskKey[Unit]("compileScalastyle")
val buildSettings = Defaults.coreDefaultSettings ++ Seq (
@@ -33,7 +28,7 @@ object BuildSettings {
fork in run := true,
compileScalastyle := (scalastyle in Compile).toTask("").value,
(compile in Compile) <<= ((compile in Compile) dependsOn compileScalastyle)
- ) ++ wartRemoverSettings ++ acyclicSettings ++ reformatOnCompileSettings
+ ) ++ wartRemoverSettings ++ reformatOnCompileSettings
}
object DriverBuild extends Build {
@@ -48,6 +43,7 @@ object DriverBuild extends Build {
"com.typesafe.akka" %% "akka-http-spray-json-experimental" % akkaHttpV,
"com.typesafe.akka" %% "akka-http-testkit" % akkaHttpV,
"org.scalatest" % "scalatest_2.11" % "2.2.1" % "test",
+ "org.mockito" % "mockito-core" % "1.9.5" % "test",
"com.typesafe.slick" %% "slick" % "3.0.0",
"com.typesafe" % "config" % "1.2.1",
"com.typesafe.scala-logging" %% "scala-logging" % "3.1.0",