Skip to content

Commit 282e9b4

Browse files
committed
version 1.4.0, compatibility with gitbucket 4.10
switch to scala 2.12, blocking-slick 0.0.7 fixes #20
1 parent 6c48e5b commit 282e9b4

File tree

8 files changed

+20
-17
lines changed

8 files changed

+20
-17
lines changed

README.MD

+5
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ On success, you will receive a `HTTP 200` answer with a body containing `done: F
4545

4646
Plugin version | GitBucket version
4747
:--------------|:-----------------
48+
1.4.x | >= 4.10.y
4849
1.3.x | >= 4.3.y
4950
1.2.x | 4.x.y
5051
1.1.x | 3.11.x
@@ -63,6 +64,10 @@ sbt clean package
6364

6465
## Release Notes
6566

67+
### 1.4.0
68+
69+
- compatibility with gitbucket 4.10, scala 2.12
70+
6671
### 1.3.0
6772

6873
- compatibility with gitbucket 4.3.0

build.sbt

+9-12
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
11
val Organization = "fr.brouillard.gitbucket"
22
val ProjectName = "gitbucket-h2-backup-plugin"
3-
val ProjectVersion = "1.3.0"
3+
val ProjectVersion = "1.4.0"
44

5-
lazy val root = (project in file(".")).enablePlugins(SbtTwirl)
5+
lazy val h2_backup_plugin = (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

12-
resolvers ++= Seq(
13-
Classpaths.typesafeReleases,
14-
"central" at "http://repo.maven.apache.org/maven2/",
15-
"amateras" at "http://amateras.sourceforge.jp/mvn/"
16-
)
1712

1813
libraryDependencies ++= Seq(
19-
"io.github.gitbucket" %% "gitbucket" % "4.3.0" % "provided",
14+
"io.github.gitbucket" %% "gitbucket" % "4.10.0" % "provided",
2015
"io.github.gitbucket" % "solidbase" % "1.0.0" % "provided",
21-
"com.typesafe.play" %% "twirl-compiler" % "1.0.4" % "provided",
16+
"com.typesafe.play" %% "twirl-compiler" % "1.3.0" % "provided",
2217
"javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided"
2318
)
2419

25-
scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps")
26-
javacOptions in compile ++= Seq("-target", "7", "-source", "7")
20+
scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps", "-Ydelambdafy:method", "-target:jvm-1.8")
21+
javacOptions in compile ++= Seq("-target", "7", "-source", "7")
22+
23+
useJCenter := true

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 0.13.9
1+
sbt.version = 0.13.12

project/plugins.sbt

+1-1
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")
Binary file not shown.

sbt.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
set SCRIPT_DIR=%~dp0
2-
java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.13.9.jar" %*
2+
java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.13.12.jar" %*

sbt.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/sh
2-
java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -jar `dirname $0`/sbt-launch-0.13.9.jar "$@"
2+
java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -jar `dirname $0`/sbt-launch-0.13.12.jar "$@"

src/main/scala/Plugin.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ class Plugin extends gitbucket.core.plugin.Plugin {
1414
override val versions: List[Version] = List(
1515
new Version("1.0.0"),
1616
new Version("1.2.0"),
17-
new Version("1.3.0")
17+
new Version("1.3.0"),
18+
new Version("1.4.0")
1819
)
1920

2021
override val systemSettingMenus: Seq[(Context) => Option[Link]] = Seq(

0 commit comments

Comments
 (0)