use gradle

measuresforjustice · Mar 5, 2019 · 2fcf8f8 · 2fcf8f8
1 parent 148ef25
commit 2fcf8f8
Show file tree

Hide file tree

Showing 16 changed files with 70 additions and 183 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
-target/
+build/
+out/
+.gradle
 .idea/
 *.iml
 .DS_Store
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -0,0 +1,9 @@
+plugins {
+  base
+  kotlin("jvm") version "1.3.21"
+}
+
+allprojects {
+  group = "io.mfj"
+  version = "1.0-SNAPSHOT"
+}
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -0,0 +1,9 @@
+plugins {
+  kotlin("jvm")
+}
+
+dependencies {
+  implementation(kotlin("stdlib-jdk8"))
+  compile("org.slf4j:slf4j-api:1.7.21")
+  compile("org.slf4j:slf4j-simple:1.7.21")
+}
diff --git a/.../mfj/kotlinnight/library/web/Inventory.kt → ...a/io/mfj/kotlinnight/library/Inventory.kt b/.../mfj/kotlinnight/library/web/Inventory.kt → ...a/io/mfj/kotlinnight/library/Inventory.kt
@@ -1,6 +1,4 @@
-package io.mfj.kotlinnight.library.web
-
-import io.mfj.kotlinnight.library.*
+package io.mfj.kotlinnight.library
 
 import java.time.LocalDate
 

diff --git a/.../kotlinnight/library/web/InventoryImpl.kt → .../mfj/kotlinnight/library/InventoryImpl.kt b/.../kotlinnight/library/web/InventoryImpl.kt → .../mfj/kotlinnight/library/InventoryImpl.kt
@@ -1,6 +1,4 @@
-package io.mfj.kotlinnight.library.web
-
-import io.mfj.kotlinnight.library.*
+package io.mfj.kotlinnight.library
 
 import kotlin.concurrent.thread
 

diff --git a/.../java/io/mfj/kotlinnight/library/Model.kt → .../java/io/mfj/kotlinnight/library/Model.kt b/.../java/io/mfj/kotlinnight/library/Model.kt → .../java/io/mfj/kotlinnight/library/Model.kt
diff --git a/pom.xml b/pom.xml
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -0,0 +1,4 @@
+rootProject.name = "kotlinnight"
+include("common")
+include("web-javalin")
+include("web-ktor")
diff --git a/web-javalin/build.gradle.kts b/web-javalin/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+  application
+  kotlin("jvm")
+}
+
+dependencies {
+  implementation(kotlin("stdlib-jdk8"))
+  compile(project(":common"))
+  compile("org.slf4j:slf4j-api:1.7.21")
+  compile("org.slf4j:slf4j-simple:1.7.21")
+  compile("io.javalin:javalin:2.6.0")
+  compile("com.fasterxml.jackson.module:jackson-module-kotlin:2.9.8")
+}
diff --git a/...innight/library/web/javalin/Controller.kt → ...innight/library/web/javalin/Controller.kt b/...innight/library/web/javalin/Controller.kt → ...innight/library/web/javalin/Controller.kt
diff --git a/...innight/library/web/javalin/JavalinApp.kt → ...innight/library/web/javalin/JavalinApp.kt b/...innight/library/web/javalin/JavalinApp.kt → ...innight/library/web/javalin/JavalinApp.kt
@@ -1,7 +1,6 @@
 package io.mfj.kotlinnight.library.web.javalin
 
-import io.mfj.kotlinnight.library.web.Inventory
-import io.mfj.kotlinnight.library.web.InventoryImpl
+import io.mfj.kotlinnight.library.*
 
 import java.time.LocalDate
 

diff --git a/src/main/resources/static/index.html → ...alin/src/main/resources/static/index.html b/src/main/resources/static/index.html → ...alin/src/main/resources/static/index.html
diff --git a/web-ktor/build.gradle.kts b/web-ktor/build.gradle.kts
@@ -0,0 +1,15 @@
+plugins {
+  application
+  kotlin("jvm")
+}
+
+dependencies {
+  implementation(kotlin("stdlib-jdk8"))
+  compile(project(":common"))
+  compile("org.slf4j:slf4j-api:1.7.21")
+  compile("org.slf4j:slf4j-simple:1.7.21")
+  compile("com.fasterxml.jackson.module:jackson-module-kotlin:2.9.8")
+  compile("io.ktor:ktor-server-core:1.1.2")
+  compile("io.ktor:ktor-server-jetty:1.1.2")
+  compile("io.ktor:ktor-jackson:1.1.2")
+}
diff --git a/...otlinnight/library/web/ktor/Controller.kt → ...otlinnight/library/web/ktor/Controller.kt b/...otlinnight/library/web/ktor/Controller.kt → ...otlinnight/library/web/ktor/Controller.kt
@@ -1,6 +1,6 @@
 package io.mfj.kotlinnight.library.web.ktor
 
-import io.mfj.kotlinnight.library.Checkout
+import io.mfj.kotlinnight.library.*
 
 import io.ktor.application.ApplicationCall
 import io.ktor.application.call

diff --git a/...j/kotlinnight/library/web/ktor/KtorApp.kt → ...j/kotlinnight/library/web/ktor/KtorApp.kt b/...j/kotlinnight/library/web/ktor/KtorApp.kt → ...j/kotlinnight/library/web/ktor/KtorApp.kt
@@ -1,12 +1,12 @@
 package io.mfj.kotlinnight.library.web.ktor
 
-import io.mfj.kotlinnight.library.web.Inventory
-import io.mfj.kotlinnight.library.web.InventoryImpl
+import io.mfj.kotlinnight.library.*
 
 import java.time.LocalDate
 
 import io.ktor.application.*
 import io.ktor.features.*
+import io.ktor.http.content.*
 import io.ktor.jackson.jackson
 import io.ktor.response.*
 import io.ktor.routing.*
@@ -38,6 +38,11 @@ object KtorApp {
 
 			routing {
 
+				static("/") {
+					staticBasePackage = "static"
+					defaultResource("index.html")
+				}
+
 				get("/title/") {
 					call.respond( inventory.getTitles() )
 				}
@@ -78,7 +83,7 @@ object KtorApp {
 				put("/checkin", Controller.checkin)
 			}
 
-		}
+		}.start(wait=true)
 
 	}
 }

diff --git a/web-ktor/src/main/resources/static/index.html b/web-ktor/src/main/resources/static/index.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p>Hello world!</p>
+</body>
+</html>