Remove scala2.12

jllopes · jllopes · commit cc2c898ed8f0 · 2018-10-19T16:13:39.000+01:00
diff --git a/build.sbt b/build.sbt
@@ -7,24 +7,15 @@ name := """bitbucket-scala-client"""
 
 version := "1.9.0-SNAPSHOT"
 
-scalaVersion := "2.12.6"
-
-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"
-  }
-}
+scalaVersion := "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.playJson(scalaVersion.value),
+  Dependencies.playJson,
   Dependencies.scalaTest
 )
 
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -2,22 +2,10 @@ import sbt._
 
 object Dependencies {
 
-  val playWsStandaloneVersion = "1.1.9"
-  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 playWS = "com.typesafe.play" %% "play-ws" % "2.4.3"
 
-  val scalaTest = "org.scalatest" %% "scalatest" % "3.0.5" % "test"
-
-  def playJson(scalaVersion: String): ModuleID = withScalaVersion(scalaVersion)(
-    playWSjson,
-    playJson_211
-  )
+  val playJson = "com.typesafe.play" %% "play-json" % "2.4.3"
 
-  private def withScalaVersion(scalaVersion: String)(
-      scala212: ModuleID,
-      scalaFallback: ModuleID): ModuleID = {
-    if (scalaVersion.startsWith("2.12")) scala212 else scalaFallback
-  }
+  val scalaTest = "org.scalatest" %% "scalatest" % "3.0.5" % "test"
 
 }
diff --git a/src/main/scala-2.11/play/api/libs/json.scala b/src/main/scala-2.11/play/api/libs/json.scala
diff --git a/src/main/scala-2.11/play/api/libs/json/TemporalParser.scala b/src/main/scala-2.11/play/api/libs/json/TemporalParser.scala
diff --git a/src/main/scala-2.11/play/api/libs/ws/JsonBodyReadables.scala b/src/main/scala-2.11/play/api/libs/ws/JsonBodyReadables.scala
diff --git a/src/main/scala-2.11/play/api/libs/ws/JsonBodyWritables.scala b/src/main/scala-2.11/play/api/libs/ws/JsonBodyWritables.scala
diff --git a/src/main/scala/com/codacy/client/bitbucket/v1/service/IssueServices.scala b/src/main/scala/com/codacy/client/bitbucket/v1/service/IssueServices.scala
@@ -3,7 +3,6 @@ package com.codacy.client.bitbucket.v1.service
 import com.codacy.client.bitbucket.v1.Issue
 import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
 import play.api.libs.json._
-import play.api.libs.ws.JsonBodyWritables._
 
 class IssueServices(client: BitbucketClient) {
 
diff --git a/src/main/scala/com/codacy/client/bitbucket/v2/service/BuildStatusServices.scala b/src/main/scala/com/codacy/client/bitbucket/v2/service/BuildStatusServices.scala
@@ -3,7 +3,6 @@ package com.codacy.client.bitbucket.v2.service
 import com.codacy.client.bitbucket.v2.BuildStatus
 import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
 import play.api.libs.json._
-import play.api.libs.ws.DefaultBodyWritables._
 
 class BuildStatusServices(client: BitbucketClient) {
 
diff --git a/src/main/scala/com/codacy/client/bitbucket/v2/service/IssueServices.scala b/src/main/scala/com/codacy/client/bitbucket/v2/service/IssueServices.scala
@@ -3,7 +3,6 @@ package com.codacy.client.bitbucket.v2.service
 import com.codacy.client.bitbucket.v2.Issue
 import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
 import play.api.libs.json._
-import play.api.libs.ws.JsonBodyWritables._
 
 class IssueServices(client: BitbucketClient) {
 
diff --git a/src/main/scala/com/codacy/client/client/Authentication.scala b/src/main/scala/com/codacy/client/client/Authentication.scala
@@ -1,7 +1,7 @@
 package com.codacy.client.client
 
 import play.api.libs.oauth.{ConsumerKey, OAuthCalculator, RequestToken}
-import play.api.libs.ws.{WSAuthScheme, StandaloneWSRequest => WSRequest}
+import play.api.libs.ws.{WSAuthScheme, WSRequest}
 
 /**
   * Handles request authentication.
@@ -47,7 +47,7 @@ object Authentication {
   }
 
   class OAuth2Authenticator(credentials: OAuth2Credentials) extends Authenticator {
-    override def authenticate(req: WSRequest): WSRequest = req.withQueryStringParameters("access_token" -> credentials.accessToken)
+    override def authenticate(req: WSRequest): WSRequest = req.withQueryString("access_token" -> credentials.accessToken)
   }
 
   class BasicAuthAuthenticator(credentials: BasicAuthCredentials) extends Authenticator {
diff --git a/src/main/scala/com/codacy/client/client/BitbucketClient.scala b/src/main/scala/com/codacy/client/client/BitbucketClient.scala
@@ -2,24 +2,21 @@ package com.codacy.client.client
 
 import java.net.URI
 
-import akka.stream.Materializer
 import com.codacy.client.client.Authentication._
 import com.codacy.client.util.HTTPStatusCodes
 import com.codacy.client.util.Implicits.URIQueryParam
+import com.ning.http.client.AsyncHttpClientConfig
+import play.api.http.Writeable
 import play.api.libs.json._
-import play.api.libs.ws.BodyWritable
-import play.api.libs.ws.DefaultBodyWritables._
-import play.api.libs.ws.JsonBodyWritables._
-import play.api.libs.ws.ahc.StandaloneAhcWSClient
-import play.shaded.ahc.org.asynchttpclient.DefaultAsyncHttpClient
+import play.api.libs.ws.ning.{NingAsyncHttpClientConfigBuilder, NingWSClient}
 
 import scala.compat.Platform.EOL
 import scala.concurrent.Await
 import scala.concurrent.duration.{Duration, SECONDS}
 import scala.util.{Failure, Properties, Success, Try}
 
 
-class BitbucketClient(credentials: Credentials)(implicit materializer: Materializer) {
+class BitbucketClient(credentials: Credentials) {
 
   private lazy val requestTimeout = Duration(10, SECONDS)
 
@@ -75,7 +72,7 @@ class BitbucketClient(credentials: Credentials)(implicit materializer: Materiali
   /*
    * Does an API request
    */
-  private def performRequest[D, T](method: String, request: Request[T], values: D)(implicit reader: Reads[T], writer: BodyWritable[D]): RequestResponse[T] = withClientRequest { client =>
+  private def performRequest[D, T](method: String, request: Request[T], values: D)(implicit reader: Reads[T], writer: Writeable[D]): RequestResponse[T] = withClientRequest { client =>
     val jpromise = client.url(request.url)
       .authenticate(authenticator)
       .withFollowRedirects(follow = true)
@@ -112,7 +109,7 @@ class BitbucketClient(credentials: Credentials)(implicit materializer: Materiali
     value
   }
 
-  def postForm[D, T](request: Request[T], values: D)(implicit reader: Reads[T], writer: BodyWritable[D]): RequestResponse[T] = {
+  def postForm[D, T](request: Request[T], values: D)(implicit reader: Reads[T], writer: Writeable[D]): RequestResponse[T] = {
     performRequest("POST", request, values)
   }
 
@@ -180,15 +177,15 @@ class BitbucketClient(credentials: Credentials)(implicit materializer: Materiali
     }
   }
 
-  private def withClientEither[T](block: StandaloneAhcWSClient => Either[ResponseError, T]): Either[ResponseError, T] = {
+  private def withClientEither[T](block: NingWSClient => Either[ResponseError, T]): Either[ResponseError, T] = {
     withClient(block) match {
       case Success(res) => res
       case Failure(error) =>
         Left(ResponseError("Request failed", getFullStackTrace(error), error.getMessage))
     }
   }
 
-  private def withClientRequest[T](block: StandaloneAhcWSClient => RequestResponse[T]): RequestResponse[T] = {
+  private def withClientRequest[T](block: NingWSClient => RequestResponse[T]): RequestResponse[T] = {
     withClient(block) match {
       case Success(res) => res
       case Failure(error) =>
@@ -202,8 +199,10 @@ class BitbucketClient(credentials: Credentials)(implicit materializer: Materiali
     }
   }
 
-  private def withClient[T](block: StandaloneAhcWSClient => T): Try[T] = {
-    val client = new StandaloneAhcWSClient(new DefaultAsyncHttpClient)
+  private def withClient[T](block: NingWSClient => T): Try[T] = {
+    val config = new NingAsyncHttpClientConfigBuilder().build()
+    val clientConfig = new AsyncHttpClientConfig.Builder(config).build()
+    val client = new NingWSClient(clientConfig)
     val result = Try(block(client))
     client.close()
     result
diff --git a/src/main/scala/com/codacy/client/util/Implicits.scala b/src/main/scala/com/codacy/client/util/Implicits.scala
@@ -2,8 +2,8 @@ package com.codacy.client.util
 
 import java.net.URI
 
-import play.api.libs.json._
-import play.api.libs.json.{Json, JsonValidationError, Reads, Writes}
+import play.api.data.validation.ValidationError
+import play.api.libs.json.{Json, Reads, Writes}
 
 import scala.language.implicitConversions
 
@@ -13,7 +13,7 @@ object Implicits {
 
   implicit def enumReads[E <: Enumeration](e: E): Reads[e.Value] = {
     Reads.StringReads.map { value => e.values.find(_.toString == value) }
-      .collect(JsonValidationError("Invalid enumeration value")) { case Some(v) => v }
+      .collect(ValidationError("Invalid enumeration value")) { case Some(v) => v }
   }
 
   implicit class URIQueryParam(uri: URI) {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package com.codacy.client.client`
`2`	`2`
`3`	`3`	`import play.api.libs.oauth.{ConsumerKey, OAuthCalculator, RequestToken}`
`4`		`-import play.api.libs.ws.{WSAuthScheme, StandaloneWSRequest => WSRequest}`
	`4`	`+import play.api.libs.ws.{WSAuthScheme, WSRequest}`
`5`	`5`
`6`	`6`	`/**`
`7`	`7`	`* Handles request authentication.`
`@@ -47,7 +47,7 @@ object Authentication {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`class OAuth2Authenticator(credentials: OAuth2Credentials) extends Authenticator {`
`50`		`- override def authenticate(req: WSRequest): WSRequest = req.withQueryStringParameters("access_token" -> credentials.accessToken)`
	`50`	`+ override def authenticate(req: WSRequest): WSRequest = req.withQueryString("access_token" -> credentials.accessToken)`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`class BasicAuthAuthenticator(credentials: BasicAuthCredentials) extends Authenticator {`