fixes #9, introduce compatibility with gitbcuket-3.11

prepare for 1.1 release
gitbucket-plugins · Feb 1, 2016 · 9d43488 · 9d43488
1 parent 80bae1e
commit 9d43488
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 target/
 .idea/
+.idea_modules/
 project/project/
 project/target/
diff --git a/README.MD b/README.MD
@@ -41,7 +41,14 @@ On success, you will receive a `HTTP 200` answer with a body containing the word
 
 Plugin version | GitBucket version
 :--------------|:-----------------
-1.0.x          | 3.6.x, 3.7.x, 3.8.x
+1.1.x          | 3.11.x
+1.0.x          | 3.6.x, 3.7.x, 3.8.x,, 3.9.x, 3.10.x
+
+## Build
+
+```
+sbt clean package
+```
 
 ## Installation
 
@@ -50,6 +57,10 @@ Plugin version | GitBucket version
 
 ## Release Notes
 
+### 1.1
+
+- recompilation to ensure binary compatibility with gitbucket 3.11
+
 ### 1.0
 
 - introduce gitbucket-h2-backup-plugin

diff --git a/project/build.scala b/project/build.scala
@@ -7,7 +7,7 @@ object MyBuild extends Build {
 
   val Organization = "fr.brouillard.gitbucket"
   val Name = "gitbucket-h2-backup-plugin"
-  val Version = "1.0"
+  val Version = "1.1"
   val ScalaVersion = "2.11.6"
 
   lazy val project = Project (
@@ -25,7 +25,7 @@ object MyBuild extends Build {
       "amateras-repo" at "http://amateras.sourceforge.jp/mvn/"
     ),
     libraryDependencies ++= Seq(
-      "gitbucket"          % "gitbucket-assembly" % "3.5.0" % "provided",
+      "gitbucket"          % "gitbucket-assembly" % "3.11.0" % "provided",
       "com.typesafe.play" %% "twirl-compiler"     % "1.0.4" % "provided",
       "javax.servlet"      % "javax.servlet-api"  % "3.1.0" % "provided"
     ),

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,5 @@
 logLevel := Level.Warn
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.0.2")
+addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.0.2")
+
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
diff --git a/src/main/scala/fr/brouillard/gitbucket/h2/controller/H2BackupController.scala b/src/main/scala/fr/brouillard/gitbucket/h2/controller/H2BackupController.scala
@@ -9,7 +9,7 @@ import gitbucket.core.util.Directory._
 import fr.brouillard.gitbucket.h2._
 import org.scalatra.Ok
 import org.slf4j.LoggerFactory
-import jp.sf.amateras.scalatra.forms._
+import io.github.gitbucket.scalatra.forms._
 
 class H2BackupController extends ControllerBase with AdminAuthenticator {
   private val logger = LoggerFactory.getLogger(classOf[H2BackupController])