Introduce core module for logic

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

Hide file tree

Showing 11 changed files with 58 additions and 43 deletions.
diff --git a/build.sbt b/build.sbt
@@ -12,65 +12,80 @@ inThisBuild(
   )
 )
 
+val commonSettings = Seq(
+  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" */
+    )
+)
+
+lazy val core = project
+  .in(file("core"))
+  .settings(
+    commonSettings,
+    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"
+    )
+  )
+
+
 lazy val app = project
   .in(file("app"))
   .enablePlugins(PlayScala)
   .disablePlugins(PlayFilters)
   .settings(
-    name         := "lila-search",
-    organization := "org.lichess",
-    name := "lila-search",
+    commonSettings,
+    name         := "core",
     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" */
-    ),
-
     // Play provides two styles of routers, one expects its actions to be injected, the
     // other, legacy style, accesses its actions statically.
     routesGenerator := InjectedRoutesGenerator
-  )
+  ).dependsOn(core)
 
 
 lazy val root = project
   .in(file("."))
-  .aggregate(app)
+  .aggregate(core, app)
 
diff --git a/app/app/src/main/scala/ESClient.scala → core/src/main/scala/ESClient.scala b/app/app/src/main/scala/ESClient.scala → core/src/main/scala/ESClient.scala
diff --git a/app/app/src/main/scala/Query.scala → core/src/main/scala/Query.scala b/app/app/src/main/scala/Query.scala → core/src/main/scala/Query.scala
diff --git a/app/app/src/main/scala/Range.scala → core/src/main/scala/Range.scala b/app/app/src/main/scala/Range.scala → core/src/main/scala/Range.scala
diff --git a/app/app/src/main/scala/Which.scala → core/src/main/scala/Which.scala b/app/app/src/main/scala/Which.scala → core/src/main/scala/Which.scala
diff --git a/app/app/src/main/scala/forum.scala → core/src/main/scala/forum.scala b/app/app/src/main/scala/forum.scala → core/src/main/scala/forum.scala
diff --git a/app/app/src/main/scala/game.scala → core/src/main/scala/game.scala b/app/app/src/main/scala/game.scala → core/src/main/scala/game.scala
diff --git a/app/app/src/main/scala/model.scala → core/src/main/scala/model.scala b/app/app/src/main/scala/model.scala → core/src/main/scala/model.scala
diff --git a/app/app/src/main/scala/package.scala → core/src/main/scala/package.scala b/app/app/src/main/scala/package.scala → core/src/main/scala/package.scala
diff --git a/app/app/src/main/scala/study.scala → core/src/main/scala/study.scala b/app/app/src/main/scala/study.scala → core/src/main/scala/study.scala
diff --git a/app/app/src/main/scala/team.scala → core/src/main/scala/team.scala b/app/app/src/main/scala/team.scala → core/src/main/scala/team.scala