Clean up plugin script compilation

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"
 }

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()
+        }
     }
 }