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.

Sign up for GitHub

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 Scalatra 2.6 & Scala 2.12.4 #16

Merged
merged 1 commit into from
Dec 7, 2017
Merged

Bump to Scalatra 2.6 & Scala 2.12.4 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/fr/brouillard/gitbucket/announce/controller/AnnounceController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down