upgrade scala & playframework

pull/7644/head
Thibault Duplessis 2020-11-25 22:10:39 +01:00
parent 9745cb9553
commit 8deb498765
4 changed files with 5 additions and 4 deletions

View File

@ -56,7 +56,8 @@ final class LilaComponents(ctx: ApplicationLoader.Context) extends BuiltInCompon
)
implicit def system = actorSystem
implicit lazy val ws: StandaloneWSClient = {
implicit lazy val httpClient: StandaloneWSClient = {
import play.shaded.ahc.org.asynchttpclient.DefaultAsyncHttpClient
import play.api.libs.ws.WSConfigParser
import play.api.libs.ws.ahc.{ AhcConfigBuilder, AhcWSClientConfigParser, StandaloneAhcWSClient }

View File

@ -7,7 +7,7 @@ object BuildSettings {
import Dependencies._
val lilaVersion = "3.2"
val globalScalaVersion = "2.13.3"
val globalScalaVersion = "2.13.4"
val useEpoll = sys.props.get("epoll").fold(false)(_.toBoolean)
if (useEpoll) println("--- epoll build ---")

View File

@ -51,7 +51,7 @@ object Dependencies {
}
object play {
val version = "2.8.2-lila_1.4"
val version = "2.8.5-lila_1.5"
val api = "com.typesafe.play" %% "play" % version
val json = "com.typesafe.play" %% "play-json" % "2.9.1"
}

View File

@ -2,6 +2,6 @@ resolvers += Resolver.url(
"lila-maven-sbt",
url("https://raw.githubusercontent.com/ornicar/lila-maven/master")
)(Resolver.ivyStylePatterns)
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2-lila_1.4")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.5-lila_1.5")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.5")