From 0629f40e3f0433b65a698a569dea05e050a55dad Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Sat, 2 Dec 2023 12:16:51 +0100 Subject: [PATCH] Fix 'runPaper' task when Gradle JVM is set to 21 --- build.gradle.kts | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 0b3efb66..994e8667 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -243,24 +243,27 @@ hangarPublish { } tasks { - val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL() - val artifact = ((JsonSlurper().parse(lastSuccessfulBuildUrl) as Map<*, *>)["artifacts"] as List<*>) - .map { it as Map<*, *> } - .map { it["fileName"] as String } - .first { it.contains("Bukkit") } + register("cacheLatestFaweArtifact") { + val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL() + val artifact = ((JsonSlurper().parse(lastSuccessfulBuildUrl) as Map<*, *>)["artifacts"] as List<*>) + .map { it as Map<*, *> } + .map { it["fileName"] as String } + .first { it -> it.contains("Bukkit") } + project.ext["faweArtifact"] = artifact + } supportedVersions.forEach { register("runServer-$it") { + dependsOn(getByName("cacheLatestFaweArtifact")) minecraftVersion(it) pluginJars(*rootProject.getTasksByName("shadowJar", false).map { (it as Jar).archiveFile } .toTypedArray()) jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true") downloadPlugins { - url("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/artifact/artifacts/$artifact") + url("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/artifact/artifacts/${project.ext["faweArtifact"]}") } group = "run paper" runDirectory.set(file("run-$it")) } } } -