mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update runDev task for Gradle 7.1 deprecations

Browse source 
also no longer disable watchdog by default, instead require `disableWatchdog` Gradle property to be set
This commit is contained in:
Jason Penilla 2021-06-15 22:10:05 -07:00
parent d6c75ac925
commit 942c015158
3 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,10 +25,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+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.Git
+import io.papermc.paperweight.util.path +import io.papermc.paperweight.util.path
+import org.gradle.api.file.FileTreeElement
+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.Date
+import java.text.SimpleDateFormat +import java.text.SimpleDateFormat
+import java.util.Date
+ +
+plugins { +plugins {
+ java + java
@ -114,20 +113,24 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class") + exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
+} +}
+ +
+fun TaskContainer.registerRunTask(name: String, block: JavaExec.() -> Unit): TaskProvider<JavaExec> = +fun TaskContainer.registerRunTask(
+ register<JavaExec>(name) { + name: String, block: JavaExec.() -> Unit
+ group = "Paper" +): TaskProvider<JavaExec> = register<JavaExec>(name) {
+ workingDir = rootProject.layout.projectDirectory.dir( + group = "paper"
+ providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run") + standardInput = System.`in`
+ ).get().asFile + workingDir = rootProject.layout.projectDirectory.dir(
+ doFirst { + providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run")
+ workingDir.mkdirs() + ).get().asFile
+ } + args("--nogui")
+ standardInput = System.`in` + systemProperty("net.kyori.adventure.text.warnWhenLegacyFormattingDetected", true)
+ args("--nogui") + if (project.hasProperty("disableWatchdog")) {
+ systemProperty("net.kyori.adventure.text.warnWhenLegacyFormattingDetected", true) + systemProperty("disable.watchdog", true)
+ block(this)
+ } + }
+ doFirst {
+ workingDir.mkdirs()
+ }
+ block(this)
+}
+ +
+tasks.registerRunTask("runShadow") { +tasks.registerRunTask("runShadow") {
+ description = "Spin up a test server from the shadowJar archiveFile" + description = "Spin up a test server from the shadowJar archiveFile"
@ -141,10 +144,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+tasks.registerRunTask("runDev") { +tasks.registerRunTask("runDev") {
+ description = "Spin up a non-shaded non-remapped test server" + description = "Spin up a non-shaded non-remapped test server"
+ classpath = project.convention.getPlugin(JavaPluginConvention::class.java) + classpath = java.sourceSets.main.get().runtimeClasspath
+ .sourceSets.getByName("main").runtimeClasspath + mainClass.set("org.bukkit.craftbukkit.Main")
+ main = "org.bukkit.craftbukkit.Main"
+ systemProperty("disable.watchdog", true)
+} +}
+ +
+class ModifiedLog4j2PluginsCacheFileTransformer : Transformer by Log4j2PluginsCacheFileTransformer() { +class ModifiedLog4j2PluginsCacheFileTransformer : Transformer by Log4j2PluginsCacheFileTransformer() {

2
work/Bukkit

@ -1 +1 @@
Subproject commit e9ce88b99c08332877866313784cd84e9d9b54fb Subproject commit ebb0e28d11747aa0bb4bb39fad8979ccfaa925b6

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit d7ef1e91fa6431aa649b4bfcdabdbbef8ba41267 Subproject commit f992ce6097f846ed5967fc797d98ae3e84ef1b10