Skip to content

Commit 48b2019

Browse files
committed
fix: correct JVM version ranges for tests
1 parent 26451ac commit 48b2019

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ subprojects {
2323
apply(plugin = "net.kyori.indra.git")
2424

2525
val indra = extensions.getByType(IndraExtension::class)
26-
val testTargets = listOf(11, 17, 21)
26+
val testTargets = listOf(11, 17, 21, 25)
2727
if (project.name != "spongegradle-testlib") {
2828
plugins.apply(JavaGradlePluginPlugin::class)
2929
apply(plugin = "com.gradle.plugin-publish")

gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ name=SpongeGradle
22
url=https://www.spongepowered.org
33
organization=SpongePowered
44
projectUrl=https://www.spongepowered.org
5-
javadocLinkRoot=https://jd.spongepowered.org/spongegradle/
5+
javadocLinkRoot=https://jd.spongepowered.org/spongegradle/
6+
7+
org.gradle.parallel=true

plugin-development/src/test/java/org/spongepowered/gradle/plugin/EmptyBuildTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,13 @@
2828
import org.gradle.testfixtures.ProjectBuilder;
2929
import org.junit.jupiter.api.Assertions;
3030
import org.junit.jupiter.api.Test;
31+
import org.junit.jupiter.api.condition.DisabledForJreRange;
32+
import org.junit.jupiter.api.condition.JRE;
3133

3234
public class EmptyBuildTest {
3335

3436
@Test
37+
@DisabledForJreRange(max = JRE.JAVA_16)
3538
void testEmptyBuild() {
3639
final Project project = ProjectBuilder.builder().build();
3740
project.getPlugins().apply("org.spongepowered.gradle.plugin");

testlib/src/main/java/org/spongepowered/gradle/build/SpongeGradleFunctionalTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
@GradleParameters({"--warning-mode", "fail", "--stacktrace"})
4343
@TestVariant(gradleVersion = "7.6.4", maximumRuntimeVersion = 20)
4444
@TestVariant(gradleVersion = "7.6.4", extraArguments = "--configuration-cache", maximumRuntimeVersion = 20)
45-
@TestVariant(gradleVersion = "8.10", extraArguments = "--configuration-cache", minimumRuntimeVersion = 17)
45+
@TestVariant(gradleVersion = "8.14.3", extraArguments = "--configuration-cache", minimumRuntimeVersion = 17, maximumRuntimeVersion = 24)
46+
@TestVariant(gradleVersion = "9.1.0", extraArguments = "--configuration-cache", minimumRuntimeVersion = 17)
4647
@TestVariantResource(value = "/injected-gradle-versions", optional = true, minimumRuntimeVersion = 17)
4748
@Documented
4849
@Retention(RetentionPolicy.RUNTIME)

0 commit comments

Comments
 (0)