Clean up build definition

lichess-org · May 6, 2024 · c8c7952 · c8c7952
1 parent c611a7d
commit c8c7952
Show file tree

Hide file tree

Showing 20 changed files with 69 additions and 61 deletions.
diff --git a/app/AppLoader.scala → app/app/src/main/scala/AppLoader.scala b/app/AppLoader.scala → app/app/src/main/scala/AppLoader.scala
diff --git a/app/Chronometer.scala → app/app/src/main/scala/Chronometer.scala b/app/Chronometer.scala → app/app/src/main/scala/Chronometer.scala
diff --git a/app/ESClient.scala → app/app/src/main/scala/ESClient.scala b/app/ESClient.scala → app/app/src/main/scala/ESClient.scala
diff --git a/app/Query.scala → app/app/src/main/scala/Query.scala b/app/Query.scala → app/app/src/main/scala/Query.scala
diff --git a/app/Range.scala → app/app/src/main/scala/Range.scala b/app/Range.scala → app/app/src/main/scala/Range.scala
diff --git a/app/Which.scala → app/app/src/main/scala/Which.scala b/app/Which.scala → app/app/src/main/scala/Which.scala
diff --git a/app/controllers/WebApi.scala → ...p/src/main/scala/controllers/WebApi.scala b/app/controllers/WebApi.scala → ...p/src/main/scala/controllers/WebApi.scala
diff --git a/app/forum.scala → app/app/src/main/scala/forum.scala b/app/forum.scala → app/app/src/main/scala/forum.scala
diff --git a/app/game.scala → app/app/src/main/scala/game.scala b/app/game.scala → app/app/src/main/scala/game.scala
diff --git a/app/model.scala → app/app/src/main/scala/model.scala b/app/model.scala → app/app/src/main/scala/model.scala
diff --git a/app/package.scala → app/app/src/main/scala/package.scala b/app/package.scala → app/app/src/main/scala/package.scala
diff --git a/app/study.scala → app/app/src/main/scala/study.scala b/app/study.scala → app/app/src/main/scala/study.scala
diff --git a/app/team.scala → app/app/src/main/scala/team.scala b/app/team.scala → app/app/src/main/scala/team.scala
diff --git a/conf/application.conf → app/conf/application.conf b/conf/application.conf → app/conf/application.conf
diff --git a/conf/logback.xml → app/conf/logback.xml b/conf/logback.xml → app/conf/logback.xml
diff --git a/conf/routes → app/conf/routes b/conf/routes → app/conf/routes
diff --git a/build.sbt b/build.sbt
@@ -1,65 +1,76 @@
-name := "lila-search"
-
-version := "2.0"
-
-scalaVersion := "2.13.14"
+inThisBuild(
+  Seq(
+    scalaVersion  := "2.13.14",
+    versionScheme := Some("early-semver"),
+    version       := "3.0.0-SNAPSHOT",
+    run / fork    := true,
+    run / javaOptions += "-Dconfig.override_with_env_vars=true",
+    Compile / doc / sources                := Seq.empty,
+    Compile / packageDoc / publishArtifact := false,
+    Compile / packageSrc / publishArtifact := false,
+    resolvers += "lila-maven" at "https://raw.githubusercontent.com/ornicar/lila-maven/master"
+  )
+)
 
-lazy val `lila-search` = project
-  .in(file("."))
+lazy val app = project
+  .in(file("app"))
   .enablePlugins(PlayScala)
   .disablePlugins(PlayFilters)
+  .settings(
+    name         := "lila-search",
+    organization := "org.lichess",
+    name := "lila-search",
+    libraryDependencies ++= Seq(
+      "com.github.ornicar"     %% "scalalib"                % "7.1.0",
+      "com.sksamuel.elastic4s" %% "elastic4s-client-esjava" % "7.17.4",
+      "com.typesafe.play"      %% "play-json"               % "2.9.4",
+      "com.typesafe.play"      %% "play-json-joda"          % "2.9.4"
+    ),
+    scalacOptions ++= Seq(
+      "-explaintypes",
+      "-feature",
+      "-language:higherKinds",
+      "-language:implicitConversions",
+      "-language:postfixOps",
+      "-Ymacro-annotations",
+      // Warnings as errors!
+      // "-Xfatal-warnings",
+      // Linting options
+      "-unchecked",
+      "-Xcheckinit",
+      "-Xlint:adapted-args",
+      "-Xlint:constant",
+      "-Xlint:delayedinit-select",
+      "-Xlint:deprecation",
+      "-Xlint:inaccessible",
+      "-Xlint:infer-any",
+      "-Xlint:missing-interpolator",
+      "-Xlint:nullary-unit",
+      "-Xlint:option-implicit",
+      "-Xlint:package-object-classes",
+      "-Xlint:poly-implicit-overload",
+      "-Xlint:private-shadow",
+      "-Xlint:stars-align",
+      "-Xlint:type-parameter-shadow",
+      "-Wdead-code",
+      "-Wextra-implicit",
+      "-Wnumeric-widen",
+      "-Wunused:imports",
+      "-Wunused:locals",
+      "-Wunused:patvars",
+      "-Wunused:privates",
+      "-Wunused:implicits",
+      "-Wunused:params"
+      /* "-Wvalue-discard" */
+    ),
 
-Compile / doc / sources                := Seq.empty
-Compile / packageDoc / publishArtifact := false
-Compile / packageSrc / publishArtifact := false
+    // Play provides two styles of routers, one expects its actions to be injected, the
+    // other, legacy style, accesses its actions statically.
+    routesGenerator := InjectedRoutesGenerator
+  )
 
-scalacOptions ++= Seq(
-  "-explaintypes",
-  "-feature",
-  "-language:higherKinds",
-  "-language:implicitConversions",
-  "-language:postfixOps",
-  "-Ymacro-annotations",
-  // Warnings as errors!
-  // "-Xfatal-warnings",
-  // Linting options
-  "-unchecked",
-  "-Xcheckinit",
-  "-Xlint:adapted-args",
-  "-Xlint:constant",
-  "-Xlint:delayedinit-select",
-  "-Xlint:deprecation",
-  "-Xlint:inaccessible",
-  "-Xlint:infer-any",
-  "-Xlint:missing-interpolator",
-  "-Xlint:nullary-unit",
-  "-Xlint:option-implicit",
-  "-Xlint:package-object-classes",
-  "-Xlint:poly-implicit-overload",
-  "-Xlint:private-shadow",
-  "-Xlint:stars-align",
-  "-Xlint:type-parameter-shadow",
-  "-Wdead-code",
-  "-Wextra-implicit",
-  "-Wnumeric-widen",
-  "-Wunused:imports",
-  "-Wunused:locals",
-  "-Wunused:patvars",
-  "-Wunused:privates",
-  "-Wunused:implicits",
-  "-Wunused:params"
-  /* "-Wvalue-discard" */
-)
-
-libraryDependencies ++= Seq(
-  "com.github.ornicar"     %% "scalalib"                % "7.1.0",
-  "com.sksamuel.elastic4s" %% "elastic4s-client-esjava" % "7.17.4",
-  "com.typesafe.play"      %% "play-json"               % "2.9.4",
-  "com.typesafe.play"      %% "play-json-joda"          % "2.9.4"
-)
 
-resolvers += "lila-maven" at "https://raw.githubusercontent.com/ornicar/lila-maven/master"
+lazy val root = project
+  .in(file("."))
+  .aggregate(app)
 
-// Play provides two styles of routers, one expects its actions to be injected, the
-// other, legacy style, accesses its actions statically.
-routesGenerator := InjectedRoutesGenerator
diff --git a/public/images/favicon.png b/public/images/favicon.png
diff --git a/public/javascripts/hello.js b/public/javascripts/hello.js
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css