From 65a2854aac44f379a01a93de11d8892466797484 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 19 May 2015 02:40:05 +0100 Subject: [PATCH] Fix derp in build script and bump version to 0.4.1 (that was fast huh?) --- build.gradle | 22 ++++--------------- gradle.properties | 4 ++-- .../asm/launch/MixinBootstrap.java | 2 +- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index 591286be..677ba322 100644 --- a/build.gradle +++ b/build.gradle @@ -97,14 +97,9 @@ dependencies { compile 'com.googlecode.jarjar:jarjar:1.1' } -// Filter non-source jars from specified task's outputs -FileCollection executables(TaskOutputs outputs) { - files((outputs.files.findAll{!it.name.contains("sources")}).collect{lib -> file(lib)}) -} - // Task to read ASM library and rename packages task renamedASM { - outputs.file files(configurations.asm.files.collect { file -> + outputs.file files(configurations.asm.files.findAll{!it.name.contains("sources")}.collect { file -> new File(project.repositories['renamed-packages'].dirs[0], "mixin-" + file.name).path }) doLast { @@ -116,17 +111,8 @@ task renamedASM { ) outputs.files.eachWithIndex { elem, index -> logger.info "Generating renamed jar {}", elem.name - def inJar = configurations.asm.files[index] - if (elem.name.contains("sources")) { - def tmpDir = new File(temporaryDir, elem.name + ".tmp") - unzip (src: inJar, dest: tmpDir) - replace (dir: tmpDir, token: "org.objectweb.asm", value: "org.spongepowered.asm.lib") - inJar = new File(temporaryDir, elem.name) - jar (destFile: inJar) { fileset(dir: tmpDir) } - delete tmpDir - } jarjar (jarfile: elem.path) { - zipfileset (src: inJar) + zipfileset (src: configurations.asm.files[index]) rule ( pattern: "org.objectweb.asm.**", result: "org.spongepowered.asm.lib.@1" @@ -157,8 +143,8 @@ dependencies { apCompile 'net.minecraftforge.srg2source:Srg2Source:3.2-SNAPSHOT' // remapped ASM - compile executables(tasks.renamedASM.outputs) - apCompile executables(tasks.renamedASM.outputs) + compile tasks.renamedASM.outputs.files + apCompile tasks.renamedASM.outputs.files } // Filter, process, and include resources diff --git a/gradle.properties b/gradle.properties index afe7dcd6..ec3a3ffe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar url=http://spongepowered.org description=Mixin organization=SpongePowered -buildVersion=0.4 -buildType=RELEASE +buildVersion=0.4.1 +buildType=SNAPSHOT diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index a1c15d1c..24b64f43 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.4"; + public static final String VERSION = "0.4.1"; /** * Blackboard key where the subsystem version will be stored to indicate