Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to Scala 2.13.0 #18

Merged
merged 1 commit into from
Aug 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -39,6 +40,10 @@ Plugin version | GitBucket version

## Release Notes

### 1.12.0

- [pullrequest-18](https://github.com/gitbucket-plugins/gitbucket-announce-plugin/pull/18) 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/)
Expand Down
7 changes: 4 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.1.6
sbt.version = 1.2.8
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.3.0")
addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.5.0")
1 change: 1 addition & 0 deletions src/main/scala/Plugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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")
Expand Down