diff --git a/build.gradle.kts b/build.gradle.kts index ac9097cc..c7fc0cad 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -48,13 +48,12 @@ subprojects { } repositories { + maven("https://repo.viaversion.com") maven("https://oss.sonatype.org/content/repositories/snapshots/") maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") maven("https://nexus.velocitypowered.com/repository/velocity-artifacts-snapshots/") maven("https://repo.spongepowered.org/maven") - maven("https://repo.viaversion.com") maven("https://repo.maven.apache.org/maven2/") - mavenLocal() } java { diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index fca0e0d5..daaf5d8a 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -4,7 +4,7 @@ object Versions { // Common 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 log4j = "2.8.1" const val fabricLoader = "0.4.8+build.154" diff --git a/buildSrc/src/main/kotlin/extensions.kt b/buildSrc/src/main/kotlin/extensions.kt index df822671..a8e351b1 100644 --- a/buildSrc/src/main/kotlin/extensions.kt +++ b/buildSrc/src/main/kotlin/extensions.kt @@ -28,6 +28,9 @@ fun Project.configureShadowJar() { } 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 { diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 17bce47a..17131050 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -10,5 +10,6 @@ blossom { dependencies { compileOnly("io.netty", "netty-all", Versions.netty) compileOnlyApi("us.myles", "viaversion", Versions.viaversion) + compileOnlyApi("com.google.guava", "guava", Versions.guava) compileOnlyApi("org.jetbrains", "annotations", Versions.jetbrainsAnnotations) } \ No newline at end of file