Skip to content

Commit fff6e56

Browse files
authored
Bump to Scala 2.13.0 (#18)
1 parent ab345cb commit fff6e56

File tree

6 files changed

+17
-10
lines changed

6 files changed

+17
-10
lines changed

README.MD

+5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ It is then possible, for example, to notify every user that an upgrade of the sy
1616

1717
Plugin version | GitBucket version
1818
:--------------|:-----------------
19+
1.12.x | 4.32.x
1920
1.11.x | 4.26.x
2021
1.10.x | 4.21.x -> 4.25.x
2122
1.9.x | 4.19.x, 4.20.x
@@ -39,6 +40,10 @@ Plugin version | GitBucket version
3940

4041
## Release Notes
4142

43+
### 1.12.0
44+
45+
- [pullrequest-18](https://github.com/gitbucket-plugins/gitbucket-announce-plugin/pull/18) update to gitbucket 4.23.0 and Scala 2.13.0
46+
4247
### 1.11.0
4348

4449
- Bump sbt-gitbucket-plugin to 1.3.0 to be hosted by the [plugin registry](https://plugins.gitbucket-community.org/)

build.sbt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name := "gitbucket-announce-plugin"
22
organization := "fr.brouillard.gitbucket"
3-
version := "1.11.0"
4-
scalaVersion := "2.12.6"
5-
gitbucketVersion := "4.26.0"
3+
version := "1.12.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 +1 @@
1-
addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.3.0")
1+
addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.5.0")

src/main/scala/Plugin.scala

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class Plugin extends gitbucket.core.plugin.Plugin {
2525
, new Version("1.9.0")
2626
, new Version("1.10.0")
2727
, new Version("1.11.0")
28+
, new Version("1.12.0")
2829
)
2930

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

src/main/scala/fr/brouillard/gitbucket/announce/controller/AnnounceController.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ trait AnnounceControllerBase extends ControllerBase {
5858

5959
try {
6060
mailer.sendBcc(bcc, form.subject, form.content, Some(html), context.loginAccount)
61-
flash += "info" -> "Announce has been sent."
61+
flash.update("info", "Announce has been sent.")
6262
} catch {
6363
case t: EmailException => {
6464
t.getCause match {
@@ -74,21 +74,21 @@ trait AnnounceControllerBase extends ControllerBase {
7474
logger.error("email not sent to: {}", ua.toString())
7575
}
7676
}
77-
flash += "info" -> "Announce has been sent."
77+
flash.update("info", "Announce has been sent.")
7878
}
7979
case _ => {
8080
logger.error("failure sending email", t)
81-
flash += "info" -> "Announce cannot be sent, verify log errors."
81+
flash.update("info", "Announce cannot be sent, verify log errors.")
8282
}
8383
}
8484
}
8585
case e: Exception => {
8686
logger.error("unexpected exception while sending email", e)
87-
flash += "info" -> "Announce cannot be sent, verify log errors."
87+
flash.update("info", "Announce cannot be sent, verify log errors.")
8888
}
8989
}
9090
} else {
91-
flash += "info" -> "Announce cannot be sent, verify SMTP settings"
91+
flash.update("info", "Announce cannot be sent, verify SMTP settings")
9292
}
9393

9494
redirect("/admin/announce")

0 commit comments

Comments
 (0)