GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

Exclude from relocation, not inclusion

This commit is contained in:
Kas-tle 2022-08-24 05:18:12 +00:00 committed by GitHub
parent e35f3785b2
commit dc29d997fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bootstrap/spigot/build.gradle.kts
View File

@ -27,7 +27,7 @@ dependencies {
platformRelocate("it.unimi.dsi.fastutil")
platformRelocate("com.fasterxml.jackson")
platformRelocate("net.kyori")
platformRelocate("net.kyori", "net.kyori.adventure.text.logger.slf4j.ComponentLogger")
platformRelocate("org.objectweb.asm")
platformRelocate("me.lucko.commodore")
platformRelocate("io.netty.channel.kqueue")
@ -65,6 +65,6 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
exclude(dependency("com.mojang:.*"))
// Adventure slf4j
exclude(dependency("net.kyori.adventure.text.logger.slf4j:ComponentLogger"))
//exclude(dependency("net.kyori.adventure.text.logger.slf4j:ComponentLogger"))
}
}

6
build-logic/src/main/kotlin/extensions.kt
View File

@ -43,9 +43,11 @@ fun Project.exclude(group: String) {
}
}
fun Project.platformRelocate(pattern: String) {
fun Project.platformRelocate(pattern: String, exclusion: String = "") {
tasks.named<ShadowJar>("shadowJar") {
relocate(pattern, "org.geysermc.geyser.platform.${project.name}.shaded.$pattern")
relocate(pattern, "org.geysermc.geyser.platform.${project.name}.shaded.$pattern") {
exclude(exclusion)
}
}
}