diff --git a/.travis.yml b/.travis.yml index c9ca75a..d0da791 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,6 @@ jdk: - oraclejdk8 cache: directories: - - $HOME/.ivy2 - - $HOME/.sbt + - $HOME/.ivy2 + - $HOME/.sbt script: ./.ci_scripts/validate.sh diff --git a/build.sbt b/build.sbt index 1648f1f..398fb2a 100644 --- a/build.sbt +++ b/build.sbt @@ -31,12 +31,12 @@ def scalacOptionsVersion(scalaVersion: String) = { "-Xsource:2.12" // See https://github.com/scala/scala/releases/tag/v2.11.11 ) val v212Options = Seq( - "-Ywarn-extra-implicit", // Warn when more than one implicit parameter section is defined. + "-Ywarn-extra-implicit" // Warn when more than one implicit parameter section is defined. ) - + CrossVersion.partialVersion(scalaVersion) match { case Some((2L, 11L)) => defaultOptions ++ v211Options - case _ => defaultOptions ++ v212Options + case _ => defaultOptions ++ v212Options } } @@ -81,7 +81,7 @@ lazy val core = (project in file("core")) name := "query-core", libraryDependencies ++= Seq( Dependencies.acolyte % Test, - Dependencies.anorm % Test, + Dependencies.anorm % Test, Dependencies.cats, Dependencies.specs2 % Test ) @@ -94,12 +94,12 @@ lazy val playSqlModule = (project in file("modules/play-sql")) name := "query-play-sql", libraryDependencies ++= Seq( jdbc, - evolutions % Test, - logback % Test, - Dependencies.acolyte % Test, + evolutions % Test, + logback % Test, + Dependencies.acolyte % Test, Dependencies.acolytePlay % Test, - Dependencies.anorm % Test, - Dependencies.h2 % Test, + Dependencies.anorm % Test, + Dependencies.h2 % Test, Dependencies.scalaLogging, Dependencies.specs2 % Test ) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5d65400..3489b80 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,7 +10,7 @@ object Dependencies { lazy val cats = "org.typelevel" %% "cats-core" % "1.4.0" lazy val h2 = "com.h2database" % "h2" % "1.4.197" - + lazy val postgres = "org.postgresql" % "postgresql" % "42.2.5" lazy val scalaLogging = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0" diff --git a/project/plugins.sbt b/project/plugins.sbt index 5c0d095..7d45aef 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.1") +addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.1") addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.3.7") // The Play plugin, used for the play-sql module