From d498de147e729849f49eb919c3e0901e7c43c724 Mon Sep 17 00:00:00 2001 From: hikaruworld Date: Thu, 7 Dec 2017 20:33:43 +0900 Subject: [PATCH] Bump to Scalatra 2.6 & Scala 2.12.4 --- build.sbt | 4 ++-- .../gitbucket/announce/controller/AnnounceController.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 9fbda86..09d6f3f 100644 --- a/build.sbt +++ b/build.sbt @@ -7,10 +7,10 @@ lazy val root = (project in file(".")).enablePlugins(SbtTwirl) organization := Organization name := ProjectName version := ProjectVersion -scalaVersion := "2.12.2" +scalaVersion := "2.12.4" libraryDependencies ++= Seq( - "io.github.gitbucket" %% "gitbucket" % "4.17.0" % "provided", + "io.github.gitbucket" %% "gitbucket" % "4.19.0" % "provided", "io.github.gitbucket" % "solidbase" % "1.0.2" % "provided", "com.typesafe.play" %% "twirl-compiler" % "1.3.0" % "provided", "org.apache.commons" % "commons-email" % "1.4" % "provided", diff --git a/src/main/scala/fr/brouillard/gitbucket/announce/controller/AnnounceController.scala b/src/main/scala/fr/brouillard/gitbucket/announce/controller/AnnounceController.scala index cfe94cb..5f5b4b6 100644 --- a/src/main/scala/fr/brouillard/gitbucket/announce/controller/AnnounceController.scala +++ b/src/main/scala/fr/brouillard/gitbucket/announce/controller/AnnounceController.scala @@ -8,7 +8,7 @@ import gitbucket.core.controller.ControllerBase import gitbucket.core.service.{AccountService, SystemSettingsService} import gitbucket.core.util.{AdminAuthenticator, Mailer} import io.github.gitbucket.markedj.{Marked, Options} -import io.github.gitbucket.scalatra.forms._ +import org.scalatra.forms._ import org.apache.commons.mail.EmailException import org.slf4j.LoggerFactory import gitbucket.core.util.Implicits._