Skip to content

Commit 000cdac

Browse files
chore(deps): Update build deps and github actions (major) (#107)
* chore(deps): Update build deps and github actions * chore: Force a minimum of J17 toolchain * fix: correct JVM version ranges for tests --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: zml <zml@stellardrift.ca>
1 parent 290021a commit 000cdac

File tree

10 files changed

+16
-13
lines changed

10 files changed

+16
-13
lines changed

build.gradle.kts

Lines changed: 2 additions & 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")
@@ -90,6 +90,7 @@ subprojects {
9090
mitLicense()
9191

9292
javaVersions {
93+
minimumToolchain(17)
9394
testWith().addAll(testTargets)
9495
}
9596

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

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ version = "1.0"
33

44
[versions]
55
indra = "3.2.0"
6-
pluginPublish = "1.3.1"
7-
spotless = "7.2.1"
6+
pluginPublish = "2.0.0"
7+
spotless = "8.0.0"
88
junit = "5.9.3"
99
mammoth = "1.5.0"
1010

gradle/wrapper/gradle-wrapper.jar

1.65 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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");

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pluginManagement {
77
}
88

99
plugins {
10-
id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
10+
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
1111
}
1212

1313
dependencyResolutionManagement {

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)