Skip to content

Commit 9d43488

Browse files
committed
fixes #9, introduce compatibility with gitbcuket-3.11
prepare for 1.1 release
1 parent 80bae1e commit 9d43488

File tree

5 files changed

+19
-5
lines changed

5 files changed

+19
-5
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
target/
22
.idea/
3+
.idea_modules/
34
project/project/
45
project/target/

README.MD

+12-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,14 @@ On success, you will receive a `HTTP 200` answer with a body containing the word
4141

4242
Plugin version | GitBucket version
4343
:--------------|:-----------------
44-
1.0.x | 3.6.x, 3.7.x, 3.8.x
44+
1.1.x | 3.11.x
45+
1.0.x | 3.6.x, 3.7.x, 3.8.x,, 3.9.x, 3.10.x
46+
47+
## Build
48+
49+
```
50+
sbt clean package
51+
```
4552

4653
## Installation
4754

@@ -50,6 +57,10 @@ Plugin version | GitBucket version
5057

5158
## Release Notes
5259

60+
### 1.1
61+
62+
- recompilation to ensure binary compatibility with gitbucket 3.11
63+
5364
### 1.0
5465

5566
- introduce gitbucket-h2-backup-plugin

project/build.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ object MyBuild extends Build {
77

88
val Organization = "fr.brouillard.gitbucket"
99
val Name = "gitbucket-h2-backup-plugin"
10-
val Version = "1.0"
10+
val Version = "1.1"
1111
val ScalaVersion = "2.11.6"
1212

1313
lazy val project = Project (
@@ -25,7 +25,7 @@ object MyBuild extends Build {
2525
"amateras-repo" at "http://amateras.sourceforge.jp/mvn/"
2626
),
2727
libraryDependencies ++= Seq(
28-
"gitbucket" % "gitbucket-assembly" % "3.5.0" % "provided",
28+
"gitbucket" % "gitbucket-assembly" % "3.11.0" % "provided",
2929
"com.typesafe.play" %% "twirl-compiler" % "1.0.4" % "provided",
3030
"javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided"
3131
),

project/plugins.sbt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
logLevel := Level.Warn
22

3-
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.0.2")
3+
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.0.2")
4+
5+
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")

src/main/scala/fr/brouillard/gitbucket/h2/controller/H2BackupController.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import gitbucket.core.util.Directory._
99
import fr.brouillard.gitbucket.h2._
1010
import org.scalatra.Ok
1111
import org.slf4j.LoggerFactory
12-
import jp.sf.amateras.scalatra.forms._
12+
import io.github.gitbucket.scalatra.forms._
1313

1414
class H2BackupController extends ControllerBase with AdminAuthenticator {
1515
private val logger = LoggerFactory.getLogger(classOf[H2BackupController])

0 commit comments

Comments
 (0)