From eb39e9176c9f82ba7a671de5929f61204b4ec294 Mon Sep 17 00:00:00 2001
From: Lucwousin <Lucwousin@users.noreply.github.com>
Date: Sun, 28 Jun 2020 07:24:37 +0200
Subject: [PATCH 1/2] update injector version

---
 build.gradle.kts                           | 2 +-
 injected-client/injected-client.gradle.kts | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 98dbb3cc0b..28a081ce2a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -35,7 +35,7 @@ buildscript {
     dependencies {
         classpath("org.ajoberstar.grgit:grgit-core:4.0.2")
         classpath("com.github.ben-manes:gradle-versions-plugin:0.28.0")
-        classpath("com.openosrs:injector-plugin:1.1.2")
+        classpath("com.openosrs:injector-plugin:1.1.3")
     }
 }
 
diff --git a/injected-client/injected-client.gradle.kts b/injected-client/injected-client.gradle.kts
index ce8883caec..c4df055ab7 100644
--- a/injected-client/injected-client.gradle.kts
+++ b/injected-client/injected-client.gradle.kts
@@ -62,10 +62,6 @@ injector {
     vanilla.set(vanillaDep.singleFile)
 }
 
-artifacts {
-    runtimeElements(tasks.inject.get().output)
-}
-
 // keep the sourcesets etc but remove useless tasks
 tasks {
     inject {
@@ -86,7 +82,4 @@ tasks {
     processResources {
         enabled = false
     }
-    assemble {
-        finalizedBy("inject")
-    }
 }

From 99dffc1f3bfeb7a67d973dd9218469c7dae303d4 Mon Sep 17 00:00:00 2001
From: Lucwousin <Lucwousin@users.noreply.github.com>
Date: Sun, 28 Jun 2020 09:32:04 +0200
Subject: [PATCH 2/2] Normalize jars

---
 build.gradle.kts                           | 7 +++++++
 injected-client/injected-client.gradle.kts | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 28a081ce2a..e0f2a98d5b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -169,6 +169,13 @@ subprojects {
             withSourcesJar()
         }
 
+        withType<AbstractArchiveTask> {
+            isPreserveFileTimestamps = false
+            isReproducibleFileOrder = true
+            dirMode = 493
+            fileMode = 420
+        }
+
         withType<JavaCompile> {
             options.encoding = "UTF-8"
         }
diff --git a/injected-client/injected-client.gradle.kts b/injected-client/injected-client.gradle.kts
index c4df055ab7..4544988097 100644
--- a/injected-client/injected-client.gradle.kts
+++ b/injected-client/injected-client.gradle.kts
@@ -65,7 +65,7 @@ injector {
 // keep the sourcesets etc but remove useless tasks
 tasks {
     inject {
-        dependsOn(configurations["combined"])
+        dependsOn(combined)
     }
     classes {
         enabled = false