cross compilation && pr commits

Author: rtfpessoa

build.sbt

@@ -2,9 +2,11 @@ import Dependencies._
 
 name := """bitbucket-scala-client"""
 
-version := "1.1"
+version := "1.1-SNAPSHOT"
 
-scalaVersion := "2.11.1"
+scalaVersion := "2.10.5"
+
+crossScalaVersions := Seq("2.10.5", "2.11.6")
 
 scalacOptions := Seq("-deprecation", "-feature", "-unchecked", "-Ywarn-adapted-args", "-Xlint")
 
@@ -25,7 +27,7 @@ publishMavenStyle := true
 
 publishArtifact in Test := false
 
-pomIncludeRepository := { _ => false}
+pomIncludeRepository := { _ => false }
 
 publishTo := {
   val nexus = "https://oss.sonatype.org/"

project/Dependencies.scala

@@ -3,9 +3,9 @@ import sbt._
 object Dependencies {
 
   // Generic
-  lazy val jodaTime = "joda-time" % "joda-time" % "2.3"
+  lazy val jodaTime = "joda-time" % "joda-time" % "2.7"
 
   // Play framework
-  lazy val playWS = "com.typesafe.play" %% "play-ws" % "2.3.2"
+  lazy val playWS = "com.typesafe.play" %% "play-ws" % "2.3.8"
 
 }

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

@@ -0,0 +1,20 @@
+package com.codacy.client.bitbucket
+
+import org.joda.time.DateTime
+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)
+
+object Commit {
+  val dateFormat = "yyyy-MM-dd'T'HH:mm:ssZZ"
+  implicit val jodaDateTimeReads = Reads.jodaDateReads(dateFormat)
+
+  implicit val reader: Reads[Commit] = (
+    (__ \ "hash").read[String] and
+      (__ \ "author" \ "user" \ "username").read[String] and
+      (__ \ "parents" \\ "hash").read[Option[Seq[String]]] and
+      (__ \ "date").read[DateTime] and
+      (__ \ "message").read[String]
+    )(Commit.apply _)
+}

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

@@ -5,7 +5,7 @@ import play.api.libs.functional.syntax._
 import play.api.libs.json._
 
 case class PullRequest(id: Long, title: String, description: String,
-                       authorUsername: String, authorAvatar: String,
+                       authorUsername: String, authorAvatar: Option[String],
                        state: String, created_on: DateTime, updated_on: DateTime,
                        sourceRepository: String, sourceBranch: String, sourceCommit: String,
                        destRepository: String, destBranch: String, destCommit: String) {
@@ -21,7 +21,7 @@ object PullRequest {
       (__ \ "title").read[String] and
       (__ \ "description").read[String] and
       (__ \ "author" \ "username").read[String] and
-      (__ \ "author" \ "links" \ "avatar").read[String] and
+      (__ \ "author" \ "links" \ "avatar").read[Option[String]] and
       (__ \ "state").read[String] and
       (__ \ "created_on").read[DateTime] and
       (__ \ "updated_on").read[DateTime] and

src/main/scala/com/codacy/client/bitbucket/service/PullRequestServices.scala

@@ -1,7 +1,7 @@
 package com.codacy.client.bitbucket.service
 
-import com.codacy.client.bitbucket.PullRequest
 import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
+import com.codacy.client.bitbucket.{Commit, PullRequest}
 
 class PullRequestServices(client: BitbucketClient) {
 
@@ -17,4 +17,14 @@ class PullRequestServices(client: BitbucketClient) {
     client.executePaginated(Request(url, classOf[Seq[PullRequest]]))
   }
 
+  /*
+   * Gets the list of commits of a pull request
+   *
+   */
+  def getPullRequestCommits(owner: String, repository: String, prId: Long): RequestResponse[Seq[Commit]] = {
+    val url = s"https://bitbucket.org/!api/2.0/repositories/$owner/$repository/pullrequests/$prId/commits"
+
+    client.executePaginated(Request(url, classOf[Seq[Commit]]))
+  }
+
 }