summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backend/build.gradle46
-rw-r--r--backend/build.gradle.kts46
-rw-r--r--game-engine/build.gradle16
-rw-r--r--game-engine/build.gradle.kts15
4 files changed, 61 insertions, 62 deletions
diff --git a/backend/build.gradle b/backend/build.gradle
deleted file mode 100644
index a4f0dab5..00000000
--- a/backend/build.gradle
+++ /dev/null
@@ -1,46 +0,0 @@
-plugins {
- id 'org.jetbrains.kotlin.jvm' version '1.3.21'
- id 'org.jetbrains.kotlin.plugin.spring' version '1.3.21'
- id 'org.springframework.boot' version '2.1.3.RELEASE'
- id "org.jlleitschuh.gradle.ktlint" version "7.1.0"
-}
-
-apply plugin: 'io.spring.dependency-management'
-
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
- kotlinOptions {
- jvmTarget = "1.8"
- }
-}
-
-dependencies {
- compile project(':game-engine')
- compile 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
- compile 'org.jetbrains.kotlin:kotlin-reflect' // required by Spring 5
-
- compile 'org.springframework.boot:spring-boot-starter-websocket'
- compile 'org.springframework.boot:spring-boot-starter-security'
- // required by spring security when using websockets
- compile 'org.springframework.security:spring-security-messaging'
-
- compile "com.fasterxml.jackson.module:jackson-module-kotlin"
-
- compile 'ch.qos.logback:logback-classic:1.1.8'
- compile 'org.hildan.livedoc:livedoc-springboot:4.3.2'
- compile 'org.hildan.livedoc:livedoc-ui-webjar:4.3.2'
-
- annotationProcessor 'org.hildan.livedoc:livedoc-javadoc-processor:4.3.2'
-
- testCompile 'org.springframework.boot:spring-boot-starter-test'
- testCompile 'org.hildan.jackstomp:jackstomp:2.0.0'
-}
-
-// packages the frontend app within the jar
-jar {
- from('../frontend/build') {
- into 'static'
- }
-}
-
-// make sure we build the frontend before creating the jar
-jar.dependsOn(':frontend:assemble')
diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
new file mode 100644
index 00000000..e377cd5c
--- /dev/null
+++ b/backend/build.gradle.kts
@@ -0,0 +1,46 @@
+plugins {
+ id("org.jetbrains.kotlin.jvm") version "1.3.21"
+ id("org.jetbrains.kotlin.plugin.spring") version "1.3.21"
+ id("org.springframework.boot") version "2.1.3.RELEASE"
+ id("org.jlleitschuh.gradle.ktlint") version "7.1.0"
+}
+
+apply(plugin = "io.spring.dependency-management")
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+ kotlinOptions.jvmTarget = "1.8"
+}
+
+dependencies {
+ compile(project(":game-engine"))
+ compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+ compile("org.jetbrains.kotlin:kotlin-reflect") // required by Spring 5
+
+ compile("org.springframework.boot:spring-boot-starter-websocket")
+ compile("org.springframework.boot:spring-boot-starter-security")
+ // required by spring security when using websockets
+ compile("org.springframework.security:spring-security-messaging")
+
+ compile("com.fasterxml.jackson.module:jackson-module-kotlin")
+
+ compile("ch.qos.logback:logback-classic:1.1.8")
+ compile("org.hildan.livedoc:livedoc-springboot:4.3.2")
+ compile("org.hildan.livedoc:livedoc-ui-webjar:4.3.2")
+
+ annotationProcessor("org.hildan.livedoc:livedoc-javadoc-processor:4.3.2")
+
+ testImplementation(kotlin("test"))
+ testImplementation(kotlin("test-junit"))
+ testImplementation("org.springframework.boot:spring-boot-starter-test")
+ testImplementation("org.hildan.jackstomp:jackstomp:2.0.0")
+}
+
+// packages the frontend app within the jar
+tasks.jar {
+ from("../frontend/build") {
+ into("static")
+ }
+}
+
+// make sure we build the frontend before creating the jar
+tasks.jar.get().dependsOn(":frontend:assemble")
diff --git a/game-engine/build.gradle b/game-engine/build.gradle
deleted file mode 100644
index b61b884e..00000000
--- a/game-engine/build.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-plugins {
- id "org.jetbrains.kotlin.jvm" version "1.3.21"
- id "org.jlleitschuh.gradle.ktlint" version "7.1.0"
-}
-
-dependencies {
- implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
- implementation 'com.github.salomonbrys.kotson:kotson:2.5.0'
- testImplementation 'junit:junit:4.12'
-}
-
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
- kotlinOptions {
- jvmTarget = "1.8"
- }
-}
diff --git a/game-engine/build.gradle.kts b/game-engine/build.gradle.kts
new file mode 100644
index 00000000..a3a748f2
--- /dev/null
+++ b/game-engine/build.gradle.kts
@@ -0,0 +1,15 @@
+plugins {
+ id("org.jetbrains.kotlin.jvm") version "1.3.21"
+ id("org.jlleitschuh.gradle.ktlint") version "7.1.0"
+}
+
+dependencies {
+ implementation(kotlin("stdlib-jdk8"))
+ implementation("com.github.salomonbrys.kotson:kotson:2.5.0")
+ testImplementation(kotlin("test"))
+ testImplementation(kotlin("test-junit"))
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+ kotlinOptions.jvmTarget = "1.8"
+}
bgstack15