From 88fab6a91d4ee1b0f8ab5dee3e67a6988624a7b0 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 13 Jul 2020 16:46:55 +0200 Subject: [PATCH] Fix fastutil being relocated in 1.14+ (fixes #248) --- versions/common.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/versions/common.gradle b/versions/common.gradle index 2bea506e..620640fe 100644 --- a/versions/common.gradle +++ b/versions/common.gradle @@ -382,6 +382,8 @@ task configureRelocation() { } else if (!pkg.startsWith('org/spongepowered')) { pkgs << pkg.substring(0, pkg.indexOf('/', 4)) } + } else if (pkg.startsWith('it/unimi/dsi/fastutil') && mcVersion >= 11400) { + return // MC uses this as well } else if (!pkg.startsWith('javax/')) { // Note: we cannot just use top level packages as those will be too generic and we'll run // into this long standing bug: https://github.com/johnrengelman/shadow/issues/232 @@ -437,6 +439,11 @@ task shadowJar(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) exclude 'com/github/steveice10/netty/**' } + if (mcVersion >= 11400) { + // MC ships this + exclude 'it/unimi/dsi/fastutil/**' + } + minimize { exclude(dependency('.*spongepowered:mixin:.*')) }