Skip to content

Commit

Permalink
Format build definition files
Browse files Browse the repository at this point in the history
  • Loading branch information
guilgaly committed Nov 30, 2018
1 parent 425f715 commit 1b896f9
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ jdk:
- oraclejdk8
cache:
directories:
- $HOME/.ivy2
- $HOME/.sbt
- $HOME/.ivy2
- $HOME/.sbt
script: ./.ci_scripts/validate.sh
18 changes: 9 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down Expand Up @@ -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
)
Expand All @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 1b896f9

Please sign in to comment.