From 6d4f04f2bc1ece0abcda60d61758fbf4182c4605 Mon Sep 17 00:00:00 2001
From: Owain van Brakel <owain.vanbrakel@gmail.com>
Date: Thu, 4 Mar 2021 02:56:54 +0100
Subject: [PATCH] gradle: Wait for the injector before starting

---
 injector/injector.gradle.kts               | 6 ------
 runelite-client/runelite-client.gradle.kts | 9 +++++++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/injector/injector.gradle.kts b/injector/injector.gradle.kts
index d99d51cf46..6746134a52 100644
--- a/injector/injector.gradle.kts
+++ b/injector/injector.gradle.kts
@@ -39,9 +39,3 @@ tasks.register<JavaExec>("inject") {
     }
 }
 
-tasks {
-    build {
-        finalizedBy("inject")
-    }
-}
-
diff --git a/runelite-client/runelite-client.gradle.kts b/runelite-client/runelite-client.gradle.kts
index 1dc31f0c1e..b24805c179 100644
--- a/runelite-client/runelite-client.gradle.kts
+++ b/runelite-client/runelite-client.gradle.kts
@@ -125,9 +125,12 @@ tasks {
         finalizedBy("shadowJar")
     }
 
+    compileJava {
+        dependsOn("packInjectedClient")
+    }
+
     processResources {
-        dependsOn(":injector:build")
-        finalizedBy("filterResources", "packInjectedClient")
+        finalizedBy("filterResources")
     }
 
     register<Copy>("filterResources") {
@@ -150,6 +153,8 @@ tasks {
     }
 
     register<Copy>("packInjectedClient") {
+        dependsOn(":injector:inject")
+
         from("src/main/resources/")
         include("**/injected-client.oprs")
         into("${buildDir}/resources/main")