DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix fastutil being relocated in 1.14+ (fixes #248)

Browse Source
This commit is contained in:
Jonas Herzig
2020-07-13 16:46:55 +02:00
parent da59c75f8b
commit 88fab6a91d
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
versions/common.gradle
View File

@@ -382,6 +382,8 @@ task configureRelocation() {
} else if (!pkg.startsWith('org/spongepowered')) { } else if (!pkg.startsWith('org/spongepowered')) {
pkgs << pkg.substring(0, pkg.indexOf('/', 4)) 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/')) { } else if (!pkg.startsWith('javax/')) {
// Note: we cannot just use top level packages as those will be too generic and we'll run // 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 // 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/**' exclude 'com/github/steveice10/netty/**'
} }
if (mcVersion >= 11400) {
// MC ships this
exclude 'it/unimi/dsi/fastutil/**'
}
minimize { minimize {
exclude(dependency('.*spongepowered:mixin:.*')) exclude(dependency('.*spongepowered:mixin:.*'))
} }