web: extract to a separate module

Author: ForNeVeR

README.md

@@ -34,10 +34,10 @@ All configuration data is stored in the `config.edn` file.
 
 ### Running
 
-To start the game server web interface, run the following command in your shell:
+To start the game server web interface, run the following shell command:
 
 ```console
-$ ./gradlew run --args swagger
+$ ./gradlew web:run
 ```
 
 To start the socket server (deprecated), run the following shell command:

build.gradle.kts

@@ -1,72 +1,5 @@
-import com.stehno.gradle.natives.ext.Platform
-import dev.clojurephant.plugin.clojure.tasks.ClojureSourceSet
-import org.gradle.api.internal.HasConvention // clojurephant still depends on conventions
-
 plugins {
-    application
-    id("dev.clojurephant.clojure") version "0.6.0"
+    id("dev.clojurephant.clojure") version "0.6.0" apply false
     id("dev.clojurephant.clojurescript") version "0.6.0" apply false
     id("com.stehno.natives") version "0.3.1" apply false
 }
-
-// Dependencies
-repositories {
-    mavenCentral()
-    maven {
-        name = "clojars"
-        url = uri("https://repo.clojars.org")
-    }
-}
-
-dependencies {
-    implementation("clj-liquibase:clj-liquibase:0.5.2")
-    implementation("clj-tuple:clj-tuple:0.2.2")
-    implementation("com.h2database:h2:1.3.173")
-    implementation("crypto-password:crypto-password:0.1.3")
-    implementation("crypto-random:crypto-random:1.2.0")
-    implementation("log4j:log4j:1.2.17")
-    implementation("metosin:compojure-api:0.16.0")
-    implementation("metosin:ring-http-response:0.5.0")
-    implementation("metosin:ring-swagger-ui:2.0.17")
-    implementation("metosin:ring-swagger:0.13.0")
-    implementation("org.clojure:clojure-contrib:1.2.0")
-    implementation("org.clojure:clojure:1.10.3")
-    implementation("org.clojure:data.json:0.2.2")
-    implementation("org.clojure:tools.logging:0.2.3")
-    implementation("org.flatland:ordered:1.5.7")
-    implementation("org.lwjgl.lwjgl:lwjgl:2.9.1")
-    implementation(project("core"))
-    implementation(project("server"))
-    testRuntimeOnly("org.ajoberstar:jovial:0.3.0")
-}
-
-// Compilation
-val hyperspaceMainClass = "hyperspace.main"
-version = "1.0.0-SNAPSHOT"
-
-@Suppress("DEPRECATION") // clojurephant still depends on conventions
-val SourceSet.clojure: SourceDirectorySet
-    get() = (this as HasConvention).convention.getPlugin<ClojureSourceSet>().clojure
-
-sourceSets {
-    main {
-        clojure.srcDir("src")
-    }
-    test {
-        clojure.srcDir("test")
-    }
-}
-
-clojure.builds.named("main") {
-    aotAll()
-}
-
-// Testing
-tasks.withType<Test> {
-    useJUnitPlatform()
-}
-
-// Running
-application {
-    mainClass.set(hyperspaceMainClass)
-}

settings.gradle.kts

@@ -1,2 +1,2 @@
 rootProject.name = "hyperspace"
-include("client", "core", "server", "web:frontend")
+include("client", "core", "server", "web", "web:frontend")

src/hyperspace/main.clj

@@ -0,0 +1,42 @@
+plugins {
+    application
+    id("dev.clojurephant.clojure")
+}
+
+// Dependencies
+repositories {
+    mavenCentral()
+    maven {
+        name = "clojars"
+        url = uri("https://repo.clojars.org")
+    }
+}
+
+dependencies {
+    implementation("clj-liquibase:clj-liquibase:0.5.2")
+    implementation("clj-tuple:clj-tuple:0.2.2")
+    implementation("com.h2database:h2:1.3.173")
+    implementation("crypto-password:crypto-password:0.1.3")
+    implementation("crypto-random:crypto-random:1.2.0")
+    implementation("log4j:log4j:1.2.17")
+    implementation("metosin:compojure-api:0.16.0")
+    implementation("metosin:ring-http-response:0.5.0")
+    implementation("metosin:ring-swagger-ui:2.0.17")
+    implementation("metosin:ring-swagger:0.13.0")
+    implementation("org.clojure:clojure:1.10.3")
+    implementation("org.flatland:ordered:1.5.7")
+    implementation(project(":server"))
+}
+
+// Compilation
+val hyperspaceMainClass = "hyperspace.web.main"
+version = "1.0.0-SNAPSHOT"
+
+clojure.builds.named("main") {
+    aotAll()
+}
+
+// Running
+application {
+    mainClass.set(hyperspaceMainClass)
+}

web/build.gradle.kts

@@ -0,0 +1,6 @@
+(ns hyperspace.web.main
+  (:require [hyperspace.swagger.server :as swagger])
+  (:gen-class))
+
+(defn -main []
+  (swagger/start))