From 60f227cad81eee7e26e5de72879a835d524f76b2 Mon Sep 17 00:00:00 2001 From: johni0702 Date: Wed, 12 Aug 2015 12:29:31 +0200 Subject: [PATCH] Only shade the Mixin lib itself not all of its dependencies --- build.gradle | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index ec6109f6..db7873ef 100755 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,7 @@ archivesBaseName = "replaymod" ext { mixinSrg = new File(project.buildDir, 'tmp/mixins/mixins.srg') mixinRefMap = new File(project.buildDir, 'tmp/mixins/mixins.replaymod.refmap.json') + libFiles = fileTree(dir: 'libs', includes: ['*.jar']) } minecraft { @@ -47,16 +48,12 @@ repositories { } } -configurations { - shade - compile.extendsFrom shade -} - dependencies { compile 'org.projectlombok:lombok:1.16.4' - shade 'org.spongepowered:mixin:0.4.3' - shade fileTree(dir: 'libs', includes: ['*.jar']) + compile 'org.spongepowered:mixin:0.4.3' + compile libFiles + // you may put jars on which you depend on in ./libs // or you may define them like so.. //compile "some.group:artifact:version:classifier" @@ -73,15 +70,17 @@ dependencies { } jar { - dependsOn configurations.shade + dependsOn configurations.compile from project.mixinRefMap + def shade = {libFiles + files(configurations.compile.find { it.name.startsWith("mixin-") })} + def noticeDir = file("$buildDir/NOTICE") doFirst { noticeDir.deleteDir() noticeDir.mkdirs() - configurations.shade.collect { it.isDirectory() ? fileTree(it) : zipTree(it) }.each { + shade().collect { it.isDirectory() ? fileTree(it) : zipTree(it) }.each { it.matching { include '**/NOTICE*' }.each { new File(noticeDir, 'NOTICE.txt') << it.getText('UTF-8') + '\n' } @@ -108,7 +107,7 @@ jar { } from langDir - from (configurations.shade.collect { it.isDirectory() ? it : zipTree(it) }) { + from ({shade().collect { it.isDirectory() ? it : zipTree(it) }}) { exclude '**/NOTICE*' }