[ci skip] Misc gradle updates (#6763)

This commit is contained in:
Jason 2021-10-11 16:31:53 -05:00 committed by GitHub
parent 4a0d935cd0
commit 54813dbb21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 34 additions and 39 deletions

View file

@ -6,23 +6,20 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
diff --git a/build.gradle.kts b/build.gradle.kts
index fd037da8b655b329ef016356519a69ca2621fd4f..03c9f894a2eaa065c456843eef4d3ab1a25565c3 100644
index 2c39461ce531cfa8fc0aa6928e0de819640b0553..2b16554395db5ec82c8dacc274517c16fdf26fdd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,12 @@
@@ -1,7 +1,9 @@
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
plugins {
@@ -13,6 +17,14 @@ plugins {
@@ -12,6 +14,14 @@ plugins {
repositories {
maven("https://libraries.minecraft.net/")
@ -37,7 +34,7 @@ index fd037da8b655b329ef016356519a69ca2621fd4f..03c9f894a2eaa065c456843eef4d3ab1
}
dependencies {
@@ -48,6 +60,8 @@ dependencies {
@@ -47,6 +57,8 @@ dependencies {
implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
implementation("io.netty:netty-all:4.1.65.Final") // Paper
@ -46,7 +43,7 @@ index fd037da8b655b329ef016356519a69ca2621fd4f..03c9f894a2eaa065c456843eef4d3ab1
testImplementation("junit:junit:4.13.1")
testImplementation("org.hamcrest:hamcrest-library:1.3")
}
@@ -141,6 +155,44 @@ tasks.shadowJar {
@@ -140,6 +152,45 @@ tasks.shadowJar {
transform(ModifiedLog4j2PluginsCacheFileTransformer::class.java)
}
@ -62,6 +59,7 @@ index fd037da8b655b329ef016356519a69ca2621fd4f..03c9f894a2eaa065c456843eef4d3ab1
+ abstract val outputJar: RegularFileProperty
+
+ override fun init() {
+ super.init()
+ outputJar.convention(defaultOutput())
+ }
+