From 59a458630b6dc71077521324b3757a4046171e12 Mon Sep 17 00:00:00 2001 From: Thanh Le Date: Mon, 6 May 2024 15:38:59 +0700 Subject: [PATCH] Clean up build definition --- app/{ => src/main/scala}/AppLoader.scala | 0 app/{ => src/main/scala}/Chronometer.scala | 0 app/{ => src/main/scala}/ESClient.scala | 0 app/{ => src/main/scala}/Query.scala | 0 app/{ => src/main/scala}/Range.scala | 0 app/{ => src/main/scala}/Which.scala | 0 .../main/scala}/controllers/WebApi.scala | 0 app/{ => src/main/scala}/forum.scala | 0 app/{ => src/main/scala}/game.scala | 0 app/{ => src/main/scala}/model.scala | 0 app/{ => src/main/scala}/package.scala | 0 app/{ => src/main/scala}/study.scala | 0 app/{ => src/main/scala}/team.scala | 0 build.sbt | 125 ++++++++++-------- public/images/favicon.png | Bin 687 -> 0 bytes public/javascripts/hello.js | 3 - public/stylesheets/main.css | 0 17 files changed, 67 insertions(+), 61 deletions(-) rename app/{ => src/main/scala}/AppLoader.scala (100%) rename app/{ => src/main/scala}/Chronometer.scala (100%) rename app/{ => src/main/scala}/ESClient.scala (100%) rename app/{ => src/main/scala}/Query.scala (100%) rename app/{ => src/main/scala}/Range.scala (100%) rename app/{ => src/main/scala}/Which.scala (100%) rename app/{ => src/main/scala}/controllers/WebApi.scala (100%) rename app/{ => src/main/scala}/forum.scala (100%) rename app/{ => src/main/scala}/game.scala (100%) rename app/{ => src/main/scala}/model.scala (100%) rename app/{ => src/main/scala}/package.scala (100%) rename app/{ => src/main/scala}/study.scala (100%) rename app/{ => src/main/scala}/team.scala (100%) delete mode 100644 public/images/favicon.png delete mode 100644 public/javascripts/hello.js delete mode 100644 public/stylesheets/main.css diff --git a/app/AppLoader.scala b/app/src/main/scala/AppLoader.scala similarity index 100% rename from app/AppLoader.scala rename to app/src/main/scala/AppLoader.scala diff --git a/app/Chronometer.scala b/app/src/main/scala/Chronometer.scala similarity index 100% rename from app/Chronometer.scala rename to app/src/main/scala/Chronometer.scala diff --git a/app/ESClient.scala b/app/src/main/scala/ESClient.scala similarity index 100% rename from app/ESClient.scala rename to app/src/main/scala/ESClient.scala diff --git a/app/Query.scala b/app/src/main/scala/Query.scala similarity index 100% rename from app/Query.scala rename to app/src/main/scala/Query.scala diff --git a/app/Range.scala b/app/src/main/scala/Range.scala similarity index 100% rename from app/Range.scala rename to app/src/main/scala/Range.scala diff --git a/app/Which.scala b/app/src/main/scala/Which.scala similarity index 100% rename from app/Which.scala rename to app/src/main/scala/Which.scala diff --git a/app/controllers/WebApi.scala b/app/src/main/scala/controllers/WebApi.scala similarity index 100% rename from app/controllers/WebApi.scala rename to app/src/main/scala/controllers/WebApi.scala diff --git a/app/forum.scala b/app/src/main/scala/forum.scala similarity index 100% rename from app/forum.scala rename to app/src/main/scala/forum.scala diff --git a/app/game.scala b/app/src/main/scala/game.scala similarity index 100% rename from app/game.scala rename to app/src/main/scala/game.scala diff --git a/app/model.scala b/app/src/main/scala/model.scala similarity index 100% rename from app/model.scala rename to app/src/main/scala/model.scala diff --git a/app/package.scala b/app/src/main/scala/package.scala similarity index 100% rename from app/package.scala rename to app/src/main/scala/package.scala diff --git a/app/study.scala b/app/src/main/scala/study.scala similarity index 100% rename from app/study.scala rename to app/src/main/scala/study.scala diff --git a/app/team.scala b/app/src/main/scala/team.scala similarity index 100% rename from app/team.scala rename to app/src/main/scala/team.scala diff --git a/build.sbt b/build.sbt index 77b7a633..fb4258ab 100644 --- a/build.sbt +++ b/build.sbt @@ -1,65 +1,74 @@ -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", + 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 deleted file mode 100644 index c7d92d2ae47434d9a61c90bc205e099b673b9dd5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 687 zcmV;g0#N;lP)ezT{T_ZJ?}AL z5NC{NW(ESID=>(O3&Eg8 zmA9J&6c`h4_f6L;=bU>_H8aNG`kfvCj9zomNt)?O;rzWqZs0LEt%1WB218%1fo9uB zsW^yhBR7C(mqN%GEK9&msg0~ zWY?#bf4q8G-~2KttQZ($odJvy&_-~f?9*ThK@fwR$U^1)p*8=_+^3BXx0$i1BC8XC zr21u6D5nVK&^!dOAw&|1E;qC3uFNj3*Jj#&%Oje@0D-nhfmM*o%^5f}-pxQ07(95H z3|LoV>V19w#rLgmRmtVy9!T3M3FUE3><0T8&b3yEsWcLW`0(=1+qsqc(k(ymBLK0h zK!6(6$7MX~M`-QA2$wk7n(7hhkJ}4Rwi-Vd(_ZFX1Yk7TXuB0IJYpo@kLb2G8m)E{ z`9v=!hi}fOytKckfN^C@6+Z*+MVI9-W_p@_3yyR#UYc0FTpD}i#k>c!wYCS)4v@E$ zchZCo=zV@)`v^$;V18ixdjFMY#q^2$wEX%{f(XD8POnsn$bpbClpC@hPxjzyO>pY|*pF3UU2tYcCN?rUk{Sskej70Mmu9vPwMYhO1m{AxAt(zqDT|0jP7FaX=6 V`?~}E4H^Id002ovPDHLkV1hC)G==~G diff --git a/public/javascripts/hello.js b/public/javascripts/hello.js deleted file mode 100644 index 209fbee5..00000000 --- a/public/javascripts/hello.js +++ /dev/null @@ -1,3 +0,0 @@ -if (window.console) { - console.log("Welcome to your Play application's JavaScript!"); -} \ No newline at end of file diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css deleted file mode 100644 index e69de29b..00000000