diff --git a/versions/common.gradle b/versions/common.gradle index 049762f0..8677201f 100644 --- a/versions/common.gradle +++ b/versions/common.gradle @@ -123,15 +123,12 @@ if (project.name != 'core') { } -def shade = {files( - configurations.compile.findAll {it.name.startsWith 'mixin-'} - + configurations.shade -)} task configureRelocation() { dependsOn tasks.jar + dependsOn configurations.shade doLast { 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 pkgs = [].toSet() tree.visit { file -> @@ -156,6 +153,11 @@ jar { dependsOn configurations.compile dependsOn configurations.shade + def shade = {files( + configurations.compile.findAll {it.name.startsWith 'mixin-'} + + configurations.shade + )} + def noticeDir = file("$buildDir/NOTICE") doFirst { noticeDir.deleteDir()