From 442df22f4ca6b6a3b9478aaceae1631ee2a68599 Mon Sep 17 00:00:00 2001
From: Owain van Brakel <owain.vanbrakel@gmail.com>
Date: Wed, 24 Jul 2019 20:42:03 +0200
Subject: [PATCH] gradle: TaskInternal.execute() has been deprecated

---
 injector-plugin/build.gradle                  | 17 +++++-----
 runelite-script-assembler-plugin/build.gradle | 31 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/injector-plugin/build.gradle b/injector-plugin/build.gradle
index 752a0d170f..36474c5966 100644
--- a/injector-plugin/build.gradle
+++ b/injector-plugin/build.gradle
@@ -13,13 +13,14 @@ dependencies {
     annotationProcessor group: 'org.eclipse.sisu', name: 'org.eclipse.sisu.inject', version: '0.0.0.M2a'
 }
 
-task inject(type:JavaExec) {
-  classpath = sourceSets.main.runtimeClasspath
-
-  main = "net.runelite.injector.Injector"
-  args('../runescape-client/build/libs/rs-client-1.5.30-SNAPSHOT.jar,./vanilla-181.jar,../injected-client/build/libs/injected-client-1.5.30-SNAPSHOT.jar'.split(','))
-}
-
 compileJava.doLast {
-  tasks.inject.execute()
+  def path = sourceSets.main.runtimeClasspath
+  def loader = new URLClassLoader(path.collect {f -> f.toURL()} as URL[])
+  def inject = loader.loadClass('net.runelite.injector.Injector')
+  String[] jarPaths = [
+    "${project.rootDir}/runescape-client/build/libs/rs-client-1.5.30-SNAPSHOT.jar",
+    "${project.projectDir}/vanilla-181.jar",
+    "${project.rootDir}/injected-client/build/libs/injected-client-1.5.30-SNAPSHOT.jar"
+  ]
+  inject.main(jarPaths)
 }
\ No newline at end of file
diff --git a/runelite-script-assembler-plugin/build.gradle b/runelite-script-assembler-plugin/build.gradle
index 11314d960c..c21a44b2db 100644
--- a/runelite-script-assembler-plugin/build.gradle
+++ b/runelite-script-assembler-plugin/build.gradle
@@ -9,21 +9,20 @@ dependencies {
     annotationProcessor group: 'org.eclipse.sisu', name: 'org.eclipse.sisu.inject', version: '0.0.0.M2a'
 }
 
-task assembleMojo(type:JavaExec) {
-  classpath = sourceSets.main.runtimeClasspath
-
-  main = "net.runelite.script.AssembleMojo"
-  args('../runelite-client/src/main/scripts,../runelite-client/src/main/resources/runelite'.split(','))
-}
-
-task indexMojo(type:JavaExec) {
-  classpath = sourceSets.main.runtimeClasspath
-
-  main = "net.runelite.script.IndexMojo"
-  args('../runelite-client/src/main/resources/runelite,../runelite-client/src/main/resources/runelite/index'.split(','))
-}
-
 compileJava.doLast {
-  tasks.assembleMojo.execute()
-  tasks.indexMojo.execute()
+  def path = sourceSets.main.runtimeClasspath
+  def loader = new URLClassLoader(path.collect {f -> f.toURL()} as URL[])
+  def assemble = loader.loadClass('net.runelite.script.AssembleMojo')
+  String[] assembleArgs = [
+    "${project.rootDir}/runelite-client/src/main/scripts",
+    "${project.rootDir}/runelite-client/src/main/resources/runelite"
+  ]
+  assemble.main(assembleArgs)
+
+  def index = loader.loadClass('net.runelite.script.IndexMojo')
+  String[] indexArgs = [
+    "${project.rootDir}/runelite-client/src/main/resources/runelite",
+    "${project.rootDir}/runelite-client/src/main/resources/runelite/index"
+  ]
+  index.main(indexArgs)
 }