From 8cd6a16568eecae0a2775c287006203c299325eb Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 24 Aug 2020 00:09:09 -0700
Subject: [PATCH] Cleaned up.

---
 build.gradle.kts | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 39cdc08..c3e2c3d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,5 @@
 @file:Suppress("MayBeConstant")
 
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
 fun DependencyHandler.impl(vararg dep: Any) = dep.forEach { implementation(it) }
 fun DependencyHandler.testImpl(vararg dep: Any) = dep.forEach { testImplementation(it) }
 
@@ -9,7 +7,6 @@ plugins {
     java
     id("org.jetbrains.kotlin.jvm") version "1.3.72"
     application
-    id("com.github.johnrengelman.shadow") version "5.2.0"
     id("org.openjfx.javafxplugin") version "0.0.8"
 }
 
@@ -19,6 +16,11 @@ repositories {
     maven { setUrl("https://plugins.gradle.org/m2") }
 }
 
+version = 0.3
+group = "com.beust.chip8"
+
+defaultTasks(ApplicationPlugin.TASK_RUN_NAME)
+
 object This {
     val artifactId = "chip8"
 }
@@ -28,26 +30,13 @@ dependencies {
     testImpl(kotlin("test"), "org.testng:testng:7.0.0", "org.assertj:assertj-core:3.10.0")
 }
 
-val test by tasks.getting(Test::class) {
-    useTestNG()
-}
-
 application {
     mainClassName = "com.beust.chip8.MainKt"
 }
 
 tasks {
-    named<ShadowJar>("shadowJar") {
-        archiveBaseName.set(This.artifactId)
-        mergeServiceFiles()
-        manifest {
-            attributes(mapOf(
-                "Implementation-Title" to rootProject.name,
-                "Implementation-Version" to rootProject.version,
-                "Implementation-Vendor-Id" to rootProject.group,
-                "Created-By" to "Gradle "+ gradle.gradleVersion,
-                    "Main-Class" to "com.beust.cedlinks.MainKt"))
-        }
+    withType<Test> {
+        useTestNG()
     }
 }