Bump to Scala 2.13.0

gitbucket-plugins · Aug 7, 2019 · c6f5801 · c6f5801
1 parent ab345cb
commit c6f5801
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/README.MD b/README.MD
@@ -16,6 +16,7 @@ It is then possible, for example, to notify every user that an upgrade of the sy
 
 Plugin version | GitBucket version
 :--------------|:-----------------
+1.12.x         | 4.32.x
 1.11.x         | 4.26.x
 1.10.x         | 4.21.x -> 4.25.x
 1.9.x          | 4.19.x, 4.20.x
@@ -39,6 +40,10 @@ Plugin version | GitBucket version
 
 ## Release Notes
 
+### 1.12.0
+
+- update to gitbucket 4.23.0 and Scala 2.13.0
+
 ### 1.11.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
@@ -1,5 +1,6 @@
 name := "gitbucket-announce-plugin"
 organization := "fr.brouillard.gitbucket"
-version := "1.11.0"
-scalaVersion := "2.12.6"
-gitbucketVersion := "4.26.0"
+version := "1.12.0"
+scalaVersion := "2.13.0"
+gitbucketVersion := "4.32.0"
+scalacOptions += "-deprecation"
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.1.6
+sbt.version = 1.2.8
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1 +1 @@
-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
@@ -25,6 +25,7 @@ class Plugin extends gitbucket.core.plugin.Plugin {
     , new Version("1.9.0")
     , new Version("1.10.0")
     , new Version("1.11.0")
+    , new Version("1.12.0")
   )
 
   override val systemSettingMenus: Seq[(Context) => Option[Link]] = Seq(

diff --git a/src/main/scala/fr/brouillard/gitbucket/announce/controller/AnnounceController.scala b/src/main/scala/fr/brouillard/gitbucket/announce/controller/AnnounceController.scala
@@ -58,7 +58,7 @@ trait AnnounceControllerBase extends ControllerBase {
 
       try {
         mailer.sendBcc(bcc, form.subject, form.content, Some(html), context.loginAccount)
-        flash += "info" -> "Announce has been sent."
+        flash.update("info", "Announce has been sent.")
       } catch {
         case t:  EmailException => {
           t.getCause match {
@@ -74,21 +74,21 @@ trait AnnounceControllerBase extends ControllerBase {
                   logger.error("email not sent to: {}", ua.toString())
                 }
               }
-              flash += "info" -> "Announce has been sent."
+              flash.update("info", "Announce has been sent.")
             }
             case _ => {
               logger.error("failure sending email", t)
-              flash += "info" -> "Announce cannot be sent, verify log errors."
+              flash.update("info", "Announce cannot be sent, verify log errors.")
             }
           }
         }
         case e: Exception => {
           logger.error("unexpected exception while sending email", e)
-          flash += "info" -> "Announce cannot be sent, verify log errors."
+          flash.update("info", "Announce cannot be sent, verify log errors.")
         }
       }
     } else {
-      flash += "info" -> "Announce cannot be sent, verify SMTP settings"
+      flash.update("info", "Announce cannot be sent, verify SMTP settings")
     }
 
     redirect("/admin/announce")