Adding merge_commit_sha field to PullRequest model (#260)

* Adding merge-commit-sha to pull requests

* Upgrading version

* merge_commit_sha may be missing in some situations

* Updating Travis JDK

* Revert JDK change

* Fixing scalac options

* Disabling fix for Scala 2.11

* Disabling fix for Scala 2.12/JVM

* Disabling fix for Scala 2.12/JS

* Upgrading Java stack settings to avoid compilations to fail in Travis

* Testing if the scalac options are needed anymore after the stack size upgrade

.travis.yml

@@ -26,6 +26,7 @@ before_install:
     openssl aes-256-cbc -K $encrypted_88322e86f6b6_key -iv $encrypted_88322e86f6b6_iv -in secring.gpg.enc -out secring.gpg -d;
   fi
 - export PATH=${PATH}:./vendor/bundle
+- export SBT_JAVA_OPT=-J-Xss64m
 
 install:
 - rvm use 2.3.8 --install --fuzzy
@@ -43,12 +44,12 @@ before_script:
 
 script:
 - if [ "$SCALAENV" = "jvm" ]; then
-    sbt ++$TRAVIS_SCALA_VERSION validateJVM;
+    sbt ++$TRAVIS_SCALA_VERSION $SBT_JAVA_OPT validateJVM;
   elif [ "$SCALAENV" = "js" ]; then
-    sbt ++$TRAVIS_SCALA_VERSION compile;
-    sbt ++$TRAVIS_SCALA_VERSION validateJS;
+    sbt ++$TRAVIS_SCALA_VERSION $SBT_JAVA_OPT compile;
+    sbt ++$TRAVIS_SCALA_VERSION $SBT_JAVA_OPT validateJS;
   elif [ "$G4SBUILD" = "docs" ]; then
-    sbt ++$TRAVIS_SCALA_VERSION docs/tut;
+    sbt ++$TRAVIS_SCALA_VERSION $SBT_JAVA_OPT docs/tut;
   else
     echo "You might not be invited to the party";
   fi

github4s/shared/src/main/scala/github4s/free/domain/PullRequest.scala

@@ -28,6 +28,7 @@ case class PullRequest(
     updated_at: Option[String],
     closed_at: Option[String],
     merged_at: Option[String],
+    merge_commit_sha: Option[String],
     base: Option[PullRequestBase],
     head: Option[PullRequestBase],
     user: Option[User],

github4s/shared/src/test/scala/github4s/utils/FakeResponses.scala

@@ -887,6 +887,7 @@ trait FakeResponses {
       |  "updated_at": "2011-01-26T19:01:12Z",
       |  "closed_at": "2011-01-26T19:01:12Z",
       |  "merged_at": "2011-01-26T19:01:12Z",
+      |  "merge_commit_sha": "e5bd3914e2e596debea16f433f57875b5b90bcd6",
       |  "head": {
       |    "label": "new-topic",
       |    "ref": "new-topic",
@@ -1274,6 +1275,7 @@ trait FakeResponses {
       |  "updated_at": "2011-01-26T19:01:12Z",
       |  "closed_at": "2011-01-26T19:01:12Z",
       |  "merged_at": "2011-01-26T19:01:12Z",
+      |  "merge_commit_sha": "e5bd3914e2e596debea16f433f57875b5b90bcd6",
       |  "head": {
       |    "label": "new-topic",
       |    "ref": "new-topic",

github4s/shared/src/test/scala/github4s/utils/TestData.scala

@@ -114,6 +114,7 @@ trait TestData extends DummyGithubUrls {
   val validPullRequestFileSha      = "f80f79cafbe3f2ba71311b82e1171e73bd37a470"
   val validPullRequestNumber       = 1
   val validPullRequestReviewNumber = 39318789
+  val validMergeCommitSha          = "e5bd3914e2e596debea16f433f57875b5b90bcd6"
 
   val validHead   = "test-pr-issue"
   val invalidHead = ""
@@ -208,6 +209,7 @@ trait TestData extends DummyGithubUrls {
     updated_at = None,
     closed_at = None,
     merged_at = None,
+    merge_commit_sha = Some(validMergeCommitSha),
     base = None,
     head = None,
     user = None,
@@ -371,7 +373,8 @@ trait TestData extends DummyGithubUrls {
       url = s"https://api.github.com/repos/$validRepoOwner/$validRepoName/commits/$validCommitSha"
     ),
     `protected` = Some(true),
-    protection_url = Some(s"https://api.github.com/repos/$validRepoOwner/$validRepoName/branches/$validBranchName/protection")
+    protection_url = Some(
+      s"https://api.github.com/repos/$validRepoOwner/$validRepoName/branches/$validBranchName/protection")
   )
   val branch = protectedBranch.copy(`protected` = None, protection_url = None)