update to gitbucket 4.0.0; fixes #11

Author: McFoggy

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.4.x          | 4.x.y
 1.3.x          | 3.11.x, 3.12.x
 1.2.x          | 3.11.x
 1.1.x          | 3.7.x -> 3.10.x
@@ -31,6 +32,9 @@ Plugin version | GitBucket version
 
 ## Release Notes
 
+### 1.4.0
+- [issue-11](https://github.com/gitbucket-plugins/gitbucket-announce-plugin/issues/11) enahnce plugin compatibility, runs with gitbucket 4.0.0
+
 ### 1.3
 - [issue-10](https://github.com/gitbucket-plugins/gitbucket-announce-plugin/issues/10) allow sending to partial list of receivers, correct exception handling on email failure
 

project/build.scala

@@ -7,7 +7,7 @@ object MyBuild extends Build {
 
   val Organization = "fr.brouillard.gitbucket"
   val Name = "gitbucket-announce-plugin"
-  val Version = "1.3"
+  val Version = "1.4.0"
   val ScalaVersion = "2.11.6"
 
   lazy val project = Project (
@@ -25,11 +25,12 @@ object MyBuild extends Build {
       "amateras-repo" at "http://amateras.sourceforge.jp/mvn/"
     ),
     libraryDependencies ++= Seq(
-      "gitbucket"          % "gitbucket-assembly" % "3.11.0" % "provided",
-      "com.typesafe.play" %% "twirl-compiler"     % "1.0.4" % "provided",
-      "javax.servlet"      % "javax.servlet-api"  % "3.1.0" % "provided",
-      "org.apache.commons" % "commons-email"      % "1.4" % "provided",
-      "com.sun.mail"       % "javax.mail"         % "1.5.2" % "provided"
+      "gitbucket"           % "gitbucket-assembly" % "4.0.0" % "provided",
+      "io.github.gitbucket" % "solidbase" % "1.0.0" % "provided",
+      "com.typesafe.play"   %% "twirl-compiler"     % "1.0.4" % "provided",
+      "javax.servlet"       % "javax.servlet-api"  % "3.1.0" % "provided",
+      "org.apache.commons"  % "commons-email"      % "1.4" % "provided",
+      "com.sun.mail"        % "javax.mail"         % "1.5.2" % "provided"
     ),
     javacOptions in compile ++= Seq("-target", "7", "-source", "7")
   ).enablePlugins(SbtTwirl)

src/main/scala/Plugin.scala

@@ -1,9 +1,7 @@
-import javax.servlet.ServletContext
-
 import fr.brouillard.gitbucket.announce.controller.AnnounceController
-import gitbucket.core.plugin.PluginRegistry
-import gitbucket.core.service.SystemSettingsService.SystemSettings
-import gitbucket.core.util.Version
+import gitbucket.core.controller.Context
+import gitbucket.core.plugin.{Link, PluginRegistry}
+import io.github.gitbucket.solidbase.model.Version
 
 class Plugin extends gitbucket.core.plugin.Plugin {
   override val pluginId: String = "announce"
@@ -13,28 +11,16 @@ class Plugin extends gitbucket.core.plugin.Plugin {
   override val description: String = "Allows to handle announces for gitbucket"
 
   override val versions: List[Version] = List(
-    Version(1, 3)
-    , Version(1, 2)
-    , Version(1, 1)
-    , Version(1, 0)
+    new Version("1.4.0")
+    , new Version("1.3.0")
+    , new Version("1.2.0")
+    , new Version("1.1.0")
+    , new Version("1.0.0")
   )
 
-  override def javaScripts(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(String, String)] = {
-    // Add Snippet link to the header
-    val path = settings.baseUrl.getOrElse(context.getContextPath)
-    Seq(
-      ".*/admin/announce" -> s"""
-        |$$('#system-admin-menu-container>li:last').after(
-        |  $$('<li class="active"><a href="${path}/admin/announce">Global Announce</a></li>')
-        |);
-      """.stripMargin,
-      ".*/admin/(?!announce).*" -> s"""
-        |$$('#system-admin-menu-container>li:last').after(
-        |  $$('<li><a href="${path}/admin/announce">Global Announce</a></li>')
-        |);
-      """.stripMargin
-    )
-  }
+  override val systemSettingMenus: Seq[(Context) => Option[Link]] = Seq(
+    (ctx: Context) => Some(Link("announce", "Global Announce", "admin/announce"))
+  )
 
   override val controllers = Seq(
     "/admin/announce" -> new AnnounceController()

src/main/twirl/fr/brouillard/gitbucket/announce/announce.scala.html

@@ -10,9 +10,9 @@
 @information(info)
 <form action="@path/admin/announce" method="POST" validate="true">
         @if(settings.useSMTP && settings.smtp.nonEmpty){
-    <div class="box">
-        <div class="box-header">New announce</div>
-        <div class="box-content">
+    <div class="panel panel-default">
+        <div class="panel-heading strong">New announce</div>
+        <div class="panel-body">
             <fieldset>
                 <label><span class="strong">To</span></label>
                 <input type="text" style="width: 635px;" name="to"/>