From ec30402ea6a8c8451ddbb48eaf660db5416693b7 Mon Sep 17 00:00:00 2001 From: Lilian BENOIT Date: Tue, 20 Jul 2021 07:24:31 +0200 Subject: [PATCH 1/2] fix incompatible call on JGitUtil from 4.36.0 --- src/main/scala/gitbucket/gist/controller/GistController.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/gitbucket/gist/controller/GistController.scala b/src/main/scala/gitbucket/gist/controller/GistController.scala index 3a999a4..4213d23 100644 --- a/src/main/scala/gitbucket/gist/controller/GistController.scala +++ b/src/main/scala/gitbucket/gist/controller/GistController.scala @@ -91,7 +91,7 @@ trait GistControllerBase extends ControllerBase { if(gitdir.exists){ Using.resource(Git.open(gitdir)){ git => val files: Seq[(String, JGitUtil.ContentInfo)] = JGitUtil.getFileList(git, "master", ".").map { file => - (if(isGistFile(file.name)) "" else file.name) -> JGitUtil.getContentInfo(git, file.name, file.id) + (if(isGistFile(file.name)) "" else file.name) -> JGitUtil.getContentInfo(git, file.name, file.id, true) } html.edit(getGist(userName, repoName), files, None) } From 5980638ba4a43e7cf01a46ceb3f414333be63a5b Mon Sep 17 00:00:00 2001 From: Lilian BENOIT Date: Wed, 21 Jul 2021 09:00:41 +0200 Subject: [PATCH 2/2] upgrade Gibucket version t 4.36.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 7d0e8e7..e19fa7c 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.20.0" scalaVersion := "2.13.5" -gitbucketVersion := "4.35.3" +gitbucketVersion := "4.36.0" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") Compile / javacOptions ++= Seq("-target", "8", "-source", "8")