From 2ec7d6985bf93989280a6d11f595c914d6a5df60 Mon Sep 17 00:00:00 2001 From: Caleb Fenton Date: Sun, 27 Sep 2015 20:28:47 -0700 Subject: [PATCH] Update build instructions, remove shadowjar --- README.md | 7 ++++++- build.gradle | 2 -- smalivm/build.gradle | 7 +++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 25607e531..3c23913ae 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,12 @@ There are three parts to the project: Building -------- -To build the jar, use `./gradlew shadowJar` +To build, `./gradlew fatjar` + +The Simplify jar will be in `simplify/build/libs/simplify.jar` + +You can test it's working with: `java -jar simplify/build/libs/simplify.jar -i simplify/obfuscated-example` + Troubleshooting --------------- diff --git a/build.gradle b/build.gradle index d6d339908..02743eab1 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,6 @@ buildscript { dependencies { classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.4.0' - classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.2' } } @@ -29,7 +28,6 @@ subprojects { apply plugin: 'java' apply plugin: 'eclipse' apply plugin: 'idea' - apply plugin: 'com.github.johnrengelman.shadow' group = 'org.cf' sourceCompatibility = 1.7 diff --git a/smalivm/build.gradle b/smalivm/build.gradle index d7675c596..8aefbf73b 100644 --- a/smalivm/build.gradle +++ b/smalivm/build.gradle @@ -30,6 +30,13 @@ dependencies { testCompile depends.mockito } +// Build a separate jar that contains all dependencies +task fatJar(type: Jar) { + from sourceSets.main.output + from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } +} +tasks.getByPath('build').dependsOn(fatJar) + task myTestsJar(type: Jar) { // Simplify uses some classes from smalivm's tests. classifier = 'tests'