Depend on play-json 2.4 for 2.11 and 2.6 for 2.12

Author: mrfyda

.gitignore

@@ -18,4 +18,5 @@ dist
 *.iml
 codacy.pylint.conf
 npm-debug.log
-config
+config
+.ensime

build.sbt

@@ -4,15 +4,24 @@ version := "1.9.0-SNAPSHOT"
 
 scalaVersion := "2.11.12"
 
-crossScalaVersions := Seq("2.11.12", "2.12.5")
+crossScalaVersions := Seq("2.11.12", "2.12.6")
+
+unmanagedSourceDirectories in Compile += {
+  (scalaVersion.value, (sourceDirectory in Compile).value) match {
+    case (v, dir) if v startsWith "2.11" => dir / "scala-2.11"
+    case (v, dir) if v startsWith "2.12" => dir / "scala-2.12"
+  }
+}
+
+ensimeScalaVersion in ThisBuild := "2.11.12"
 
 scalacOptions := Seq("-deprecation", "-feature", "-unchecked", "-Ywarn-adapted-args", "-Xlint")
 
 resolvers += "Typesafe maven repository" at "http://repo.typesafe.com/typesafe/maven-releases/"
 
 libraryDependencies ++= Seq(
   Dependencies.playWS,
-  Dependencies.playWSjson,
+  Dependencies.playJson(scalaVersion.value),
   Dependencies.scalaTest
 )
 

circle.yml

@@ -1,5 +1,9 @@
 machine:
   pre:
-    - mkdir -p $HOME/.sbt/.lib/0.13.17 && wget https://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.17/sbt-launch.jar -O $HOME/.sbt/.lib/0.13.17/sbt-launch.jar
+    - mkdir -p $HOME/.sbt/.lib/1.1.6 && wget http://central.maven.org/maven2/org/scala-sbt/sbt-launch/1.1.6/sbt-launch-1.1.6.jar -O $HOME/.sbt/.lib/1.1.6/sbt-launch.jar
   java:
     version: oraclejdk8
+
+test:
+  override:
+    - sbt +test

project/Dependencies.scala

@@ -5,7 +5,19 @@ object Dependencies {
   val playWsStandaloneVersion = "2.0.0-M1"
   val playWS = "com.typesafe.play" %% "play-ahc-ws-standalone" % playWsStandaloneVersion
   val playWSjson = "com.typesafe.play" %% "play-ws-standalone-json" % playWsStandaloneVersion
+  val playJson_211 = "com.typesafe.play" %% "play-json" % "2.4.3"
 
   val scalaTest = "org.scalatest" %% "scalatest" % "3.0.5" % "test"
 
+  def playJson(scalaVersion: String): ModuleID = withScalaVersion(scalaVersion)(
+    playWSjson,
+    playJson_211
+  )
+
+  private def withScalaVersion(scalaVersion: String)(
+      scala212: ModuleID,
+      scalaFallback: ModuleID): ModuleID = {
+    if (scalaVersion.startsWith("2.12")) scala212 else scalaFallback
+  }
+
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.17
+sbt.version=1.1.6

project/plugins.sbt

@@ -9,8 +9,10 @@ resolvers ++= Seq(
   Classpaths.sbtPluginReleases
 )
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.5.0")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
 
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
 
-addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.8")
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.4")
+
+addSbtPlugin("org.ensime" % "sbt-ensime" % "2.5.1")

src/main/scala-2.11/play/api/libs/json.scala

@@ -0,0 +1,18 @@
+package play.api.libs
+
+import java.time.{Instant, LocalDateTime, ZoneOffset}
+
+import play.api.data.validation.ValidationError
+
+package object json {
+  val JsonValidationError: ValidationError.type = play.api.data.validation.ValidationError
+  val __ : JsPath.type = play.api.libs.json.JsPath
+
+  implicit class ReadsMethods(json: Reads.type) {
+    def localDateTimeReads[T](parsing: T, corrector: String => String = identity)
+                             (implicit p: T => TemporalParser[LocalDateTime]): Reads[LocalDateTime] =
+      new TemporalReads[T, LocalDateTime](parsing, corrector, p, { millis: Long =>
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(millis), ZoneOffset.UTC)
+      })
+  }
+}

src/main/scala-2.11/play/api/libs/json/TemporalParser.scala

@@ -0,0 +1,29 @@
+package play.api.libs.json
+
+import java.time.temporal.Temporal
+
+import play.api.data.validation.ValidationError
+
+import scala.language.implicitConversions
+
+trait TemporalParser[T <: Temporal] {
+  def parse(input: String): Option[T]
+}
+
+private[json] final class TemporalReads[A, B <: Temporal](
+                                                           parsing: A,
+                                                           corrector: String => String,
+                                                           p: A => TemporalParser[B],
+                                                           epoch: Long => B
+                                                         ) extends Reads[B] {
+  def reads(json: JsValue): JsResult[B] = json match {
+    case JsNumber(d) => JsSuccess(epoch(d.toLong))
+    case JsString(s) => p(parsing).parse(corrector(s)) match {
+      case Some(d) => JsSuccess(d)
+      case None => JsError(Seq(JsPath ->
+        Seq(ValidationError("error.expected.date.isoformat", parsing))))
+    }
+    case _ => JsError(Seq(JsPath ->
+      Seq(ValidationError("error.expected.date"))))
+  }
+}

src/main/scala-2.11/play/api/libs/ws/JsonBodyReadables.scala

@@ -0,0 +1,24 @@
+package play.api.libs.ws
+
+/**
+ * Provides implicit for converting a response to JsValue.
+ *
+ * See https://github.com/playframework/play-json for details of Play-JSON.
+ */
+trait JsonBodyReadables {
+
+  import play.api.libs.json._
+
+  /**
+   * Converts a response body into Play JSON format:
+   *
+   * {{{
+   * val json = response.body[play.api.libs.json.JsValue]
+   * }}}
+   */
+  implicit val readableAsJson: BodyReadable[JsValue] = BodyReadable { response =>
+    Json.parse(response.bodyAsBytes.toArray)
+  }
+}
+
+object JsonBodyReadables extends JsonBodyReadables

src/main/scala-2.11/play/api/libs/ws/JsonBodyWritables.scala

@@ -0,0 +1,20 @@
+package play.api.libs.ws
+
+import akka.util.ByteString
+import com.fasterxml.jackson.databind.{ JsonNode, ObjectMapper }
+import play.api.libs.json.{ JsValue, Json }
+
+trait JsonBodyWritables {
+
+  /**
+   * Creates an InMemoryBody with "application/json" content type, using the static ObjectMapper.
+   */
+  implicit val writeableOf_JsValue: BodyWritable[JsValue] = {
+    BodyWritable(a => InMemoryBody(ByteString.fromString(Json.stringify(a))), "application/json")
+  }
+
+  def body(objectMapper: ObjectMapper): BodyWritable[JsonNode] = BodyWritable(json =>
+    InMemoryBody(ByteString.fromArrayUnsafe(objectMapper.writeValueAsBytes(json))), "application/json")
+}
+
+object JsonBodyWritables extends JsonBodyWritables

src/main/scala/com/codacy/client/bitbucket/PullRequest.scala

@@ -7,7 +7,7 @@ import play.api.libs.json._
 
 case class PullRequest(id: Long, title: String, description: String,
                        authorUsername: Option[String], authorAvatar: Option[String],
-                       state: String, created_on: DateTime, updated_on: DateTime,
+                       state: String, created_on: LocalDateTime, updated_on: LocalDateTime,
                        sourceRepository: String, sourceBranch: String, sourceCommit: String,
                        destRepository: String, destBranch: String, destCommit: Option[String],
                        apiUrls: Seq[ApiUrl], authorUUID: Option[String] = None) {

src/main/scala/com/codacy/client/bitbucket/Repository.scala

@@ -1,6 +1,6 @@
 package com.codacy.client.bitbucket
 
-import java.time.{LocalDateTime, LocalTime}
+import java.time.LocalDateTime
 
 import play.api.libs.functional.syntax._
 import play.api.libs.json._
@@ -14,9 +14,9 @@ object Repository {
   val dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSSSSXXX"
   val dateFormatWithoutMillis = "yyyy-MM-dd'T'HH:mm:ssXXX"
 
-  implicit val dateTimeReads: Reads[LocalTime] =
-    Reads.localTimeReads(dateFormat)
-      .orElse(Reads.localTimeReads(dateFormatWithoutMillis))
+  implicit val dateTimeReads: Reads[LocalDateTime] =
+    Reads.localDateTimeReads(dateFormat)
+      .orElse(Reads.localDateTimeReads(dateFormatWithoutMillis))
 
   implicit val reader: Reads[Repository] = {
     ((__ \ "name").read[String] and

src/main/scala/com/codacy/client/bitbucket/client/Authentication.scala

@@ -47,7 +47,7 @@ object Authentication {
   }
 
   class OAuth2Authenticator(credentials: OAuth2Credentials) extends Authenticator {
-    override def authenticate(req: WSRequest): WSRequest = req.withQueryString("access_token" -> credentials.accessToken)
+    override def authenticate(req: WSRequest): WSRequest = req.withQueryStringParameters("access_token" -> credentials.accessToken)
   }
 
   class BasicAuthAuthenticator(credentials: BasicAuthCredentials) extends Authenticator {

src/main/scala/com/codacy/client/bitbucket/client/BitbucketClient.scala

@@ -13,6 +13,7 @@ import play.api.libs.ws.JsonBodyWritables._
 import play.api.libs.ws.ahc.StandaloneAhcWSClient
 import play.shaded.ahc.org.asynchttpclient.DefaultAsyncHttpClient
 
+import scala.compat.Platform.EOL
 import scala.concurrent.Await
 import scala.concurrent.duration.{Duration, SECONDS}
 import scala.util.{Failure, Properties, Success, Try}
@@ -208,7 +209,7 @@ class BitbucketClient(credentials: Credentials)(implicit materializer: Materiali
 
   private def getFullStackTrace(throwableOpt: Throwable, accumulator: String = ""): String = {
     Option(throwableOpt).map { throwable =>
-      val newAccumulator = s"$accumulator${Properties.lineSeparator}${throwable.getStackTraceString}"
+      val newAccumulator = s"$accumulator${Properties.lineSeparator}${throwable.getStackTrace.mkString("", EOL, EOL)}"
       getFullStackTrace(throwable.getCause, newAccumulator)
     }.getOrElse(accumulator)
   }

src/main/scala/com/codacy/client/bitbucket/util/Implicits.scala

@@ -2,6 +2,7 @@ package com.codacy.client.bitbucket.util
 
 import java.net.URI
 
+import play.api.libs.json._
 import play.api.libs.json.{Json, JsonValidationError, Reads, Writes}
 
 import scala.language.implicitConversions