From aa8a8359125d698886bac0fe6dab03a84cde52f7 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Tue, 28 Dec 2021 16:50:02 -0800 Subject: [PATCH] [ci skip] Populate test plugin api-version from mcVersion closes #7216 --- test-plugin/build.gradle.kts | 10 ++++++++-- test-plugin/src/main/resources/plugin.yml | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/test-plugin/build.gradle.kts b/test-plugin/build.gradle.kts index e83e3406a..72f79b682 100644 --- a/test-plugin/build.gradle.kts +++ b/test-plugin/build.gradle.kts @@ -10,8 +10,14 @@ dependencies { } tasks.processResources { - inputs.property("version", project.version) + val apiVersion = rootProject.providers.gradleProperty("mcVersion").forUseAtConfigurationTime().get() + .split(".", "-").take(2).joinToString(".") + val props = mapOf( + "version" to project.version, + "apiversion" to apiVersion, + ) + inputs.properties(props) filesMatching("plugin.yml") { - expand("version" to project.version) + expand(props) } } diff --git a/test-plugin/src/main/resources/plugin.yml b/test-plugin/src/main/resources/plugin.yml index 67793405f..1e6adb9ff 100644 --- a/test-plugin/src/main/resources/plugin.yml +++ b/test-plugin/src/main/resources/plugin.yml @@ -3,5 +3,5 @@ version: ${version} main: io.papermc.paper.testplugin.TestPlugin description: Paper Test Plugin author: PaperMC -api-version: 1.17 +api-version: ${apiversion} load: STARTUP