OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 23:38:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

[ci skip] Misc gradle updates (#6763)

Browse source
This commit is contained in:
Jason Penilla 2021-10-11 16:31:53 -05:00
parent f5b2d0cfce
commit 5eb18765ee
3 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle.kts
View file

@ -1,7 +1,7 @@
plugins { plugins {
java java
`maven-publish` `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" id("io.papermc.paperweight.core") version "1.1.12"
} }

6
patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch
View file

@ -13,10 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
+import io.papermc.paperweight.tasks.BaseTask +import io.papermc.paperweight.tasks.BaseTask
import io.papermc.paperweight.util.Git import io.papermc.paperweight.util.*
+import io.papermc.paperweight.util.defaultOutput
+import io.papermc.paperweight.util.openZip
import io.papermc.paperweight.util.path
import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE
+import java.nio.file.Files +import java.nio.file.Files
import java.util.Locale import java.util.Locale
@ -62,6 +59,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ abstract val outputJar: RegularFileProperty + abstract val outputJar: RegularFileProperty
+ +
+ override fun init() { + override fun init() {
+ super.init()
+ outputJar.convention(defaultOutput()) + outputJar.convention(defaultOutput())
+ } + }
+ +

7
patches/server/Setup-Gradle-project.patch
View file

@ -34,8 +34,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
+import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer +import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
+import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer +import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
+import io.papermc.paperweight.util.Git +import io.papermc.paperweight.util.*
+import io.papermc.paperweight.util.path
+import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE +import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE
+import java.util.Locale +import java.util.Locale
+ +
@ -178,9 +177,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ doFirst { + doFirst {
+ workingDir.mkdirs() + workingDir.mkdirs()
+ } + }
+ javaLauncher.set(project.javaToolchains.launcherFor { + javaLauncher.set(project.javaToolchains.defaultJavaLauncher(project))
+ languageVersion.set(JavaLanguageVersion.of(project.tasks.compileJava.get().options.release.get()))
+ })
+ block(this) + block(this)
+} +}
+ +