From 165deebf04a567075d544b58a17608896c2bb3e7 Mon Sep 17 00:00:00 2001 From: TheLimeGlass Date: Sun, 13 Apr 2025 03:33:50 -0600 Subject: [PATCH 1/2] use the gradle properties for the latest environment reference --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 974ada516bf..9d30a653881 100644 --- a/build.gradle +++ b/build.gradle @@ -246,7 +246,7 @@ void createTestTask(String name, String desc, String environments, int javaVersi def java21 = 21 def java17 = 17 -def latestEnv = 'java21/paper-1.21.4.json' +def latestEnv = project.testEnv + ".json" def latestJava = java21 def oldestJava = java17 From 7abcf22185b60c4def25debf531667e30da30200 Mon Sep 17 00:00:00 2001 From: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> Date: Wed, 2 Jul 2025 17:40:11 -0600 Subject: [PATCH 2/2] Update build.gradle --- build.gradle | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 9d30a653881..acd205b5a68 100644 --- a/build.gradle +++ b/build.gradle @@ -246,11 +246,11 @@ void createTestTask(String name, String desc, String environments, int javaVersi def java21 = 21 def java17 = 17 -def latestEnv = project.testEnv + ".json" +def env = project.testEnv + ".json" def latestJava = java21 def oldestJava = java17 -def latestJUnitEnv = latestEnv +def latestJUnitEnv = env def latestJUnitJava = latestJava java { @@ -266,13 +266,12 @@ compileTestJava.options.encoding = 'UTF-8' // Register different Skript testing tasks String environments = 'src/test/skript/environments/'; -String env = project.property('testEnv') == null ? latestEnv : project.property('testEnv') + '.json' int envJava = project.property('testEnvJavaVersion') == null ? latestJava : Integer.parseInt(project.property('testEnvJavaVersion') as String) -createTestTask('quickTest', 'Runs tests on one environment being the latest supported Java and Minecraft.', environments + latestEnv, latestJava, 0) +createTestTask('quickTest', 'Runs tests on one environment being the latest supported Java and Minecraft.', environments + env, latestJava, 0) createTestTask('skriptTestJava21', 'Runs tests on all Java 21 environments.', environments + 'java21', java21, 0) createTestTask('skriptTestJava17', 'Runs tests on all Java 17 environments.', environments + 'java17', java17, 0) createTestTask('skriptTestDev', 'Runs testing server and uses \'system.in\' for command input, stop server to finish.', environments + env, envJava, 0, Modifiers.DEV_MODE, Modifiers.DEBUG) -createTestTask('skriptProfile', 'Starts the testing server with JProfiler support.', environments + latestEnv, latestJava, -1, Modifiers.PROFILE) +createTestTask('skriptProfile', 'Starts the testing server with JProfiler support.', environments + env, latestJava, -1, Modifiers.PROFILE) createTestTask('genNightlyDocs', 'Generates the Skript documentation website html files.', environments + env, envJava, 0, Modifiers.GEN_NIGHTLY_DOCS) createTestTask('genReleaseDocs', 'Generates the Skript documentation website html files for a release.', environments + env, envJava, 0, Modifiers.GEN_RELEASE_DOCS) tasks.register('skriptTest') {