Skip to content

Bump to Scalatra 2.6 #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 11, 2017
Merged

Bump to Scalatra 2.6 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a420b4f
Bump to Scalatra 2.6
takezoe Nov 29, 2017
0df376a
Update README.md
takezoe Dec 2, 2017
651c0c0
Bump to Scala 2.12.4
takezoe Dec 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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"
)

2 changes: 1 addition & 1 deletion src/main/scala/gitbucket/plugin/pages/pages.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down