From da197209175382a2a1e2a6da955696f24d0cca1f Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Wed, 7 Aug 2019 16:30:55 +0900
Subject: [PATCH 1/2] Bump to Scala 2.13.0

---
 README.MD                                                  | 4 ++++
 build.sbt                                                  | 7 ++++---
 project/build.properties                                   | 2 +-
 project/plugins.sbt                                        | 2 +-
 src/main/scala/Plugin.scala                                | 3 ++-
 .../gitbucket/h2/controller/H2BackupController.scala       | 4 ++--
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/README.MD b/README.MD
index 63deecd..b72aac0 100644
--- a/README.MD
+++ b/README.MD
@@ -45,6 +45,7 @@ On success, you will receive a `HTTP 200` answer with a body containing `done: F
 
 Plugin version | GitBucket version
 :--------------|:-----------------
+1.8.x          | >= 4.32.y
 1.7.x          | >= 4.26.y
 1.6.x          | >= 4.21.y
 1.5.x          | >= 4.16.y
@@ -67,6 +68,9 @@ sbt clean assembly
 
 ## Release Notes
 
+### 1.8.0
+- compatibility with GitBucket 4.32.x and Scala 2.13
+
 ### 1.7.0
 - Bump sbt-gitbucket-plugin to 1.3.0 to be hosted by the [plugin registry](https://plugins.gitbucket-community.org/)
 
diff --git a/build.sbt b/build.sbt
index 7d62909..ec13e6a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,5 +1,6 @@
 organization := "fr.brouillard.gitbucket"
 name := "gitbucket-h2-backup-plugin"
-version := "1.7.0"
-scalaVersion := "2.12.6"
-gitbucketVersion := "4.26.0"
+version := "1.8.0"
+scalaVersion := "2.13.0"
+gitbucketVersion := "4.32.0"
+scalacOptions += "-deprecation"
diff --git a/project/build.properties b/project/build.properties
index 16eecf5..7609b47 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.1.6
\ No newline at end of file
+sbt.version = 1.2.8
\ No newline at end of file
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 1e51959..c0b3dd8 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,2 +1,2 @@
 logLevel := Level.Warn
-addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.3.0")
+addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.5.0")
diff --git a/src/main/scala/Plugin.scala b/src/main/scala/Plugin.scala
index f31d81b..41e65e0 100644
--- a/src/main/scala/Plugin.scala
+++ b/src/main/scala/Plugin.scala
@@ -18,7 +18,8 @@ class Plugin extends gitbucket.core.plugin.Plugin {
     new Version("1.5.0"),
     new Version("1.5.1"),
     new Version("1.6.0"),
-    new Version("1.7.0"))
+    new Version("1.7.0"),
+    new Version("1.8.0"))
 
   override val systemSettingMenus: Seq[(Context) => Option[Link]] = Seq(
     (ctx: Context) => Some(Link("h2-backup", "H2 Backup", "admin/h2backup"))
diff --git a/src/main/scala/fr/brouillard/gitbucket/h2/controller/H2BackupController.scala b/src/main/scala/fr/brouillard/gitbucket/h2/controller/H2BackupController.scala
index ce184f5..ab2a63f 100644
--- a/src/main/scala/fr/brouillard/gitbucket/h2/controller/H2BackupController.scala
+++ b/src/main/scala/fr/brouillard/gitbucket/h2/controller/H2BackupController.scala
@@ -65,8 +65,8 @@ class H2BackupController extends ControllerBase with AdminAuthenticator {
   post("/database/backup", backupForm) { form: BackupForm =>
     exportDatabase(new File(form.destFile))
     val msg: String = "H2 Database has been exported to '" + form.destFile + "'."
-    flash += "info" -> msg
-    flash += "dest" -> form.destFile
+    flash.update("info", msg)
+    flash.update("dest", form.destFile)
     redirect("/admin/h2backup")
   }
 

From cd1d68b9c545167617082ce34d9de01734e5dfd3 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Wed, 7 Aug 2019 16:34:06 +0900
Subject: [PATCH 2/2] Use openjdk8 instead of oraclejdk8

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 56cb58e..d1eb15f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: false
 language: scala
 jdk:
-- oraclejdk8
+- openjdk8
 cache:
   directories:
   - "$HOME/.ivy2"