Bump to GitBucket 4.10 which supports Scala 2.12

takezoe · takezoe · commit 02e314ff86d6 · 2017-02-25T06:56:40.000+09:00
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@ This is an example of GitBucket plug-in. This plug-in provides code snippet repo
 
 Plugin version | GitBucket version
 :--------------|:--------------------
+4.6.x          | 4.10.x
 4.5.x          | 4.9.x
 4.4.x          | 4.8.x
 4.2.x, 4.3.x   | 4.2.x, 4.3.x, 4.4.x, 4.5.x, 4.6.x, 4.7.x
diff --git a/build.sbt b/build.sbt
@@ -1,19 +1,19 @@
 val Organization = "io.github.gitbucket"
 val ProjectName = "gitbucket-gist-plugin"
-val ProjectVersion = "4.5.0"
+val ProjectVersion = "4.6.0"
 
 lazy val root = (project in file(".")).enablePlugins(SbtTwirl)
 
 organization := Organization
 name := ProjectName
 version := ProjectVersion
-scalaVersion := "2.11.8"
+scalaVersion := "2.12.1"
 
 libraryDependencies ++= Seq(
-  "io.github.gitbucket" %% "gitbucket"          % "4.9.0" % "provided",
-  "com.typesafe.play"   %% "twirl-compiler"     % "1.0.4" % "provided",
-  "javax.servlet"        % "javax.servlet-api"  % "3.1.0" % "provided"
+  "io.github.gitbucket" %% "gitbucket"          % "4.10.0" % "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", "-Ybackend:GenBCode", "-Ydelambdafy:method", "-target:jvm-1.8")
+scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps", "-Ydelambdafy:method", "-target:jvm-1.8")
 javacOptions in compile ++= Seq("-target", "8", "-source", "8")
diff --git a/install-local.sh b/install-local.sh
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 0.13.9
+sbt.version = 0.13.13
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,3 @@
 logLevel := Level.Warn
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.0.4")
+addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.3.0")
diff --git a/sbt-launch-0.13.9.jar b/sbt-launch-0.13.9.jar
diff --git a/sbt.bat b/sbt.bat
diff --git a/sbt.sh b/sbt.sh
diff --git a/src/main/scala/gitbucket/gist/controller/GistController.scala b/src/main/scala/gitbucket/gist/controller/GistController.scala
@@ -273,12 +273,12 @@ trait GistControllerBase extends ControllerBase {
   }
 
   get("/gist/_new")(usersOnly {
-    html.edit(None, Seq(("", JGitUtil.ContentInfo("text", None, Some("UTF-8")))))
+    html.edit(None, Seq(("", JGitUtil.ContentInfo("text", None, None, Some("UTF-8")))))
   })
 
   get("/gist/_add"){
     val count = params("count").toInt
-    html.editor(count, "", JGitUtil.ContentInfo("text", None, Some("UTF-8")))
+    html.editor(count, "", JGitUtil.ContentInfo("text", None, None, Some("UTF-8")))
   }
 
   ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/scala/gitbucket/gist/model/Gist.scala b/src/main/scala/gitbucket/gist/model/Gist.scala
@@ -1,7 +1,7 @@
 package gitbucket.gist.model
 
 trait GistComponent { self: gitbucket.core.model.Profile =>
-  import profile.simple._
+  import profile.api._
   import self._
 
   lazy val Gists = TableQuery[Gists]
diff --git a/src/main/scala/gitbucket/gist/model/GistComment.scala b/src/main/scala/gitbucket/gist/model/GistComment.scala
@@ -1,7 +1,7 @@
 package gitbucket.gist.model
 
 trait GistCommentComponent { self: gitbucket.core.model.Profile =>
-  import profile.simple._
+  import profile.api._
   import self._
 
   lazy val GistComments = new TableQuery(tag => new GistComments(tag)){
diff --git a/src/main/scala/gitbucket/gist/service/GistCommentService.scala b/src/main/scala/gitbucket/gist/service/GistCommentService.scala
@@ -3,7 +3,8 @@ package gitbucket.gist.service
 import scala.language.reflectiveCalls
 import gitbucket.gist.model.GistComment
 import gitbucket.gist.model.Profile._
-import profile.simple._
+import gitbucket.gist.model.Profile.profile.blockingApi._
+import gitbucket.gist.model.Profile.dateColumnType
 
 trait GistCommentService {
 
diff --git a/src/main/scala/gitbucket/gist/service/GistService.scala b/src/main/scala/gitbucket/gist/service/GistService.scala
@@ -4,7 +4,8 @@ import gitbucket.core.model.Account
 import gitbucket.gist.model.Gist
 import gitbucket.gist.model.Mode
 import gitbucket.gist.model.Profile._
-import profile.simple._
+import gitbucket.gist.model.Profile.profile.blockingApi._
+import gitbucket.gist.model.Profile.dateColumnType
 
 trait GistService {
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version = 0.13.9`
	`1`	`+sbt.version = 0.13.13`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`logLevel := Level.Warn`
`2`	`2`
`3`		`-addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.0.4")`
	`3`	`+addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.3.0")`
Original file line number	Diff line number	Diff line change
`@@ -273,12 +273,12 @@ trait GistControllerBase extends ControllerBase {`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`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")))))`
`277`	`277`	`})`
`278`	`278`
`279`	`279`	`get("/gist/_add"){`
`280`	`280`	`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")))`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`////////////////////////////////////////////////////////////////////////////////`