Update build instructions, remove shadowjar

CalebFenton · Sep 28, 2015 · 2ec7d69 · 2ec7d69
1 parent 6de52eb
commit 2ec7d69
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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'