From ed59c4d74aabce287b7aa1d2aeb4400d9f851156 Mon Sep 17 00:00:00 2001
From: Josh Larson <joshlarson2015@gmail.com>
Date: Sat, 25 Jan 2020 15:00:59 -0500
Subject: [PATCH] Changed build script to kotlin's DSL

---
 build.gradle        | 26 --------------------------
 build.gradle.kts    | 39 +++++++++++++++++++++++++++++++++++++++
 settings.gradle     |  2 --
 settings.gradle.kts |  1 +
 4 files changed, 40 insertions(+), 28 deletions(-)
 delete mode 100644 build.gradle
 create mode 100644 build.gradle.kts
 delete mode 100644 settings.gradle
 create mode 100644 settings.gradle.kts

diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 6abbd7a..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-plugins {
-    id 'java'
-	id "org.javamodularity.moduleplugin"
-	id 'org.jetbrains.kotlin.jvm'
-}
-
-sourceCompatibility = 12
-
-repositories {
-	mavenLocal()
-	jcenter()
-}
-
-dependencies {
-	compile project(':pswgcommon')
-	compile project(':client-holocore')
-	compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.3.50'
-	
-	testCompile 'junit:junit:4.12'
-}
-
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-    kotlinOptions {
-		jvmTarget = "12"
-	}
-}
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..fb43b00
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,39 @@
+plugins {
+	idea
+	java
+	id("org.javamodularity.moduleplugin")
+	kotlin("jvm")
+}
+
+idea {
+	targetVersion = "12.0.1"
+    module {
+        inheritOutputDirs = true
+    }
+}
+
+repositories {
+	mavenLocal()
+	jcenter()
+}
+
+sourceSets {
+	main {
+		dependencies {
+			implementation(project(":pswgcommon"))
+			implementation(project(":client-holocore"))
+			implementation(kotlin("stdlib"))
+		}
+	}
+	test {
+		dependencies {
+			implementation(group="junit", name="junit", version="4.12")
+		}
+	}
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+	kotlinOptions {
+		jvmTarget = "12"
+	}
+}
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 210dd03..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-include ':pswgcommon'
-include ':client-holocore'
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..05ac5c0
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1 @@
+include(":pswgcommon", ":client-holocore")