Skip to content

Commit 02e314f

Browse files
committed
Bump to GitBucket 4.10 which supports Scala 2.12
1 parent 012f3ec commit 02e314f

File tree

13 files changed

+17
-21
lines changed

13 files changed

+17
-21
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ This is an example of GitBucket plug-in. This plug-in provides code snippet repo
44

55
Plugin version | GitBucket version
66
:--------------|:--------------------
7+
4.6.x | 4.10.x
78
4.5.x | 4.9.x
89
4.4.x | 4.8.x
910
4.2.x, 4.3.x | 4.2.x, 4.3.x, 4.4.x, 4.5.x, 4.6.x, 4.7.x

build.sbt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
val Organization = "io.github.gitbucket"
22
val ProjectName = "gitbucket-gist-plugin"
3-
val ProjectVersion = "4.5.0"
3+
val ProjectVersion = "4.6.0"
44

55
lazy val root = (project in file(".")).enablePlugins(SbtTwirl)
66

77
organization := Organization
88
name := ProjectName
99
version := ProjectVersion
10-
scalaVersion := "2.11.8"
10+
scalaVersion := "2.12.1"
1111

1212
libraryDependencies ++= Seq(
13-
"io.github.gitbucket" %% "gitbucket" % "4.9.0" % "provided",
14-
"com.typesafe.play" %% "twirl-compiler" % "1.0.4" % "provided",
15-
"javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided"
13+
"io.github.gitbucket" %% "gitbucket" % "4.10.0" % "provided",
14+
"com.typesafe.play" %% "twirl-compiler" % "1.3.0" % "provided",
15+
"javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided"
1616
)
1717

18-
scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps", "-Ybackend:GenBCode", "-Ydelambdafy:method", "-target:jvm-1.8")
18+
scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps", "-Ydelambdafy:method", "-target:jvm-1.8")
1919
javacOptions in compile ++= Seq("-target", "8", "-source", "8")

install-local.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 0.13.9
1+
sbt.version = 0.13.13

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
logLevel := Level.Warn
22

3-
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.0.4")
3+
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.3.0")

sbt-launch-0.13.9.jar

-1.15 MB
Binary file not shown.

sbt.bat

Lines changed: 0 additions & 2 deletions
This file was deleted.

sbt.sh

Lines changed: 0 additions & 2 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,12 +273,12 @@ trait GistControllerBase extends ControllerBase {
273273
}
274274

275275
get("/gist/_new")(usersOnly {
276-
html.edit(None, Seq(("", JGitUtil.ContentInfo("text", None, Some("UTF-8")))))
276+
html.edit(None, Seq(("", JGitUtil.ContentInfo("text", None, None, Some("UTF-8")))))
277277
})
278278

279279
get("/gist/_add"){
280280
val count = params("count").toInt
281-
html.editor(count, "", JGitUtil.ContentInfo("text", None, Some("UTF-8")))
281+
html.editor(count, "", JGitUtil.ContentInfo("text", None, None, Some("UTF-8")))
282282
}
283283

284284
////////////////////////////////////////////////////////////////////////////////

src/main/scala/gitbucket/gist/model/Gist.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package gitbucket.gist.model
22

33
trait GistComponent { self: gitbucket.core.model.Profile =>
4-
import profile.simple._
4+
import profile.api._
55
import self._
66

77
lazy val Gists = TableQuery[Gists]

0 commit comments

Comments
 (0)