From a420b4f87fa52e2409934fdaea04579737ba60ac Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Wed, 29 Nov 2017 10:43:30 +0900 Subject: [PATCH 1/3] Bump to Scalatra 2.6 --- build.sbt | 2 +- src/main/scala/gitbucket/plugin/pages/pages.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index c2cc117..3a2a5ca 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,7 @@ resolvers ++= Seq( ) libraryDependencies ++= Seq( - "io.github.gitbucket" %% "gitbucket" % "4.15.0", + "io.github.gitbucket" %% "gitbucket" % "4.19.0", "javax.servlet" % "javax.servlet-api" % "3.1.0" ) diff --git a/src/main/scala/gitbucket/plugin/pages/pages.scala b/src/main/scala/gitbucket/plugin/pages/pages.scala index 1f8c594..cfd9d31 100644 --- a/src/main/scala/gitbucket/plugin/pages/pages.scala +++ b/src/main/scala/gitbucket/plugin/pages/pages.scala @@ -8,7 +8,7 @@ import gitbucket.core.util.{ Directory, JGitUtil, OwnerAuthenticator, ReferrerAu import gitbucket.pages.html import gitbucket.plugin.model.PageSourceType import gitbucket.plugin.service.PagesService -import io.github.gitbucket.scalatra.forms._ +import org.scalatra.forms._ import org.eclipse.jgit.api.Git import org.eclipse.jgit.lib.ObjectId import org.eclipse.jgit.revwalk.RevCommit From 0df376ab8264d0b0c015db9eb8a8fdf3e2f643c4 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 2 Dec 2017 13:00:07 +0900 Subject: [PATCH 2/3] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 968bec8..2fa9e9e 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,8 @@ site generators ([jekyll](http://jekyllrb.com/), [hugo](https://gohugo.io/), etc | pages version | gitbucket version | | :---: | :---: | +| 1.6.0 | 4.19.0 | +| 1.5.0 | 4.15.0 | | 1.3 | 4.14.1 | | 1.2 | 4.13 | | 1.1 | 4.11 | From 651c0c03e3d0ed6db461e15f27c4980df67b69f9 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 2 Dec 2017 13:10:22 +0900 Subject: [PATCH 3/3] Bump to Scala 2.12.4 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 3a2a5ca..6791381 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ organization := "gitbucket" name := "gitbucket-pages-plugin" -scalaVersion := "2.12.2" +scalaVersion := "2.12.4" scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "utf8", "-feature") enablePlugins(SbtTwirl)