From 7ecc2e315896462a1371076a3a7ab4b7cfa8ee1f Mon Sep 17 00:00:00 2001
From: Gary Tierney <gary.tierney@gmx.com>
Date: Thu, 1 Jun 2017 23:09:24 +0100
Subject: [PATCH] Clean up plugin script compilation

---
 game/build.gradle   | 6 ++----
 game/plugins.gradle | 9 ++++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/game/build.gradle b/game/build.gradle
index 8db5ebe1..e7db42a3 100644
--- a/game/build.gradle
+++ b/game/build.gradle
@@ -36,11 +36,9 @@ dependencies {
     testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
 }
 
-task run(type: JavaExec, dependsOn: [classes, pluginClasses]) {
-    FileCollection gameClasspath = sourceSets.main.runtimeClasspath + sourceSets.main.compileClasspath
-
+task run(type: JavaExec, dependsOn: classes) {
     main = 'org.apollo.Server'
-    classpath = gameClasspath
+    classpath = sourceSets.main.runtimeClasspath
     jvmArgs = ['-Xmx1750M']
     workingDir = "$rootDir"
 }
\ No newline at end of file
diff --git a/game/plugins.gradle b/game/plugins.gradle
index 5bdfd2f4..e16aa141 100644
--- a/game/plugins.gradle
+++ b/game/plugins.gradle
@@ -23,10 +23,6 @@ task pluginTests {
     }
 }
 
-task pluginClasses {
-    group = "plugin-build"
-}
-
 check.dependsOn pluginTests
 
 class PluginBuildData {
@@ -107,7 +103,10 @@ def configurePluginTasks(String name, SourceSet mainSources, SourceSet testSourc
             args = [outputDir] + scriptFiles.collect { it.absoluteFile.toString() }
         }
 
-        pluginClasses.dependsOn compileScriptsTask
+        tasks[mainSources.classesTaskName].outputs.upToDateWhen { false }
+        tasks[mainSources.classesTaskName].doLast {
+            compileScriptsTask.execute()
+        }
     }
 }