Actually fix building (I think™️)

This commit is contained in:
KennyTV 2021-02-24 14:50:51 +01:00
parent 0323300acd
commit 0fbe2dc432
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
4 changed files with 6 additions and 3 deletions

View File

@ -48,13 +48,12 @@ subprojects {
} }
repositories { repositories {
maven("https://repo.viaversion.com")
maven("https://oss.sonatype.org/content/repositories/snapshots/") maven("https://oss.sonatype.org/content/repositories/snapshots/")
maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots")
maven("https://nexus.velocitypowered.com/repository/velocity-artifacts-snapshots/") maven("https://nexus.velocitypowered.com/repository/velocity-artifacts-snapshots/")
maven("https://repo.spongepowered.org/maven") maven("https://repo.spongepowered.org/maven")
maven("https://repo.viaversion.com")
maven("https://repo.maven.apache.org/maven2/") maven("https://repo.maven.apache.org/maven2/")
mavenLocal()
} }
java { java {

View File

@ -4,7 +4,7 @@ object Versions {
// Common // Common
const val netty = "4.0.20.Final" const val netty = "4.0.20.Final"
const val gson = "2.8.6" const val guava = "17.0"
const val jetbrainsAnnotations = "19.0.0" const val jetbrainsAnnotations = "19.0.0"
const val log4j = "2.8.1" const val log4j = "2.8.1"
const val fabricLoader = "0.4.8+build.154" const val fabricLoader = "0.4.8+build.154"

View File

@ -28,6 +28,9 @@ fun Project.configureShadowJar() {
} }
private fun ShadowJar.configureRelocations() { private fun ShadowJar.configureRelocations() {
relocate("com.google.gson", "us.myles.viaversion.libs.gson")
relocate("net.md_5.bungee", "us.myles.viaversion.libs.bungeecordchat")
relocate("it.unimi.dsi.fastutil", "us.myles.viaversion.libs.fastutil")
} }
fun Project.latestCommitHash(): String { fun Project.latestCommitHash(): String {

View File

@ -10,5 +10,6 @@ blossom {
dependencies { dependencies {
compileOnly("io.netty", "netty-all", Versions.netty) compileOnly("io.netty", "netty-all", Versions.netty)
compileOnlyApi("us.myles", "viaversion", Versions.viaversion) compileOnlyApi("us.myles", "viaversion", Versions.viaversion)
compileOnlyApi("com.google.guava", "guava", Versions.guava)
compileOnlyApi("org.jetbrains", "annotations", Versions.jetbrainsAnnotations) compileOnlyApi("org.jetbrains", "annotations", Versions.jetbrainsAnnotations)
} }