From 2af8372308b03fa511a19831b611bcc204bd4462 Mon Sep 17 00:00:00 2001
From: Joachim Hofer <joachim.hofer@zalando.de>
Date: Fri, 5 Aug 2016 10:37:27 +0200
Subject: [PATCH 1/2] Update sbt, scoverage, coveralls, circe, akka, scalatest
 versions to the respective latest ones. Update play-json version to latest
 minor 2.3.x version.

---
 build.sbt                | 17 +++++++++--------
 project/build.properties |  2 +-
 project/plugins.sbt      |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/build.sbt b/build.sbt
index d8a26cb..e0c697c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,5 +1,3 @@
-import scoverage.ScoverageSbtPlugin
-
 organization := "org.zalando"
 
 name := "scala-jsonapi"
@@ -14,8 +12,8 @@ resolvers ++= Seq(
 )
 
 libraryDependencies ++= {
-  val circeVersion = "0.5.0-M1"
-  val akkaVersion = "2.4.7"
+  val circeVersion = "0.5.0-M2"
+  val akkaVersion = "2.4.8"
 
   Seq(
     "io.spray"          %% "spray-json"             % "1.3.2"      % "provided",
@@ -23,21 +21,24 @@ libraryDependencies ++= {
     "com.typesafe.akka" %% "akka-actor"             % akkaVersion  % "provided",
     "com.typesafe.akka" %% "akka-http-core"         % akkaVersion  % "provided",
     "com.typesafe.akka" %% "akka-http-experimental" % akkaVersion  % "provided",
-    "com.typesafe.play" %% "play-json"              % "2.3.8"      % "provided",
+    "com.typesafe.play" %% "play-json"              % "2.3.10"     % "provided",
     "io.circe"          %% "circe-core"             % circeVersion % "provided",
     "io.circe"          %% "circe-generic"          % circeVersion % "provided",
     "io.circe"          %% "circe-parser"           % circeVersion % "provided",
-    "org.scalatest"     %% "scalatest"              % "2.2.4"      % "test",
+    "org.scalatest"     %% "scalatest"              % "3.0.0"      % "test",
     "com.typesafe.akka" %% "akka-http-testkit"      % akkaVersion  % "test"
 
   )
 }
 
+lazy val root = (project in file("."))
+  .enablePlugins(ScoverageSbtPlugin)
+
 scalafmtConfig in ThisBuild := Some(file(".scalafmt"))
 
-ScoverageSbtPlugin.ScoverageKeys.coverageMinimum := 80
+coverageMinimum := 80
 
-ScoverageSbtPlugin.ScoverageKeys.coverageFailOnMinimum := true
+coverageFailOnMinimum := true
 
 publishMavenStyle := true
 
diff --git a/project/build.properties b/project/build.properties
index 59e7c05..7d789d4 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.11
\ No newline at end of file
+sbt.version=0.13.12
\ No newline at end of file
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 84d2ba3..1481ddc 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,8 +1,8 @@
 resolvers += Classpaths.sbtPluginReleases
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.0.4")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.5")
 
-addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.0.0")
+addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
 

From 0410c2bae6ec0c88682b2e0e6e09e14bd8006770 Mon Sep 17 00:00:00 2001
From: Joachim Hofer <joachim.hofer@zalando.de>
Date: Fri, 5 Aug 2016 10:52:29 +0200
Subject: [PATCH 2/2] Add `coverageReport` target to the Travis `after_success`
 step as described in the docs to coveralls.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b8759ad..ab1a9a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,5 +21,5 @@ notifications:
     on_start: never
 script: "sbt clean coverage test"
 after_success:
-  - "sbt coveralls"
+  - "sbt coverageReport coveralls"
   - bash <(curl -s https://codecov.io/bash)
\ No newline at end of file