Skip to content

Commit

Permalink
chore(testlib): Use JVM version restrictions to avoid failing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
zml2008 committed Aug 25, 2024
1 parent 0c5c0be commit 27cf999
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 101 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ subprojects {
javaVersions {
target 11
minimumToolchain 17
testWith(11, 17, 20)
testWith(11, 17, 21)
}

signWithKeyFromPrefixedProperties("kyori")
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ gradlePluginPublish = "1.2.1"
immutables = "2.10.1"
indra = "3.1.3"
jetbrainsAnnotations = "24.1.0"
jgit = "6.10.0.+" # stay on 5.x series, 6+ requires Java 11
jgit = "6.10.0.+"
junit = "5.10.3"
kotlin = "1.9.25"
mammoth = "1.3.1"
mammoth = "1.4.0"
spotless = "6.21.0"

[libraries]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("net.kyori.indra.licenser.spotless")
kotlin("jvm") version "1.8.21"
kotlin("jvm") version "2.0.20"
}

kotlin {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("net.kyori.indra.licenser.spotless")
kotlin("jvm") version "1.8.21"
kotlin("jvm") version "2.0.20"
}

kotlin {
Expand Down
8 changes: 0 additions & 8 deletions indra-testlib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@ dependencies {
api libs.mammoth.test
}

sourceSets {
main {
multirelease {
alternateVersions 20
}
}
}

javadoc {
enabled = false
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* This file is part of indra, licensed under the MIT License.
*
* Copyright (c) 2020-2023 KyoriPowered
* Copyright (c) 2020-2024 KyoriPowered
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -37,9 +37,10 @@
* A base annotation for both operations that use the configuration cache and those that don't.
*/
@GradleFunctionalTest
@LegacyGradleVersion
@TestVariant(gradleVersion = "8.4")
@TestVariantResource(value = "/injected-gradle-versions", optional = true)
@TestVariant(gradleVersion = "7.6.4", maximumRuntimeVersion = 20)
@TestVariant(gradleVersion = "8.9", maximumRuntimeVersion = 16)
@TestVariant(gradleVersion = "8.10", minimumRuntimeVersion = 17)
@TestVariantResource(value = "/injected-gradle-versions", optional = true, minimumRuntimeVersion = 17)
@Tag("functional")
@Documented
@Retention(RetentionPolicy.RUNTIME)
Expand Down

This file was deleted.

This file was deleted.

0 comments on commit 27cf999

Please sign in to comment.