Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix dependency relocations

Browse Source
This commit is contained in:
jmp
2020-12-18 22:09:20 -08:00
parent d7f18849ec
commit 64f5f9d776
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
buildSrc/src/main/kotlin/ConfigureSubprojects.kt
View File

@@ -1,6 +1,9 @@
import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
import kotlinx.dom.elements
import kotlinx.dom.parseXml
import kotlinx.dom.search
import org.gradle.api.Project
import org.gradle.api.plugins.JavaLibraryPlugin
import org.gradle.api.publish.PublishingExtension
@@ -81,6 +84,30 @@ private fun Project.configureServerProject() {
exclude("org.bukkit.craftbukkit.Main*")
}
relocate("net.minecraft.server", "net.minecraft.server.v${toothpick.nmsPackage}")
// Make sure we relocate deps the same as Paper et al.
val pomFile = project.projectDir.resolve("pom.xml")
if (!pomFile.exists()) return@getting
val dom = parseXml(pomFile)
val buildSection = dom.search("build").first()
val plugins = buildSection.search("plugins").first()
plugins.elements("plugin").filter {
val artifactId = it.search("artifactId").first().textContent
artifactId == "maven-shade-plugin"
}.forEach {
it.search("executions").first()
.search("execution").first()
.search("configuration").first()
.search("relocations").first()
.elements("relocation").forEach { relocation ->
val pattern = relocation.search("pattern").first().textContent
val shadedPattern = relocation.search("shadedPattern").first().textContent
if (pattern != "org.bukkit.craftbukkit" && pattern != "net.minecraft.server") { // We handle these ourselves above
logger.debug("Imported relocation to server project shadowJar from ${pomFile.absolutePath}: $pattern to $shadedPattern")
relocate(pattern, shadedPattern)
}
}
}
}
tasks.getByName("build") {
dependsOn(shadowJar)

6
buildSrc/src/main/kotlin/DependencyLoading.kt
View File

@@ -29,9 +29,9 @@ fun DependencyHandlerScope.loadDependencies(project: Project) {
// Load dependencies
dependenciesBlock.elements("dependency").forEach { dependencyElem ->
val groupId = dependencyElem.search("groupId").firstOrNull()!!.textContent
val artifactId = dependencyElem.search("artifactId").firstOrNull()!!.textContent
val version = dependencyElem.search("version").firstOrNull()!!.textContent.applyReplacements(
val groupId = dependencyElem.search("groupId").first().textContent
val artifactId = dependencyElem.search("artifactId").first().textContent
val version = dependencyElem.search("version").first().textContent.applyReplacements(
mapOf(
"project.version" to "${project.toothpick.minecraftVersion}-${project.toothpick.nmsRevision}",
"minecraft.version" to project.toothpick.minecraftVersion