From 67beca7ee2a473dd72426f3cf8aba939f93725cd Mon Sep 17 00:00:00 2001 From: Thomas Meaney Date: Fri, 10 Apr 2026 18:10:57 +0200 Subject: [PATCH] chore: update project to require Java 25 and adjust version references to 26.1 --- .github/ISSUE_TEMPLATE/bug_report.yml | 6 +++--- .github/workflows/build.yml | 2 +- .github/workflows/publish.yml | 2 +- README.md | 2 ++ buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/CommonConfig.kt | 4 +++- buildsystem-api/build.gradle.kts | 6 +++--- buildsystem-core/build.gradle.kts | 4 ++-- .../main/java/de/eintosti/buildsystem/config/Config.java | 6 +++--- gradle/libs.versions.toml | 4 ++-- 10 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 13adaa49..787fc624 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -20,7 +20,7 @@ body: attributes: label: Steps to reproduce description: | - What do we need to do in order to make the bug happen? Clear and concise reproduction instructions are important for us to be able to triage your issue in a timely manner. + What do we need to do in order to make the bug happen? Clear and concise reproduction instructions are important for us to be able to triage your issue in a timely manner. placeholder: Steps to reproduce validations: required: true @@ -40,9 +40,9 @@ body: id: server-info attributes: label: Server Info - description: "Minecraft version: (e.g. 1.21.4), Server version (e.g. Spigot, Paper), Plugin version (e.g. 2.17.1)" + description: "Minecraft version: (e.g. 26.1), Server version (e.g. Spigot, Paper), Plugin version (e.g. 3.0.0)" render: shell - placeholder: "Minecraft version 1.21.4 on the server version Paper-386 with the Plugin version 2.17.1" + placeholder: "Minecraft version 26.1 on the server version Paper-386 with the Plugin version 3.0.0" validations: required: true - type: textarea diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5fbcdee4..c0de7199 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ 21 ] + java: [ 25 ] fail-fast: true steps: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 822cf457..29cae6b6 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ 21 ] + java: [ 25 ] fail-fast: true steps: - name: Checkout Git Repository diff --git a/README.md b/README.md index 34fca7e5..a7a7fb36 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,8 @@ dependencies { ## Contributing +Build requires **Java 25**. + ### To compile... #### On Windows diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 14a61d56..8873c337 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -21,6 +21,6 @@ dependencies { kotlin { jvmToolchain { - this.languageVersion.set(JavaLanguageVersion.of(21)) + this.languageVersion.set(JavaLanguageVersion.of(25)) } } diff --git a/buildSrc/src/main/kotlin/CommonConfig.kt b/buildSrc/src/main/kotlin/CommonConfig.kt index 53699f6e..58e4bbcb 100644 --- a/buildSrc/src/main/kotlin/CommonConfig.kt +++ b/buildSrc/src/main/kotlin/CommonConfig.kt @@ -9,6 +9,7 @@ import org.gradle.kotlin.dsl.withType fun Project.applyCommonConfiguration() { group = rootProject.group version = rootProject.version + val javaVersion = providers.gradleProperty("javaVersion").orElse("25").get().toInt() repositories { mavenCentral() @@ -30,12 +31,13 @@ fun Project.applyCommonConfiguration() { plugins.withId("java") { the().apply { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(javaVersion)) } } } tasks.withType { options.encoding = Charsets.UTF_8.name() + options.release.set(javaVersion) } } \ No newline at end of file diff --git a/buildsystem-api/build.gradle.kts b/buildsystem-api/build.gradle.kts index e0957326..c2e076ef 100644 --- a/buildsystem-api/build.gradle.kts +++ b/buildsystem-api/build.gradle.kts @@ -26,10 +26,10 @@ tasks.withType { opt.overview("javadoc/overview.html") opt.encoding("UTF-8") opt.charSet("UTF-8") - opt.links("https://docs.oracle.com/en/java/javase/21/docs/api/") + opt.links("https://docs.oracle.com/en/java/javase/25/docs/api/") opt.links("https://hub.spigotmc.org/javadocs/spigot/") - opt.links("https://javadoc.io/static/org.jetbrains/annotations/") - opt.links("https://javadoc.io/doc/org.jspecify/jspecify") + opt.links("https://javadoc.io/doc/org.jetbrains/annotations/26.1.0/") + opt.links("https://javadoc.io/doc/org.jspecify/jspecify/1.0.0/") opt.isLinkSource = true opt.isUse = true opt.keyWords() diff --git a/buildsystem-core/build.gradle.kts b/buildsystem-core/build.gradle.kts index 7d433fdc..8d44ae1f 100644 --- a/buildsystem-core/build.gradle.kts +++ b/buildsystem-core/build.gradle.kts @@ -30,8 +30,8 @@ repositories { } modrinthMavenWorkaround( "axiom-paper-plugin", - "5.0.2+1.21.10", - "AxiomPaper-5.0.2-for-MC1.21.10.jar" + "5.0.4+26.1", + "AxiomPaperPlugin-5.0.4-for-MC26.1.jar" ) } diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java index 1626a17f..70fce02c 100644 --- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java +++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java @@ -269,9 +269,9 @@ public static class Default { * Default game rules for new worlds. */ public static List> gameRules = List.of( - new GameRuleEntry<>(GameRule.DO_DAYLIGHT_CYCLE, false), - new GameRuleEntry<>(GameRule.DO_MOB_SPAWNING, false), - new GameRuleEntry<>(GameRule.DO_FIRE_TICK, false) + new GameRuleEntry<>(GameRule.ADVANCE_TIME, false), + new GameRuleEntry<>(GameRule.SPAWN_MOBS, false), + new GameRuleEntry<>(GameRule.FIRE_SPREAD_RADIUS_AROUND_PLAYER, 0) ); /** diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1b560225..10584324 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] # Platform expectations -spigot = "1.21.8-R0.1-SNAPSHOT" +spigot = "26.1.2-R0.1-SNAPSHOT" paperlib = "1.0.8" # Plugins luckperms = "5.5" worldedit = "7.4.2" placeholderapi = "2.12.2" -axiompaper = "4.0.1-1.21.1" +axiompaper = "5.0.4+26.1" # Third Party annotations = "26.1.0" authlib = "3.13.56"