From 5eb18765ee380ba6110a31ffb5b62f4357536295 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Mon, 11 Oct 2021 16:31:53 -0500
Subject: [PATCH] [ci skip] Misc gradle updates (#6763)

---
 build.gradle.kts                                           | 2 +-
 ...bfuscate-stacktraces-in-log-messages-crash-report.patch | 6 ++----
 patches/server/Setup-Gradle-project.patch                  | 7 ++-----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f08a125667..7331f7e2f6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     java
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "7.0.0" apply false
+    id("com.github.johnrengelman.shadow") version "7.1.0" apply false
     id("io.papermc.paperweight.core") version "1.1.12"
 }
 
diff --git a/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index f94e85f668..efb3a16dc8 100644
--- a/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -13,10 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
  import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
 +import io.papermc.paperweight.tasks.BaseTask
- import io.papermc.paperweight.util.Git
-+import io.papermc.paperweight.util.defaultOutput
-+import io.papermc.paperweight.util.openZip
- import io.papermc.paperweight.util.path
+ import io.papermc.paperweight.util.*
  import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE
 +import java.nio.file.Files
  import java.util.Locale
@@ -62,6 +59,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    abstract val outputJar: RegularFileProperty
 +
 +    override fun init() {
++        super.init()
 +        outputJar.convention(defaultOutput())
 +    }
 +
diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch
index 9583c43c4c..5f2729dfd0 100644
--- a/patches/server/Setup-Gradle-project.patch
+++ b/patches/server/Setup-Gradle-project.patch
@@ -34,8 +34,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@
 +import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
 +import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
-+import io.papermc.paperweight.util.Git
-+import io.papermc.paperweight.util.path
++import io.papermc.paperweight.util.*
 +import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE
 +import java.util.Locale
 +
@@ -178,9 +177,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    doFirst {
 +        workingDir.mkdirs()
 +    }
-+    javaLauncher.set(project.javaToolchains.launcherFor {
-+        languageVersion.set(JavaLanguageVersion.of(project.tasks.compileJava.get().options.release.get()))
-+    })
++    javaLauncher.set(project.javaToolchains.defaultJavaLauncher(project))
 +    block(this)
 +}
 +