version 1.6.0, compatibility with gitbucket 4.10

switch to scala 2.12, blocking-slick 0.0.7
fixes #13

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.6.x          | 4.10.y
 1.5.x          | 4.3.y
 1.4.x          | 4.0.0 -> 4.2.x
 1.3.x          | 3.11.x, 3.12.x
@@ -33,6 +34,9 @@ Plugin version | GitBucket version
 
 ## Release Notes
 
+### 1.6.0
+- [issue-13](https://github.com/gitbucket-plugins/gitbucket-announce-plugin/issues/13) update to gitbucket 4.10
+
 ### 1.5.0
 - [issue-12](https://github.com/gitbucket-plugins/gitbucket-announce-plugin/issues/12) adapt to new gitbucket version handling
 

build.sbt

@@ -1,28 +1,24 @@
 val Organization = "fr.brouillard.gitbucket"
 val ProjectName = "gitbucket-announce-plugin"
-val ProjectVersion = "1.5.0"
+val ProjectVersion = "1.6.0"
 
 lazy val root = (project in file(".")).enablePlugins(SbtTwirl)
 
 organization := Organization
 name := ProjectName
 version := ProjectVersion
-scalaVersion := "2.11.8"
-
-resolvers ++= Seq(
-  Classpaths.typesafeReleases,
-  "central" at "http://repo.maven.apache.org/maven2/",
-  "amateras" at "http://amateras.sourceforge.jp/mvn/"
-)
+scalaVersion := "2.12.1"
 
 libraryDependencies ++= Seq(
-  "io.github.gitbucket" %% "gitbucket"         % "4.3.0" % "provided",
-  "io.github.gitbucket"  % "solidbase"         % "1.0.0" % "provided",
-  "com.typesafe.play"   %% "twirl-compiler"    % "1.0.4" % "provided",
-  "org.apache.commons"  % "commons-email"      % "1.4" % "provided",
-  "com.sun.mail"        % "javax.mail"         % "1.5.2" % "provided",
-  "javax.servlet"        % "javax.servlet-api" % "3.1.0" % "provided"
+  "io.github.gitbucket"   %% "gitbucket"            % "4.10.0"  % "provided",
+  "io.github.gitbucket"   % "solidbase"             % "1.0.0"   % "provided",
+  "com.typesafe.play"     %% "twirl-compiler"       % "1.3.0"   % "provided",
+  "org.apache.commons"    % "commons-email"         % "1.4"     % "provided",
+  "com.sun.mail"          % "javax.mail"            % "1.5.2"   % "provided",
+  "javax.servlet"         % "javax.servlet-api"     % "3.1.0"   % "provided"
 )
 
-scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps")
-javacOptions in compile ++= Seq("-target", "7", "-source", "7")
+scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps", "-Ydelambdafy:method", "-target:jvm-1.8")
+javacOptions in compile ++= Seq("-target", "7", "-source", "7")
+
+useJCenter := true

project/build.properties

@@ -1 +1 @@
-sbt.version = 0.13.9
+sbt.version = 0.13.12

project/plugins.sbt

@@ -1,6 +1 @@
-addSbtPlugin("com.github.mpeltonen"    % "sbt-idea"          % "1.6.0")
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.0.4")
-
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")
-	
+addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.3.0")

sbt-launch-0.13.9.jar renamed to sbt-launch-0.13.12.jar

@@ -1,2 +1,2 @@
 set SCRIPT_DIR=%~dp0
-java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.13.9.jar" %*
+java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.13.12.jar" %*

sbt.bat

@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -jar `dirname $0`/sbt-launch-0.13.9.jar "$@"
+java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -jar `dirname $0`/sbt-launch-0.13.12.jar "$@"

sbt.sh

@@ -8,7 +8,7 @@ class Plugin extends gitbucket.core.plugin.Plugin {
 
   override val pluginName: String = "Announce Plugin"
 
-  override val description: String = "Allows to handle announces for gitbucket"
+  override val description: String = "Provide announces for gitbucket users and groups"
 
   override val versions: List[Version] = List(
     new Version("1.0.0")
@@ -17,6 +17,7 @@ class Plugin extends gitbucket.core.plugin.Plugin {
     , new Version("1.3.0")
     , new Version("1.4.0")
     , new Version("1.5.0")
+    , new Version("1.6.0")
   )
 
   override val systemSettingMenus: Seq[(Context) => Option[Link]] = Seq(

src/main/scala/Plugin.scala

@@ -1,24 +1,19 @@
 package fr.brouillard.gitbucket.announce.controller
 
+import javax.mail.SendFailedException
+
+import com.github.takezoe.slick.blocking.BlockingH2Driver.blockingApi._
 import fr.brouillard.gitbucket.announce.html
 import gitbucket.core.controller.ControllerBase
+import gitbucket.core.model.Account
+import gitbucket.core.model.Profile._
 import gitbucket.core.service.{AccountService, SystemSettingsService}
 import gitbucket.core.servlet.Database
 import gitbucket.core.util.AdminAuthenticator
+import io.github.gitbucket.markedj.{Marked, Options}
 import io.github.gitbucket.scalatra.forms._
-import org.apache.commons.mail.{DefaultAuthenticator, HtmlEmail, EmailException}
-import io.github.gitbucket.markedj.Marked
-import io.github.gitbucket.markedj.Options
+import org.apache.commons.mail.{DefaultAuthenticator, EmailException, HtmlEmail}
 import org.slf4j.LoggerFactory
-import gitbucket.core.model.{GroupMember, Account}
-import gitbucket.core.model.Profile._
-import gitbucket.core.util.{StringUtil, LDAPUtil}
-import gitbucket.core.service.SystemSettingsService.SystemSettings
-import profile.simple._
-import StringUtil._
-import org.slf4j.LoggerFactory
-import gitbucket.core.model.Profile.dateColumnType
-import javax.mail.SendFailedException
 
 class AnnounceController extends AnnounceControllerBase
 with AdminAuthenticator