1
0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-19 14:59:27 +00:00

Update to Gradle 9 (#5976)

* Update gradle to 9.2.0

* Eclipse doesn't like defining a generic in an instanceof check...

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Fix launching on standalone due to Gradle 9 changes

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Update indra to v4; fix as many gradle deprecation warnings as possible

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Do task order suggestion; remove properties comment line

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Fix fabric runServer rask

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Fix :neoforge:runServer gradle task

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Fix libs.versions.toml

* Fix dupe runtask def

* Update architectury-loom and resolve properties issues

---------

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
Co-authored-by: onebeastchris <github@onechris.mozmail.com>
This commit is contained in:
Kas-tle
2025-12-12 19:04:34 -08:00
committed by GitHub
parent def5c97e77
commit e2f873466b
19 changed files with 279 additions and 202 deletions

View File

@@ -21,7 +21,7 @@ minecraftauth = "5.0.0"
mcprotocollib = "1.21.11-20251210.192611-9"
adventure = "4.25.0"
adventure-platform = "4.4.1"
junit = "5.9.2"
junit = "6.0.0"
checkerframework = "3.19.0"
log4j = "2.20.0"
jline = "3.21.0"
@@ -45,18 +45,21 @@ mixin = "0.8.5"
mixinextras = "0.3.5"
minecraft = "1.21.11"
mockito = "5.+"
runtask = "2.3.1"
runpaperversion = "1.21.11"
runvelocityversion = "3.4.0-SNAPSHOT"
# plugin versions
indra = "3.1.3"
shadow = "8.1.1"
architectury-plugin = "3.4-SNAPSHOT"
architectury-loom = "1.13-SNAPSHOT"
minotaur = "2.8.7"
lombok = "8.4"
blossom = "2.1.0"
indra = "4.0.0"
shadow = "9.2.2"
architectury-plugin = "3.4.162"
architectury-loom = "1.13.457"
loom-companion = "1.13.467"
minotaur = "2.8.10"
lombok = "9.1.0"
blossom = "2.2.0"
runtask = "3.0.2"
# run tasks versions
runpaperversion = "1.21.11"
runvelocityversion = "3.4.0-SNAPSHOT"
[libraries]
base-api = { group = "org.geysermc.api", name = "base-api", version.ref = "base-api" }
@@ -159,10 +162,11 @@ mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
# plugins
lombok = { group = "io.freefair.gradle", name = "lombok-plugin", version.ref = "lombok" }
indra = { group = "net.kyori", name = "indra-common", version.ref = "indra" }
shadow = { group = "com.github.johnrengelman", name = "shadow", version.ref = "shadow" }
shadow = { group = "com.gradleup.shadow", name = "com.gradleup.shadow.gradle.plugin", version.ref = "shadow" }
architectury-plugin = { group = "architectury-plugin", name = "architectury-plugin.gradle.plugin", version.ref = "architectury-plugin" }
architectury-loom = { group = "dev.architectury.loom", name = "dev.architectury.loom.gradle.plugin", version.ref = "architectury-loom" }
minotaur = { group = "com.modrinth.minotaur", name = "Minotaur", version.ref = "minotaur" }
loom-companion = { group = "dev.architectury.loom-companion", name = "dev.architectury.loom-companion.gradle.plugin", version.ref = "loom-companion" }
[plugins]
indra = { id = "net.kyori.indra", version.ref = "indra" }

Binary file not shown.

View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME