diff --git a/app/AppLoader.scala b/app/AppLoader.scala index dfd04bd..9f098f9 100644 --- a/app/AppLoader.scala +++ b/app/AppLoader.scala @@ -2,8 +2,8 @@ package lila.app import play.api._ import scala.annotation.nowarn -import play.api.routing.Router -import router.Routes +import play.api.routing.{ Router, SimpleRouter } +import play.api.routing.sird._ final class AppLoader extends ApplicationLoader { def load(ctx: ApplicationLoader.Context): Application = new LilaComponents(ctx).application @@ -32,9 +32,11 @@ final class LilaComponents(ctx: ApplicationLoader.Context) extends BuiltInCompon lazy val controller = new FishnetController(configuration, redis, moveDb, controllerComponents) // eagerly wire up all controllers - val router: Router = { - @nowarn val prefix: String = "/" - new Routes(httpErrorHandler, controller) + val router: Router = new SimpleRouter { + def routes: Router.Routes = { + case POST(p"/fishnet/acquire") => controller.acquire + case POST(p"/fishnet/move/$workId") => controller.move(workId) + } } if (configuration.get[Boolean]("kamon.enabled")) { diff --git a/build.sbt b/build.sbt index ae2ab8c..0f5a8a7 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,6 @@ maintainer := "lichess.org" lazy val root = Project("lila-fishnet", file(".")) .enablePlugins(PlayScala, PlayNettyServer) - .disablePlugins(PlayAkkaHttpServer) scalaVersion := "2.13.12" Compile / resourceDirectory := baseDirectory.value / "conf" diff --git a/conf/routes b/conf/routes deleted file mode 100644 index f3b11be..0000000 --- a/conf/routes +++ /dev/null @@ -1,2 +0,0 @@ -POST /fishnet/acquire controllers.FishnetController.acquire -POST /fishnet/move/:workId controllers.FishnetController.move(workId: String) diff --git a/project/build.properties b/project/build.properties index 563a014..e8a1e24 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.2 +sbt.version=1.9.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index 02ec024..0a4d179 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,5 +2,5 @@ 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.18") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.18-lila_1.21") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")