Use Scala 2.12

Author: mrfyda

build.sbt

@@ -1,21 +1,19 @@
-import Dependencies._
-
 name := """bitbucket-scala-client"""
 
 version := "1.9.0-SNAPSHOT"
 
-scalaVersion := "2.10.5"
+scalaVersion := "2.11.12"
 
-crossScalaVersions := Seq("2.10.5", "2.11.7")
+crossScalaVersions := Seq("2.11.12", "2.12.5")
 
 scalacOptions := Seq("-deprecation", "-feature", "-unchecked", "-Ywarn-adapted-args", "-Xlint")
 
 resolvers += "Typesafe maven repository" at "http://repo.typesafe.com/typesafe/maven-releases/"
 
 libraryDependencies ++= Seq(
-  jodaTime,
-  playWS,
-  scalaTest
+  Dependencies.playWS,
+  Dependencies.playWSjson,
+  Dependencies.scalaTest
 )
 
 organization := "com.codacy"

circle.yml

@@ -1,3 +1,5 @@
 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
   java:
     version: oraclejdk8

project/Dependencies.scala

@@ -2,11 +2,10 @@ import sbt._
 
 object Dependencies {
 
-  // Generic
-  lazy val jodaTime = "joda-time" % "joda-time" % "2.7"
+  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
 
-  // Play framework
-  lazy val playWS = "com.typesafe.play" %% "play-ws" % "2.4.3"
+  val scalaTest = "org.scalatest" %% "scalatest" % "3.0.5" % "test"
 
-  lazy val scalaTest = "org.scalatest" %% "scalatest" % "2.2.6" % "test"
 }

project/build.properties

@@ -1,4 +1 @@
-#Activator-generated Properties
-#Sat Jul 12 15:51:18 WEST 2014
-template.uuid=a855816c-0367-44ba-9adb-6a903f6ad599
-sbt.version=0.13.8
+sbt.version=0.13.17

project/plugins.sbt

@@ -12,3 +12,5 @@ resolvers ++= Seq(
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.5.0")
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
+
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.8")

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

@@ -1,14 +1,15 @@
 package com.codacy.client.bitbucket
 
-import org.joda.time.DateTime
+import java.time.LocalDateTime
+
 import play.api.libs.functional.syntax._
 import play.api.libs.json._
 
-case class Commit(hash: String, authorName: String, parents: Option[Seq[String]], date: DateTime, message: String)
+case class Commit(hash: String, authorName: String, parents: Option[Seq[String]], date: LocalDateTime, message: String)
 
 object Commit {
-  val dateFormat = "yyyy-MM-dd'T'HH:mm:ssZZ"
-  implicit val jodaDateTimeReads = Reads.jodaDateReads(dateFormat)
+  val dateFormat = "yyyy-MM-dd'T'HH:mm:ssXXX"
+  implicit val dateTimeReads: Reads[LocalDateTime] = Reads.localDateTimeReads(dateFormat)
 
   implicit def optionSeqStringReader: Reads[Option[Seq[String]]] = Reads { (json: JsValue) =>
     json match {
@@ -21,7 +22,7 @@ object Commit {
     (__ \ "hash").read[String] and
       (__ \ "author" \ "user" \ "username").read[String] and
       (__ \ "parents" \\ "hash").read[Option[Seq[String]]] and
-      (__ \ "date").read[DateTime] and
+      (__ \ "date").read[LocalDateTime] and
       (__ \ "message").read[String]
     )(Commit.apply _)
-}
+}

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

@@ -1,21 +1,22 @@
 package com.codacy.client.bitbucket
 
-import org.joda.time.DateTime
+import java.time.LocalDateTime
+
 import play.api.libs.functional.syntax._
 import play.api.libs.json._
 
-case class CommitComment(id: Long, username: String, commit: String, display_name: String, content: String, created_on: DateTime)
+case class CommitComment(id: Long, username: String, commit: String, display_name: String, content: String, created_on: LocalDateTime)
 
 object CommitComment {
-  val dateFormat = "yyyy-MM-dd HH:mm:ssZZ"
-  implicit val jodaDateTimeReads = Reads.jodaDateReads(dateFormat)
+  val dateFormat = "yyyy-MM-dd HH:mm:ssXXX"
+  implicit val dateTimeReads: Reads[LocalDateTime] = Reads.localDateTimeReads(dateFormat)
 
   implicit val reader: Reads[CommitComment] = (
     (__ \ "comment_id").read[Long] and
       (__ \ "username").read[String] and
       (__ \ "node").read[String] and
       (__ \ "display_name").read[String] and
       (__ \ "content").read[String] and
-      (__ \ "utc_created_on").read[DateTime]
+      (__ \ "utc_created_on").read[LocalDateTime]
     )(CommitComment.apply _)
-}
+}

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

@@ -1,15 +1,16 @@
 package com.codacy.client.bitbucket
 
-import org.joda.time.DateTime
+import java.time.LocalDateTime
+
 import play.api.libs.functional.syntax._
 import play.api.libs.json._
 
 case class Issue(id: Long, status: String, priority: String, title: String, content: String, owner: String,
-                 created_on: DateTime, kind: String)
+                 created_on: LocalDateTime, kind: String)
 
 object Issue {
   val dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSS"
-  implicit val jodaDateTimeReads = Reads.jodaDateReads(dateFormat)
+  implicit val dateTimeReads: Reads[LocalDateTime] = Reads.localDateTimeReads(dateFormat)
 
   implicit val reader: Reads[Issue] = (
     (__ \ "local_id").read[Long] and
@@ -18,7 +19,7 @@ object Issue {
       (__ \ "title").read[String] and
       (__ \ "content").read[String] and
       (__ \ "reported_by" \ "username").read[String] and
-      (__ \ "created_on").read[DateTime] and
+      (__ \ "created_on").read[LocalDateTime] and
       (__ \ "metadata" \ "kind").read[String]
     )(Issue.apply _)
-}
+}

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

@@ -1,11 +1,13 @@
 package com.codacy.client.bitbucket
 
-import org.joda.time.DateTime
+import java.time.LocalDateTime
+
 import play.api.libs.functional.syntax._
 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,
+                       authorUsername: Option[String], authorAvatar: Option[String],
+                       state: String, created_on: DateTime, updated_on: DateTime,
                        sourceRepository: String, sourceBranch: String, sourceCommit: String,
                        destRepository: String, destBranch: String, destCommit: Option[String],
                        apiUrls: Seq[ApiUrl], authorUUID: Option[String] = None) {
@@ -32,8 +34,8 @@ object ApiUrlType extends Enumeration {
 case class ApiUrl(urlType: ApiUrlType.Value, link: String)
 
 object PullRequest {
-  val dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSSSSZZ"
-  implicit val jodaDateTimeReads = Reads.jodaDateReads(dateFormat)
+  val dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSSSSXXX"
+  implicit val dateTimeReads: Reads[LocalDateTime] = Reads.localDateTimeReads(dateFormat)
 
   implicit def optionStringReader: Reads[Option[String]] = Reads { (json: JsValue) =>
     json match {
@@ -49,8 +51,8 @@ object PullRequest {
       (__ \ "author" \ "username").readNullable[String] and
       (__ \ "author" \ "links" \ "avatar" \ "href").readNullable[String].orElse((__ \ "author" \ "links").readNullable[String]) and
       (__ \ "state").read[String] and
-      (__ \ "created_on").read[DateTime] and
-      (__ \ "updated_on").read[DateTime] and
+      (__ \ "created_on").read[LocalDateTime] and
+      (__ \ "updated_on").read[LocalDateTime] and
       (__ \ "source" \ "repository" \ "full_name").read[String] and
       (__ \ "source" \ "branch" \ "name").read[String] and
       (__ \ "source" \ "commit" \ "hash").read[String] and

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

@@ -1,20 +1,21 @@
 package com.codacy.client.bitbucket
 
-import org.joda.time.DateTime
+import java.time.LocalDateTime
+
 import play.api.libs.functional.syntax._
 import play.api.libs.json._
 
-case class PullRequestComment(id: Long, username: String, display_name: String, content: String, created_on: DateTime)
+case class PullRequestComment(id: Long, username: String, display_name: String, content: String, created_on: LocalDateTime)
 
 object PullRequestComment {
-  val dateFormat = "yyyy-MM-dd HH:mm:ssZZ"
-  implicit val jodaDateTimeReads = Reads.jodaDateReads(dateFormat)
+  val dateFormat = "yyyy-MM-dd HH:mm:ssXXX"
+  implicit val dateTimeReads: Reads[LocalDateTime] = Reads.localDateTimeReads(dateFormat)
 
   implicit val reader: Reads[PullRequestComment] = (
     (__ \ "comment_id").read[Long] and
       (__ \ "username").read[String] and
       (__ \ "display_name").read[String] and
       (__ \ "content").read[String] and
-      (__ \ "utc_created_on").read[DateTime]
+      (__ \ "utc_created_on").read[LocalDateTime]
     )(PullRequestComment.apply _)
-}
+}