Merge pull request #43 from gitbucket/build-for-gitbucket-master

Build for master branch of GitBucket

Author: takezoe

.travis.yml

@@ -3,4 +3,4 @@ language: scala
 jdk:
 - oraclejdk8
 script:
-- sbt test
+- ./build-gitbucket-plugin.sh

build-gitbucket-plugin.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+rm -rf gitbucket
+git clone https://github.com/gitbucket/gitbucket.git
+cd gitbucket
+
+GITBUCKET_VERSION=`cat build.sbt | grep "GitBucketVersion =" | sed 's/^.*"\(.*\)".*$/\1/'`
+echo "GITBUCKET_VERSION: $GITBUCKET_VERSION"
+sbt publish-local
+
+cd ..
+sbt -Dgitbucket.version=$GITBUCKET_VERSION test

build.sbt

@@ -1,6 +1,7 @@
 val Organization = "io.github.gitbucket"
 val ProjectName = "gitbucket-gist-plugin"
 val ProjectVersion = "4.10.0"
+val GitBucketVersion = Option(System.getProperty("gitbucket.version")).getOrElse("4.16.0")
 
 lazy val root = (project in file(".")).enablePlugins(SbtTwirl)
 
@@ -10,9 +11,9 @@ version := ProjectVersion
 scalaVersion := "2.12.2"
 
 libraryDependencies ++= Seq(
-  "io.github.gitbucket" %% "gitbucket"          % "4.15.0" % "provided",
-  "com.typesafe.play"   %% "twirl-compiler"     % "1.3.0"  % "provided",
-  "javax.servlet"        % "javax.servlet-api"  % "3.1.0"  % "provided"
+  "io.github.gitbucket" %% "gitbucket"         % GitBucketVersion % "provided",
+  "com.typesafe.play"   %% "twirl-compiler"    % "1.3.0"          % "provided",
+  "javax.servlet"        % "javax.servlet-api" % "3.1.0"          % "provided"
 )
 
 scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps")

src/main/scala/gitbucket/gist/controller/GistController.scala

@@ -193,7 +193,7 @@ trait GistControllerBase extends ControllerBase {
         case Right((revisions, hasNext)) => {
           val commits = revisions.map { revision =>
             defining(JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision.id))){ revCommit =>
-              JGitUtil.getDiffs(git, revision.id) match { case (diffs, oldCommitId) =>
+              JGitUtil.getDiffs(git, revision.id, false) match { case (diffs, oldCommitId) =>
                 (revision, diffs)
               }
             }