Skip to content

Commit 6c73d38

Browse files
authored
Merge pull request #64 from KyoriPowered/chore/test-runs
Use mammoth's runtime version filtering to fix tests
2 parents effbf9f + e46cd0d commit 6c73d38

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ indra {
106106
javaVersions {
107107
target(11)
108108
minimumToolchain(17)
109-
testWith(11, 17)
109+
testWith(11, 17, 21)
110110
}
111111
checkstyle(libs.versions.checkstyle.get())
112112

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ checkstyle = "10.17.0"
66
ideaExt = "1.1.8"
77
indra = "3.1.3"
88
junit = "5.10.3"
9-
mammoth = "1.3.1"
9+
mammoth = "1.4.0"
1010
pebble = "3.2.2"
1111
snakeyaml = "2.7"
1212
spotless = "6.25.0"

src/test/java/net/kyori/blossom/test/BlossomFunctionalTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@
3232

3333
@GradleFunctionalTest
3434
@GradleParameters({"--warning-mode", "fail", "--stacktrace"}) // parameters for all variants
35-
@TestVariant(gradleVersion = "7.6.2")
36-
@TestVariant(gradleVersion = "8.3", extraArguments = {"--configuration-cache"})
37-
@TestVariantResource(value = "/injected-gradle-versions", optional = true)
35+
@TestVariant(gradleVersion = "7.6.4", maximumRuntimeVersion = 20)
36+
@TestVariant(gradleVersion = "8.9", extraArguments = {"--configuration-cache"}) // last version with non-deprecated support for runtimes <17
37+
@TestVariant(gradleVersion = "8.10", extraArguments = {"--configuration-cache"}, minimumRuntimeVersion = 17)
38+
@TestVariantResource(value = "/injected-gradle-versions", optional = true, minimumRuntimeVersion = 17) // newer Gradle versions deprecate running on JDK <17, and this is only for RC's
3839
@Documented
3940
@Retention(RetentionPolicy.RUNTIME)
4041
@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD})

0 commit comments

Comments
 (0)