Update SBT and update dependencies

Author: guilgaly

.travis.yml

@@ -2,9 +2,9 @@ sudo: false
 language: scala
 jdk:
   - oraclejdk8
-scala: 2.12.4
+scala: 2.12.7
 cache:
   directories:
   - $HOME/.ivy2
   - $HOME/.sbt
-script: ./.ci_scripts/validate.sh
+script: ./.ci_scripts/validate.sh

build.sbt

@@ -1,10 +1,8 @@
-import Dependencies._
-
 name := "query-monad-code"
 
 version := "1.0-SNAPSHOT"
 
-scalaVersion in ThisBuild := "2.12.6"
+scalaVersion in ThisBuild := "2.12.7"
 
 // Common values
 val commonSettings = Seq(
@@ -51,12 +49,9 @@ val commonSettings = Seq(
 )
 
 // Scalafmt
-scalafmtOnCompile in ThisBuild := true
-scalafmtOnCompile := true
-scalafmtTestOnCompile in ThisBuild := true
-scalafmtTestOnCompile := true
-scalafmtConfig in ThisBuild := file("project/scalafmt.conf")
+ThisBuild / scalafmtOnCompile := true
 
+// Wartremover
 wartremoverErrors ++= Warts.unsafe
 
 //
@@ -71,7 +66,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
       )
@@ -84,12 +79,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
     )

examples/todo-app/app/controller/TodoController.scala

@@ -91,7 +91,7 @@ class TodoController(
     ConnectedAction.async { implicit request =>
       check(login) {
         val query = for {
-          - <- SqlQueryT.fromQuery[ErrorOrResult, Todo](
+          _ <- SqlQueryT.fromQuery[ErrorOrResult, Todo](
             todoStore
               .getTodo(todoId)
               .map(_.toRight("Todo doesn't exist"))

project/Dependencies.scala

@@ -5,17 +5,17 @@ object Dependencies {
 
   lazy val acolytePlay = "org.eu.acolyte" %% "play-jdbc" % "1.0.51"
 
-  lazy val anorm = "org.playframework.anorm" %% "anorm" % "2.6.0"
+  lazy val anorm = "org.playframework.anorm" %% "anorm" % "2.6.2"
 
-  lazy val cats = "org.typelevel" %% "cats-core" % "1.0.1"
+  lazy val cats = "org.typelevel" %% "cats-core" % "1.4.0"
 
-  lazy val h2 = "com.h2database" % "h2" % "1.4.196"
+  lazy val h2 = "com.h2database" % "h2" % "1.4.197"
 
-  lazy val postgres = "org.postgresql" % "postgresql" % "42.2.2"
+  lazy val postgres = "org.postgresql" % "postgresql" % "42.2.5"
 
   lazy val scalaLogging = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0"
 
-  lazy val specs2 = "org.specs2" %% "specs2-core" % "4.0.2"
+  lazy val specs2 = "org.specs2" %% "specs2-core" % "4.3.5"
 
   lazy val jbcrypt = "org.mindrot" % "jbcrypt" % "0.4"
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.1
+sbt.version=1.2.6

project/plugins.sbt

@@ -1,10 +1,5 @@
-val neoScalafmtVersion = "1.14"
-addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % neoScalafmtVersion)
-// addSbtPlugin("com.lucidchart" % "sbt-scalafmt-coursier" % neoScalafmtVersion)
+addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.1")
+addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.3.7")
 
-// The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.10")
-
-// addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC13")
-
-addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.2.1")
+// The Play plugin, used for the play-sql module
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.20")