GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Fix building

Browse source
This commit is contained in:
SupremeMortal 2022-10-04 23:18:53 +01:00
parent 7edde43141
commit 5a805bc688
No known key found for this signature in database
GPG key ID: DDBB25F8EE4FA29A
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bootstrap/fabric/build.gradle.kts
View file

@ -1,5 +1,5 @@
plugins { plugins {
id("fabric-loom") version "0.12-SNAPSHOT" id("fabric-loom") version "1.0-SNAPSHOT"
id("maven-publish") id("maven-publish")
id("com.github.johnrengelman.shadow") id("com.github.johnrengelman.shadow")
id("java") id("java")
@ -79,6 +79,7 @@ tasks {
relocate("org.yaml", "org.geysermc.relocate.yaml") // https://github.com/CardboardPowered/cardboard/issues/139 relocate("org.yaml", "org.geysermc.relocate.yaml") // https://github.com/CardboardPowered/cardboard/issues/139
relocate("com.fasterxml.jackson", "org.geysermc.relocate.jackson") relocate("com.fasterxml.jackson", "org.geysermc.relocate.jackson")
relocate("net.kyori", "org.geysermc.relocate.kyori") relocate("net.kyori", "org.geysermc.relocate.kyori")
archiveClassifier.set("unshaded") // We don't want it included in the archived artifacts
} }
jar { jar {
@ -87,7 +88,7 @@ tasks {
remapJar { remapJar {
dependsOn(shadowJar) dependsOn(shadowJar)
inputs.file(shadowJar.get().archiveFile) inputFile.set(shadowJar.get().archiveFile)
archiveBaseName.set("Geyser-Fabric") archiveBaseName.set("Geyser-Fabric")
archiveClassifier.set("") archiveClassifier.set("")
archiveVersion.set("") archiveVersion.set("")

8
build-logic/build.gradle.kts
View file

@ -6,21 +6,17 @@ plugins {
repositories { repositories {
gradlePluginPortal() gradlePluginPortal()
maven("https://repo.opencollab.dev/maven-snapshots")
} }
dependencies { dependencies {
implementation("net.kyori", "indra-common", "2.0.6") implementation("net.kyori", "indra-common", "2.0.6")
implementation("org.jfrog.buildinfo", "build-info-extractor-gradle", "4.26.1") implementation("org.jfrog.buildinfo", "build-info-extractor-gradle", "4.26.1")
implementation("gradle.plugin.com.github.johnrengelman", "shadow", "7.1.2") { implementation("com.github.johnrengelman", "shadow", "7.1.3-SNAPSHOT")
exclude("org.ow2.asm", "*")
}
// Within the gradle plugin classpath, there is a version conflict between loom and some other // Within the gradle plugin classpath, there is a version conflict between loom and some other
// plugin for databind. This fixes it: minimum 2.13.2 is required by loom. // plugin for databind. This fixes it: minimum 2.13.2 is required by loom.
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.3") implementation("com.fasterxml.jackson.core:jackson-databind:2.13.3")
// Use a newer version of ObjectWeb ASM than the one provided by loom.
implementation("org.ow2.asm:asm-commons:9.4")
} }
tasks.withType<KotlinCompile> { tasks.withType<KotlinCompile> {

1
settings.gradle.kts
View file

@ -48,6 +48,7 @@ pluginManagement {
repositories { repositories {
gradlePluginPortal() gradlePluginPortal()
maven("https://maven.fabricmc.net/") maven("https://maven.fabricmc.net/")
maven("https://repo.opencollab.dev/maven-snapshots")
} }
plugins { plugins {
id("net.kyori.blossom") version "1.2.0" id("net.kyori.blossom") version "1.2.0"