Skip to content

Commit bf130a2

Browse files
authored
Bump to Scala 2.13.0 (#28)
1 parent 87c651c commit bf130a2

File tree

7 files changed

+15
-9
lines changed

7 files changed

+15
-9
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
sudo: false
22
language: scala
33
jdk:
4-
- oraclejdk8
4+
- openjdk8
55
cache:
66
directories:
77
- "$HOME/.ivy2"

README.MD

+4
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.8.x | >= 4.32.y
4849
1.7.x | >= 4.26.y
4950
1.6.x | >= 4.21.y
5051
1.5.x | >= 4.16.y
@@ -67,6 +68,9 @@ sbt clean assembly
6768

6869
## Release Notes
6970

71+
### 1.8.0
72+
- compatibility with GitBucket 4.32.x and Scala 2.13
73+
7074
### 1.7.0
7175
- Bump sbt-gitbucket-plugin to 1.3.0 to be hosted by the [plugin registry](https://plugins.gitbucket-community.org/)
7276

build.sbt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
organization := "fr.brouillard.gitbucket"
22
name := "gitbucket-h2-backup-plugin"
3-
version := "1.7.0"
4-
scalaVersion := "2.12.6"
5-
gitbucketVersion := "4.26.0"
3+
version := "1.8.0"
4+
scalaVersion := "2.13.0"
5+
gitbucketVersion := "4.32.0"
6+
scalacOptions += "-deprecation"

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 1.1.6
1+
sbt.version = 1.2.8

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
logLevel := Level.Warn
2-
addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.3.0")
2+
addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.5.0")

src/main/scala/Plugin.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ class Plugin extends gitbucket.core.plugin.Plugin {
1818
new Version("1.5.0"),
1919
new Version("1.5.1"),
2020
new Version("1.6.0"),
21-
new Version("1.7.0"))
21+
new Version("1.7.0"),
22+
new Version("1.8.0"))
2223

2324
override val systemSettingMenus: Seq[(Context) => Option[Link]] = Seq(
2425
(ctx: Context) => Some(Link("h2-backup", "H2 Backup", "admin/h2backup"))

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ class H2BackupController extends ControllerBase with AdminAuthenticator {
6565
post("/database/backup", backupForm) { form: BackupForm =>
6666
exportDatabase(new File(form.destFile))
6767
val msg: String = "H2 Database has been exported to '" + form.destFile + "'."
68-
flash += "info" -> msg
69-
flash += "dest" -> form.destFile
68+
flash.update("info", msg)
69+
flash.update("dest", form.destFile)
7070
redirect("/admin/h2backup")
7171
}
7272

0 commit comments

Comments
 (0)