update sbt syntax

pull/8606/head
Thibault Duplessis 2021-04-09 09:15:28 +02:00
parent 035aba14e2
commit 0c36b07cc1
2 changed files with 12 additions and 11 deletions

View File

@ -13,7 +13,7 @@ lazy val root = Project("lila", file("."))
// shorter prod classpath
scriptClasspath := Seq("*")
maintainer := "contact@lichess.org"
resourceDirectory in Compile := baseDirectory.value / "conf"
Compile / resourceDirectory := baseDirectory.value / "conf"
// format: off
libraryDependencies ++= akka.bundle ++ playWs.bundle ++ Seq(
@ -48,20 +48,20 @@ lazy val api = module("api",
moduleCPDeps,
Seq(play.api, play.json, hasher, kamon.core, kamon.influxdb, lettuce, specs2) ++ reactivemongo.bundle
).settings(
aggregate in Runtime := false,
aggregate in Test := true // Test <: Runtime
Runtime / aggregate := false,
Test / aggregate := true // Test <: Runtime
) aggregate (moduleRefs: _*)
lazy val i18n = smallModule("i18n",
Seq(common, db, hub),
Seq(scalatags, specs2)
).settings(
sourceGenerators in Compile += Def.task {
Compile / sourceGenerators += Def.task {
MessageCompiler(
sourceDir = new File("translation/source"),
destDir = new File("translation/dest"),
dbs = "site arena emails learn activity coordinates study class contact patron coach broadcast streamer tfa settings preferences team perfStat search tourname faq lag swiss puzzle puzzleTheme challenge storm".split(' ').toList,
compileTo = (sourceManaged in Compile).value
compileTo = (Compile / sourceManaged).value
)
}.taskValue
)

View File

@ -20,11 +20,12 @@ object BuildSettings {
scalaVersion := globalScalaVersion,
scalacOptions ++= compilerOptions,
// No bloop project for tests
bloopGenerate in Test := None,
Test / bloopGenerate := None,
// disable publishing doc and sources
sources in (Compile, doc) := Seq.empty,
publishArtifact in (Compile, packageDoc) := false,
publishArtifact in (Compile, packageSrc) := false,
Compile / sources := Seq.empty,
doc / sources := Seq.empty,
packageDoc / publishArtifact := false,
Compile / publishArtifact := false,
javaOptions ++= Seq("-Xms64m", "-Xmx256m")
)
@ -98,8 +99,8 @@ object BuildSettings {
)
val srcMain = Seq(
scalaSource in Compile := (sourceDirectory in Compile).value,
scalaSource in Test := (sourceDirectory in Test).value
Compile / scalaSource := (Compile / sourceDirectory).value,
Test / scalaSource := (Test / sourceDirectory).value
)
def projectToRef(p: Project): ProjectReference = LocalProject(p.id)