Upgrade to scalafmt 1.4.0 and Argonaut 6.2.1 (#188)

hseeberger · Jan 5, 2018 · c5a2971 · c5a2971
1 parent b9da62d
commit c5a2971
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -119,7 +119,7 @@ lazy val library =
   new {
     object Version {
       val akkaHttp     = "10.0.11"
-      val argonaut     = "6.2"
+      val argonaut     = "6.2.1"
       val circe        = "0.9.0"
       val jacksonScala = "2.9.2"
       val json4s       = "3.5.3"
@@ -180,9 +180,7 @@ lazy val gitSettings =
 
 lazy val scalafmtSettings =
   Seq(
-    scalafmtOnCompile := true,
-    scalafmtOnCompile.in(Sbt) := false,
-    scalafmtVersion := "1.3.0"
+    scalafmtOnCompile := true
   )
 
 lazy val publishSettings =

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
 addSbtPlugin("com.dwijnand"      % "sbt-travisci" % "1.1.1")
 addSbtPlugin("com.jsuereth"      % "sbt-pgp"      % "1.1.0")
-addSbtPlugin("com.lucidchart"    % "sbt-scalafmt" % "1.15")
+addSbtPlugin("com.geirsson"      % "sbt-scalafmt" % "1.4.0")
 addSbtPlugin("com.typesafe.sbt"  % "sbt-git"      % "0.9.3")
 addSbtPlugin("de.heikoseeberger" % "sbt-header"   % "4.0.0")
 addSbtPlugin("org.foundweekends" % "sbt-bintray"  % "0.5.2")