Do not relocate mixin lib

This commit is contained in:
Jonas Herzig
2018-02-28 21:56:57 +01:00
parent da6d9e8167
commit 5ce08874d6

View File

@@ -123,15 +123,12 @@ if (project.name != 'core') {
} }
def shade = {files(
configurations.compile.findAll {it.name.startsWith 'mixin-'}
+ configurations.shade
)}
task configureRelocation() { task configureRelocation() {
dependsOn tasks.jar dependsOn tasks.jar
dependsOn configurations.shade
doLast { doLast {
def extraSrg = tasks.reobfJar.extraSrgLines def extraSrg = tasks.reobfJar.extraSrgLines
shade().filter { it.exists() }.collect { files(configurations.shade).filter { it.exists() }.collect {
def tree = it.isDirectory() ? fileTree(it) : zipTree(it) def tree = it.isDirectory() ? fileTree(it) : zipTree(it)
def pkgs = [].toSet() def pkgs = [].toSet()
tree.visit { file -> tree.visit { file ->
@@ -156,6 +153,11 @@ jar {
dependsOn configurations.compile dependsOn configurations.compile
dependsOn configurations.shade dependsOn configurations.shade
def shade = {files(
configurations.compile.findAll {it.name.startsWith 'mixin-'}
+ configurations.shade
)}
def noticeDir = file("$buildDir/NOTICE") def noticeDir = file("$buildDir/NOTICE")
doFirst { doFirst {
noticeDir.deleteDir() noticeDir.deleteDir()