Use Gradle's dependency catalogue feature (#3305)

Move all of our dependencies to a single catalogue file to make maintenance of them easier.
This commit is contained in:
SupremeMortal 2022-09-26 16:43:17 +01:00 committed by GitHub
parent 2c5c72f85f
commit e491cf8a17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 134 additions and 101 deletions

View file

@ -1,9 +1,7 @@
val bungeeVersion = "a7c6ede";
dependencies {
api(projects.core)
implementation("net.kyori", "adventure-text-serializer-bungeecord", Versions.adventurePlatformVersion)
implementation(libs.adventure.text.serializer.bungeecord)
}
platformRelocate("net.md_5.bungee.jni")
@ -12,7 +10,7 @@ platformRelocate("io.netty.channel.kqueue") // This is not used because relocati
platformRelocate("net.kyori")
// These dependencies are already present on the platform
provided("com.github.SpigotMC.BungeeCord", "bungeecord-proxy", bungeeVersion)
provided(libs.bungeecord.proxy)
application {
mainClass.set("org.geysermc.geyser.platform.bungeecord.GeyserBungeeMain")

View file

@ -6,19 +6,19 @@ val commodoreVersion = "2.2"
dependencies {
api(projects.core)
implementation("org.geysermc.geyser.adapters", "spigot-all", adaptersVersion)
implementation(libs.adapters.spigot)
implementation("me.lucko", "commodore", commodoreVersion)
implementation(libs.commodore)
implementation("net.kyori", "adventure-text-serializer-bungeecord", Versions.adventurePlatformVersion)
implementation(libs.adventure.text.serializer.bungeecord)
// Both paper-api and paper-mojangapi only provide Java 17 versions for 1.19
compileOnly("io.papermc.paper", "paper-api", paperVersion) {
compileOnly(libs.paper.api) {
attributes {
attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 17)
}
}
compileOnly("io.papermc.paper", "paper-mojangapi", paperVersion) {
compileOnly(libs.paper.mojangapi) {
attributes {
attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 17)
}

View file

@ -1,5 +1,3 @@
val spongeVersion = "7.1.0"
dependencies {
api(projects.core)
}
@ -18,7 +16,7 @@ exclude("org.slf4j:*")
exclude("org.ow2.asm:*")
// These dependencies are already present on the platform
provided("org.spongepowered", "spongeapi", spongeVersion)
provided(libs.sponge.api)
application {
mainClass.set("org.geysermc.geyser.platform.sponge.GeyserSpongeMain")

View file

@ -6,20 +6,16 @@ val jlineVersion = "3.21.0"
dependencies {
api(projects.core)
implementation("net.minecrell", "terminalconsoleappender", terminalConsoleVersion) {
implementation(libs.terminalconsoleappender) {
exclude("org.apache.logging.log4j", "log4j-core")
exclude("org.jline", "jline-reader")
exclude("org.jline", "jline-terminal")
exclude("org.jline", "jline-terminal-jna")
}
implementation("org.jline", "jline-terminal", jlineVersion)
implementation("org.jline", "jline-terminal-jna", jlineVersion)
implementation("org.jline", "jline-reader", jlineVersion)
implementation(libs.bundles.jline)
implementation("org.apache.logging.log4j", "log4j-api", Versions.log4jVersion)
implementation("org.apache.logging.log4j", "log4j-core", Versions.log4jVersion)
implementation("org.apache.logging.log4j", "log4j-slf4j18-impl", Versions.log4jVersion)
implementation(libs.bundles.log4j)
}
application {

View file

@ -1,7 +1,5 @@
val velocityVersion = "3.0.0"
dependencies {
annotationProcessor("com.velocitypowered", "velocity-api", velocityVersion)
annotationProcessor(libs.velocity.api)
api(projects.core)
}
@ -34,7 +32,7 @@ exclude("net.kyori:adventure-text-serializer-legacy:*")
exclude("net.kyori:adventure-nbt:*")
// These dependencies are already present on the platform
provided("com.velocitypowered", "velocity-api", velocityVersion)
provided(libs.velocity.api)
application {
mainClass.set("org.geysermc.geyser.platform.velocity.GeyserVelocityMain")